1 files changed, 116 insertions, 15 deletions

diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index d971210a6d36..caf2a26f5cfd 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -8,6 +8,8 @@
  *
  * Ravikiran Thirumalai <kiran@scalemp.com>,
  * Shai Fultheim <shai@scalemp.com>
+ * Paravirt ops integration: Glauber de Oliveira Costa <gcosta@redhat.com>,
+ *                           Ravikiran Thirumalai <kiran@scalemp.com>
  */
 
 #include <linux/init.h>
@@ -15,38 +17,137 @@
 #include <linux/pci_regs.h>
 #include <asm/pci-direct.h>
 #include <asm/io.h>
+#include <asm/paravirt.h>
 
-static int __init vsmp_init(void)
+#if defined CONFIG_PCI && defined CONFIG_PARAVIRT
+/*
+ * Interrupt control on vSMPowered systems:
+ * ~AC is a shadow of IF.  If IF is 'on' AC should be 'off'
+ * and vice versa.
+ */
+
+static unsigned long vsmp_save_fl(void)
 {
-        void *address;
-        unsigned int cap, ctl;
+        unsigned long flags = native_save_fl();
 
-        if (!early_pci_allowed())
-                return 0;
+        if (!(flags & X86_EFLAGS_IF) || (flags & X86_EFLAGS_AC))
+                flags &= ~X86_EFLAGS_IF;
+        return flags;
+}
 
-        /* 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))
-                return 0;
+static void vsmp_restore_fl(unsigned long flags)
+{
+        if (flags & X86_EFLAGS_IF)
+                flags &= ~X86_EFLAGS_AC;
+        else
+                flags |= X86_EFLAGS_AC;
+        native_restore_fl(flags);
+}
+
+static void vsmp_irq_disable(void)
+{
+        unsigned long flags = native_save_fl();
+
+        native_restore_fl((flags & ~X86_EFLAGS_IF) | X86_EFLAGS_AC);
+}
+
+static void vsmp_irq_enable(void)
+{
+        unsigned long flags = native_save_fl();
+
+        native_restore_fl((flags | X86_EFLAGS_IF) & (~X86_EFLAGS_AC));
+}
+
+static unsigned __init vsmp_patch(u8 type, u16 clobbers, void *ibuf,
+                                  unsigned long addr, unsigned len)
+{
+        switch (type) {
+        case PARAVIRT_PATCH(pv_irq_ops.irq_enable):
+        case PARAVIRT_PATCH(pv_irq_ops.irq_disable):
+        case PARAVIRT_PATCH(pv_irq_ops.save_fl):
+        case PARAVIRT_PATCH(pv_irq_ops.restore_fl):
+                return paravirt_patch_default(type, clobbers, ibuf, addr, len);
+        default:
+                return native_patch(type, clobbers, ibuf, addr, len);
+        }
+
+}
+
+static void __init set_vsmp_pv_ops(void)
+{
+        void *address;
+        unsigned int cap, ctl, cfg;
 
         /* set vSMP magic bits to indicate vSMP capable kernel */
-        address = ioremap(read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0), 8);
+        cfg = read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0);
+        address = early_ioremap(cfg, 8);
         cap = readl(address);
         ctl = readl(address + 4);
         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 = 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;
+
                 ctl &= ~(1 << 4);
                 writel(ctl, address + 4);
                 ctl = readl(address + 4);
                 printk(KERN_INFO "vSMP CTL: control set to:0x%08x\n", ctl);
         }
 
-        iounmap(address);
+        early_iounmap(address, 8);
+}
+#else
+static void __init set_vsmp_pv_ops(void)
+{
+}
+#endif
+
+#ifdef CONFIG_PCI
+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;
+        }
+}
+#else
+static int __init detect_vsmp_box(void)
+{
+}
+int is_vsmp_box(void)
+{
         return 0;
 }
+#endif
 
-core_initcall(vsmp_init);
+void __init vsmp_init(void)
+{
+        detect_vsmp_box();
+        if (!is_vsmp_box())
+                return;
+
+        set_vsmp_pv_ops();
+        return;
+}