Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

[safe/jmp/linux-2.6] / arch / x86 / kernel / vsmp_64.c

diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index eb25584..74de562 100644 (file)
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -15,10 +15,14 @@
 #include <linux/init.h>
 #include <linux/pci_ids.h>
 #include <linux/pci_regs.h>
+
+#include <asm/apic.h>
 #include <asm/pci-direct.h>
 #include <asm/io.h>
 #include <asm/paravirt.h>
+#include <asm/setup.h>
 
+#ifdef CONFIG_PARAVIRT
 /*
  * Interrupt control on vSMPowered systems:
  * ~AC is a shadow of IF.  If IF is 'on' AC should be 'off'
@@ -33,6 +37,7 @@ static unsigned long vsmp_save_fl(void)
                flags &= ~X86_EFLAGS_IF;
        return flags;
 }
+PV_CALLEE_SAVE_REGS_THUNK(vsmp_save_fl);
 
 static void vsmp_restore_fl(unsigned long flags)
 {
@@ -42,6 +47,7 @@ static void vsmp_restore_fl(unsigned long flags)
                flags |= X86_EFLAGS_AC;
        native_restore_fl(flags);
 }
+PV_CALLEE_SAVE_REGS_THUNK(vsmp_restore_fl);
 
 static void vsmp_irq_disable(void)
 {
@@ -49,6 +55,7 @@ static void vsmp_irq_disable(void)
 
        native_restore_fl((flags & ~X86_EFLAGS_IF) | X86_EFLAGS_AC);
 }
+PV_CALLEE_SAVE_REGS_THUNK(vsmp_irq_disable);
 
 static void vsmp_irq_enable(void)
 {
@@ -56,8 +63,9 @@ static void vsmp_irq_enable(void)
 
        native_restore_fl((flags | X86_EFLAGS_IF) & (~X86_EFLAGS_AC));
 }
+PV_CALLEE_SAVE_REGS_THUNK(vsmp_irq_enable);
 
-static unsigned __init vsmp_patch(u8 type, u16 clobbers, void *ibuf,
+static unsigned __init_or_module vsmp_patch(u8 type, u16 clobbers, void *ibuf,
                                  unsigned long addr, unsigned len)
 {
        switch (type) {
@@ -72,45 +80,11 @@ static unsigned __init vsmp_patch(u8 type, u16 clobbers, void *ibuf,
 
 }
 
-static int vsmp = -1;
-
-int is_vsmp_box(void)
-{
-       if (vsmp != -1)
-               return vsmp;
-
-       vsmp = 0;
-       if (!early_pci_allowed())
-               return vsmp;
-
-       /* Check if we are running on a ScaleMP vSMP box */
-       if ((read_pci_config_16(0, 0x1f, 0, PCI_VENDOR_ID) ==
-            PCI_VENDOR_ID_SCALEMP) &&
-           (read_pci_config_16(0, 0x1f, 0, PCI_DEVICE_ID) ==
-           PCI_DEVICE_ID_SCALEMP_VSMP_CTL))
-               vsmp = 1;
-
-       return vsmp;
-}
-
-void __init vsmp_init(void)
+static void __init set_vsmp_pv_ops(void)
 {
-       void *address;
+       void __iomem *address;
        unsigned int cap, ctl, cfg;
 
-       if (!is_vsmp_box())
-               return;
-
-       if (!early_pci_allowed())
-               return;
-
-       /* If we are, use the distinguished irq functions */
-       pv_irq_ops.irq_disable = vsmp_irq_disable;
-       pv_irq_ops.irq_enable  = vsmp_irq_enable;
-       pv_irq_ops.save_fl  = vsmp_save_fl;
-       pv_irq_ops.restore_fl  = vsmp_restore_fl;
-       pv_init_ops.patch = vsmp_patch;
-
        /* set vSMP magic bits to indicate vSMP capable kernel */
        cfg = read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0);
        address = early_ioremap(cfg, 8);
@@ -119,7 +93,13 @@ void __init vsmp_init(void)
        printk(KERN_INFO "vSMP CTL: capabilities:0x%08x  control:0x%08x\n",
               cap, ctl);
        if (cap & ctl & (1 << 4)) {
-               /* Turn on vSMP IRQ fastpath handling (see system.h) */
+               /* Setup irq ops and turn on vSMP  IRQ fastpath handling */
+               pv_irq_ops.irq_disable = PV_CALLEE_SAVE(vsmp_irq_disable);
+               pv_irq_ops.irq_enable  = PV_CALLEE_SAVE(vsmp_irq_enable);
+               pv_irq_ops.save_fl  = PV_CALLEE_SAVE(vsmp_save_fl);
+               pv_irq_ops.restore_fl  = PV_CALLEE_SAVE(vsmp_restore_fl);
+               pv_init_ops.patch = vsmp_patch;
+
                ctl &= ~(1 << 4);
                writel(ctl, address + 4);
                ctl = readl(address + 4);
@@ -127,5 +107,44 @@ void __init vsmp_init(void)
        }
 
        early_iounmap(address, 8);
+}
+#else
+static void __init set_vsmp_pv_ops(void)
+{
+}
+#endif
+
+static int is_vsmp = -1;
+
+static void __init detect_vsmp_box(void)
+{
+       is_vsmp = 0;
+
+       if (!early_pci_allowed())
+               return;
+
+       /* Check if we are running on a ScaleMP vSMPowered box */
+       if (read_pci_config(0, 0x1f, 0, PCI_VENDOR_ID) ==
+            (PCI_VENDOR_ID_SCALEMP | (PCI_DEVICE_ID_SCALEMP_VSMP_CTL << 16)))
+               is_vsmp = 1;
+}
+
+int is_vsmp_box(void)
+{
+       if (is_vsmp != -1)
+               return is_vsmp;
+       else {
+               WARN_ON_ONCE(1);
+               return 0;
+       }
+}
+
+void __init vsmp_init(void)
+{
+       detect_vsmp_box();
+       if (!is_vsmp_box())
+               return;
+
+       set_vsmp_pv_ops();
        return;
 }