x86, intel-mid: Add Merrifield platform support

This code was partially based on Mark Brown's previous work.

Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
Link: http://lkml.kernel.org/r/1387224459-25746-4-git-send-email-david.a.cohen@linux.intel.com
Signed-off-by: Fei Yang <fei.yang@intel.com>
Cc: Mark F. Brown <mark.f.brown@intel.com>
Cc: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

7 files changed, 144 insertions, 8 deletions

diff --git a/arch/x86/include/asm/intel-mid.h b/arch/x86/include/asm/intel-mid.h
index f8a831431fe0..e34e097b6f9d 100644
--- a/arch/x86/include/asm/intel-mid.h
+++ b/arch/x86/include/asm/intel-mid.h
@@ -52,6 +52,7 @@ enum intel_mid_cpu_type {
         /* 1 was Moorestown */
         INTEL_MID_CPU_CHIP_PENWELL = 2,
         INTEL_MID_CPU_CHIP_CLOVERVIEW,
+        INTEL_MID_CPU_CHIP_TANGIER,
 };
 
 extern enum intel_mid_cpu_type __intel_mid_cpu_chip;
@@ -82,6 +83,7 @@ struct intel_mid_ops {
 #define INTEL_MID_OPS_INIT {\
         DECLARE_INTEL_MID_OPS_INIT(penwell, INTEL_MID_CPU_CHIP_PENWELL), \
         DECLARE_INTEL_MID_OPS_INIT(cloverview, INTEL_MID_CPU_CHIP_CLOVERVIEW), \
+        DECLARE_INTEL_MID_OPS_INIT(tangier, INTEL_MID_CPU_CHIP_TANGIER) \
 };
 
 #ifdef CONFIG_X86_INTEL_MID
diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
index 51384ca727ad..84b9d672843d 100644
--- a/arch/x86/pci/intel_mid_pci.c
+++ b/arch/x86/pci/intel_mid_pci.c
@@ -31,6 +31,7 @@
 #include <asm/pci_x86.h>
 #include <asm/hw_irq.h>
 #include <asm/io_apic.h>
+#include <asm/intel-mid.h>
 
 #define PCIE_CAP_OFFSET 0x100
 
@@ -219,7 +220,10 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev)
         irq_attr.ioapic = mp_find_ioapic(dev->irq);
         irq_attr.ioapic_pin = dev->irq;
         irq_attr.trigger = 1; /* level */
-        irq_attr.polarity = 1; /* active low */
+        if (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_TANGIER)
+                irq_attr.polarity = 0; /* active high */
+        else
+                irq_attr.polarity = 1; /* active low */
         io_apic_set_pci_routing(&dev->dev, dev->irq, &irq_attr);
 
         return 0;
diff --git a/arch/x86/platform/intel-mid/Makefile b/arch/x86/platform/intel-mid/Makefile
index 78a14ba0e0db..0a8ee703b9fa 100644
--- a/arch/x86/platform/intel-mid/Makefile
+++ b/arch/x86/platform/intel-mid/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o intel_mid_vrtc.o mfld.o
+obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o intel_mid_vrtc.o mfld.o mrfl.o
 obj-$(CONFIG_EARLY_PRINTK_INTEL_MID) += early_printk_intel_mid.o
 
 # SFI specific code
diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
index 40955841bb32..1bbedc4b0f88 100644
--- a/arch/x86/platform/intel-mid/intel-mid.c
+++ b/arch/x86/platform/intel-mid/intel-mid.c
@@ -116,6 +116,10 @@ static void intel_mid_arch_setup(void)
         case 0x35:
                 __intel_mid_cpu_chip = INTEL_MID_CPU_CHIP_CLOVERVIEW;
                 break;
+        case 0x3C:
+        case 0x4A:
+                __intel_mid_cpu_chip = INTEL_MID_CPU_CHIP_TANGIER;
+                break;
         case 0x27:
         default:
                 __intel_mid_cpu_chip = INTEL_MID_CPU_CHIP_PENWELL;
diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
index 9ebce0447edf..a537ffc16299 100644
--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
@@ -16,3 +16,4 @@
  */
 extern void * __cpuinit get_penwell_ops(void) __attribute__((weak));
 extern void * __cpuinit get_cloverview_ops(void) __attribute__((weak));
+extern void * __init get_tangier_ops(void) __attribute__((weak));
diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
new file mode 100644
index 000000000000..09d10159e7b7
--- /dev/null
+++ b/arch/x86/platform/intel-mid/mrfl.c
@@ -0,0 +1,103 @@
+/*
+ * mrfl.c: Intel Merrifield platform specific setup code
+ *
+ * (C) Copyright 2013 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2
+ * of the License.
+ */
+
+#include <linux/init.h>
+
+#include <asm/apic.h>
+#include <asm/intel-mid.h>
+
+#include "intel_mid_weak_decls.h"
+
+static unsigned long __init tangier_calibrate_tsc(void)
+{
+        unsigned long fast_calibrate;
+        u32 lo, hi, ratio, fsb, bus_freq;
+
+        /* *********************** */
+        /* Compute TSC:Ratio * FSB */
+        /* *********************** */
+
+        /* Compute Ratio */
+        rdmsr(MSR_PLATFORM_INFO, lo, hi);
+        pr_debug("IA32 PLATFORM_INFO is 0x%x : %x\n", hi, lo);
+
+        ratio = (lo >> 8) & 0xFF;
+        pr_debug("ratio is %d\n", ratio);
+        if (!ratio) {
+                pr_err("Read a zero ratio, force tsc ratio to 4 ...\n");
+                ratio = 4;
+        }
+
+        /* Compute FSB */
+        rdmsr(MSR_FSB_FREQ, lo, hi);
+        pr_debug("Actual FSB frequency detected by SOC 0x%x : %x\n",
+                        hi, lo);
+
+        bus_freq = lo & 0x7;
+        pr_debug("bus_freq = 0x%x\n", bus_freq);
+
+        if (bus_freq == 0)
+                fsb = FSB_FREQ_100SKU;
+        else if (bus_freq == 1)
+                fsb = FSB_FREQ_100SKU;
+        else if (bus_freq == 2)
+                fsb = FSB_FREQ_133SKU;
+        else if (bus_freq == 3)
+                fsb = FSB_FREQ_167SKU;
+        else if (bus_freq == 4)
+                fsb = FSB_FREQ_83SKU;
+        else if (bus_freq == 5)
+                fsb = FSB_FREQ_400SKU;
+        else if (bus_freq == 6)
+                fsb = FSB_FREQ_267SKU;
+        else if (bus_freq == 7)
+                fsb = FSB_FREQ_333SKU;
+        else {
+                BUG();
+                pr_err("Invalid bus_freq! Setting to minimal value!\n");
+                fsb = FSB_FREQ_100SKU;
+        }
+
+        /* TSC = FSB Freq * Resolved HFM Ratio */
+        fast_calibrate = ratio * fsb;
+        pr_debug("calculate tangier tsc %lu KHz\n", fast_calibrate);
+
+        /* ************************************ */
+        /* Calculate Local APIC Timer Frequency */
+        /* ************************************ */
+        lapic_timer_frequency = (fsb * 1000) / HZ;
+
+        pr_debug("Setting lapic_timer_frequency = %d\n",
+                        lapic_timer_frequency);
+
+        /* mark tsc clocksource as reliable */
+        set_cpu_cap(&boot_cpu_data, X86_FEATURE_TSC_RELIABLE);
+
+        if (fast_calibrate)
+                return fast_calibrate;
+
+        return 0;
+}
+
+static void __init tangier_arch_setup(void)
+{
+        x86_platform.calibrate_tsc = tangier_calibrate_tsc;
+}
+
+/* tangier arch ops */
+static struct intel_mid_ops tangier_ops = {
+        .arch_setup = tangier_arch_setup,
+};
+
+void * __cpuinit get_tangier_ops()
+{
+        return &tangier_ops;
+}
diff --git a/arch/x86/platform/intel-mid/sfi.c b/arch/x86/platform/intel-mid/sfi.c
index c84c1ca396bf..80a52288555c 100644
--- a/arch/x86/platform/intel-mid/sfi.c
+++ b/arch/x86/platform/intel-mid/sfi.c
@@ -443,13 +443,35 @@ static int __init sfi_parse_devs(struct sfi_table_header *table)
                          * so we have to enable them one by one here
                          */
                         ioapic = mp_find_ioapic(irq);
-                        irq_attr.ioapic = ioapic;
+                        if (ioapic >= 0) {