x86: unify paravirt pieces of processor.h

This patch unifies the paravirt pieces of processor.h
The functionality present in 32 bit, but not (yet) in 64-bit,
like load_sp0 is _not_ done here, and let to a different patch.

With this unification, we get paravirt for free in x86_64 processor.h

Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 89 insertions, 1 deletions

diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
index 36ee9881b74f..8d0af7bf090a 100644
--- a/include/asm-x86/processor.h
+++ b/include/asm-x86/processor.h
@@ -29,9 +29,97 @@ static inline void load_cr3(pgd_t *pgdir)
 # include "processor_64.h"
 #endif
 
+static inline unsigned long native_get_debugreg(int regno)
+{
+        unsigned long val = 0;  /* Damn you, gcc! */
+
+        switch (regno) {
+        case 0:
+                asm("mov %%db0, %0" :"=r" (val)); break;
+        case 1:
+                asm("mov %%db1, %0" :"=r" (val)); break;
+        case 2:
+                asm("mov %%db2, %0" :"=r" (val)); break;
+        case 3:
+                asm("mov %%db3, %0" :"=r" (val)); break;
+        case 6:
+                asm("mov %%db6, %0" :"=r" (val)); break;
+        case 7:
+                asm("mov %%db7, %0" :"=r" (val)); break;
+        default:
+                BUG();
+        }
+        return val;
+}
+
+static inline void native_set_debugreg(int regno, unsigned long value)
+{
+        switch (regno) {
+        case 0:
+                asm("mov %0,%%db0"      : /* no output */ :"r" (value));
+                break;
+        case 1:
+                asm("mov %0,%%db1"      : /* no output */ :"r" (value));
+                break;
+        case 2:
+                asm("mov %0,%%db2"      : /* no output */ :"r" (value));
+                break;
+        case 3:
+                asm("mov %0,%%db3"      : /* no output */ :"r" (value));
+                break;
+        case 6:
+                asm("mov %0,%%db6"      : /* no output */ :"r" (value));
+                break;
+        case 7:
+                asm("mov %0,%%db7"      : /* no output */ :"r" (value));
+                break;
+        default:
+                BUG();
+        }
+}
+
+
 #ifndef CONFIG_PARAVIRT
 #define __cpuid native_cpuid
-#endif
+#define paravirt_enabled() 0
+
+/*
+ * These special macros can be used to get or set a debugging register
+ */
+#define get_debugreg(var, register)                             \
+        (var) = native_get_debugreg(register)
+#define set_debugreg(value, register)                           \
+        native_set_debugreg(register, value)
+
+#endif /* CONFIG_PARAVIRT */
+
+/*
+ * Save the cr4 feature set we're using (ie
+ * Pentium 4MB enable and PPro Global page
+ * enable), so that any CPU's that boot up
+ * after us can get the correct flags.
+ */
+extern unsigned long mmu_cr4_features;
+
+static inline void set_in_cr4(unsigned long mask)
+{
+        unsigned cr4;
+        mmu_cr4_features |= mask;
+        cr4 = read_cr4();
+        cr4 |= mask;
+        write_cr4(cr4);
+}
+
+static inline void clear_in_cr4(unsigned long mask)
+{
+        unsigned cr4;
+        mmu_cr4_features &= ~mask;
+        cr4 = read_cr4();
+        cr4 &= ~mask;
+        write_cr4(cr4);
+}
+
+
 
 /*
  * Generic CPUID function