i386 Vmi processor header
RFC PATCH 12/24 i386 Vmi processor header
Fairly straight code motion. Split non-virtualizable pieces of processor.h into default and VMI subarches. CPUID is non-virtualizable, since it doesn't trap, and very often the hypervisor will want to hide specific feature bits from the kernel. To provide a replacement for call sites that use CPUID as a serializing instruction, the sync_core() macro is still available.
Signed-off-by Zachary Amsden <[email protected]>
include/asm-i386/processor.h +7 -100
@@ -137,79 +137,6 @@ static inline void detect_ht(struct cpui#define X86_EFLAGS_ID 0x00200000/* CPUID detection flag */ /* -* Generic CPUID function -* clear %ecx since some cpus (Cyrix MII) do not set or clear %ecx -* resulting in stale register contents being returned. -*/ -static inline void cpuid (unsigned int op,unsigned int *eax,unsigned int *ebx,unsigned int *ecx,unsigned int *edx) -{ - __asm__("cpuid" - :"=a" (*eax), -"=b" (*ebx), -"=c" (*ecx), -"=d" (*edx) - :"0" (op),"c" (0 )); -} - -/* Some CPUID calls want 'count' to be placed in ecx */ -static inline void cpuid_count (int op,int count,int *eax,int *ebx,int *ecx, -int *edx) -{ - __asm__("cpuid" - :"=a" (*eax), -"=b" (*ebx), -"=c" (*ecx), -"=d" (*edx) - :"0" (op),"c" (count)); -} - -/* -* CPUID functions returning a single datum -*/ -static inline unsigned int cpuid_eax (unsigned int op) -{ -unsigned int eax; - - __asm__("cpuid" - :"=a" (eax) - :"0" (op) - :"bx" ,"cx" ,"dx" ); -return eax; -} -static inline unsigned int cpuid_ebx (unsigned int op) -{ -unsigned int eax, ebx; - - __asm__("cpuid" - :"=a" (eax),"=b" (ebx) - :"0" (op) - :"cx" ,"dx" ); -return ebx; -} -static inline unsigned int cpuid_ecx (unsigned int op) -{ -unsigned int eax, ecx; - - __asm__("cpuid" - :"=a" (eax),"=c" (ecx) - :"0" (op) - :"bx" ,"dx" ); -return ecx; -} -static inline unsigned int cpuid_edx (unsigned int op) -{ -unsigned int eax, edx; - - __asm__("cpuid" - :"=a" (eax),"=d" (edx) - :"0" (op) - :"bx" ,"cx" ); -return edx; -} - -#define load_cr3 (pgdir) write_cr3(__pa(pgdir)) - -/* * Intel CPU features in CR4 */ #define X86_CR4_VME 0x0001/* enable vm86 extensions */
@@ -224,6 +151,8 @@ static inline unsigned int cpuid_edx(uns#define X86_CR4_OSFXSR 0x0200/* enable fast FPU save and restore */ #define X86_CR4_OSXMMEXCPT 0x0400/* enable unmasked SSE exceptions */ +#include <mach_processor.h> +/* * Save the cr4 feature set we're using (ie * Pentium 4MB enable and PPro Global page
@@ -489,6 +418,7 @@ struct thread_struct {static inline void load_esp0 (struct tss_struct *tss,struct thread_struct *thread) { tss->esp0 = thread->esp0; +arch_update_kernel_stack (tss, thread->esp0);/* This can only happen when SEP is enabled, no need to test "SEP"arately */ if (unlikely (tss->ss1 != thread->sysenter_cs)) { tss->ss1 = thread->sysenter_cs;
@@ -507,33 +437,6 @@ static inline void load_esp0(struct tss_ regs->esp = new_esp; \ }while (0 ) -/* -* These special macros can be used to get or set a debugging register - */ -#define get_debugreg (var, register) \ - __asm__("movl %%db" #register ", %0" \ - :"=r" (var)) -#define set_debugreg(value, register) \ - __asm__("movl %0,%%db" #register \ - : /* no output */ \ - :"r" (value)) - -/* -* Set IOPL bits in EFLAGS from given mask -*/ -static inline void set_iopl_mask (unsigned mask) -{ -unsigned int reg; - __asm__ __volatile__ ("pushfl;" -"popl %0;" -"andl %1, %0;" -"orl %2, %0;" -"pushl %0;" -"popfl" - :"=&r" (reg) - :"i" (~X86_EFLAGS_IOPL ),"r" (mask)); -} -/* Forward declaration, a strange C thing */ struct task_struct;struct mm_struct ;
@@ -740,4 +643,8 @@ extern void mcheck_init(struct cpuinfo_x#define mcheck_init (c) do {} while(0)#endif +#include <mach_processor.h> + +#define stts () write_cr0(8 | read_cr0()) +#endif /* __ASM_I386_PROCESSOR_H */
include/asm-i386/mach-vmi/mach_processor.h +137 -0
137 lines not on this page · raw message
include/asm-i386/mach-default/mach_processor.h +108 -0
108 lines not on this page · raw message