x86: introduce vsmp paravirt helpers

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ravikiran Thirumalai <kiran@scalemp.com>
Acked-by: Shai Fultheim <shai@scalemp.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6c70fed0f9a0f9e35cd027072a464b8c42b85434..ed7f72b391139a63ffb1c077e334803f8da46008 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -328,7 +328,8 @@ config X86_RDC321X
 config X86_VSMP
        bool "Support for ScaleMP vSMP"
        depends on X86_64 && PCI
-        help
+       select PARAVIRT
+       help
          Support for ScaleMP vSMP systems.  Say 'Y' here if this kernel is
          supposed to run on these EM64T-based machines.  Only choose this option
          if you have one of these machines.

diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index fdf9fba6ba9c1a4455805c4501d9bce5d4746217..b93ed66c754fa904e9e3cd8447235e8e8d8fd1c3 100644 (file)
--- 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,6 +17,60 @@
 #include <linux/pci_regs.h>
 #include <asm/pci-direct.h>
 #include <asm/io.h>
+#include <asm/paravirt.h>
+
+/*
+ * 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)
+{
+       unsigned long flags = native_save_fl();
+
+       if (!(flags & X86_EFLAGS_IF) || (flags & X86_EFLAGS_AC))
+               flags &= ~X86_EFLAGS_IF;
+       return flags;
+}
+
+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);
+       }
+
+}
 
 void __init vsmp_init(void)
 {