diff options
author | Liu, Jinsong <jinsong.liu@intel.com> | 2011-09-22 04:53:58 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-09-25 12:53:00 -0400 |
commit | b90dfb0419a79a90395e04fee3fbda3c12ba8237 (patch) | |
tree | e0856504ba6a8ad3197d674a49b23d3a58412320 /arch/x86/include | |
parent | 7460fb4a340033107530df19e7e125bd0969bfb2 (diff) |
x86: TSC deadline definitions
This pre-defination is preparing for KVM tsc deadline timer emulation, but
theirself are not kvm specific.
Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r-- | arch/x86/include/asm/apicdef.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/cpufeature.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/msr-index.h | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h index 34595d5e1038..3925d8007864 100644 --- a/arch/x86/include/asm/apicdef.h +++ b/arch/x86/include/asm/apicdef.h | |||
@@ -100,7 +100,9 @@ | |||
100 | #define APIC_TIMER_BASE_CLKIN 0x0 | 100 | #define APIC_TIMER_BASE_CLKIN 0x0 |
101 | #define APIC_TIMER_BASE_TMBASE 0x1 | 101 | #define APIC_TIMER_BASE_TMBASE 0x1 |
102 | #define APIC_TIMER_BASE_DIV 0x2 | 102 | #define APIC_TIMER_BASE_DIV 0x2 |
103 | #define APIC_LVT_TIMER_ONESHOT (0 << 17) | ||
103 | #define APIC_LVT_TIMER_PERIODIC (1 << 17) | 104 | #define APIC_LVT_TIMER_PERIODIC (1 << 17) |
105 | #define APIC_LVT_TIMER_TSCDEADLINE (2 << 17) | ||
104 | #define APIC_LVT_MASKED (1 << 16) | 106 | #define APIC_LVT_MASKED (1 << 16) |
105 | #define APIC_LVT_LEVEL_TRIGGER (1 << 15) | 107 | #define APIC_LVT_LEVEL_TRIGGER (1 << 15) |
106 | #define APIC_LVT_REMOTE_IRR (1 << 14) | 108 | #define APIC_LVT_REMOTE_IRR (1 << 14) |
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 88b23a43f340..94dfb0a3e544 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h | |||
@@ -120,6 +120,7 @@ | |||
120 | #define X86_FEATURE_X2APIC (4*32+21) /* x2APIC */ | 120 | #define X86_FEATURE_X2APIC (4*32+21) /* x2APIC */ |
121 | #define X86_FEATURE_MOVBE (4*32+22) /* MOVBE instruction */ | 121 | #define X86_FEATURE_MOVBE (4*32+22) /* MOVBE instruction */ |
122 | #define X86_FEATURE_POPCNT (4*32+23) /* POPCNT instruction */ | 122 | #define X86_FEATURE_POPCNT (4*32+23) /* POPCNT instruction */ |
123 | #define X86_FEATURE_TSC_DEADLINE_TIMER (4*32+24) /* Tsc deadline timer */ | ||
123 | #define X86_FEATURE_AES (4*32+25) /* AES instructions */ | 124 | #define X86_FEATURE_AES (4*32+25) /* AES instructions */ |
124 | #define X86_FEATURE_XSAVE (4*32+26) /* XSAVE/XRSTOR/XSETBV/XGETBV */ | 125 | #define X86_FEATURE_XSAVE (4*32+26) /* XSAVE/XRSTOR/XSETBV/XGETBV */ |
125 | #define X86_FEATURE_OSXSAVE (4*32+27) /* "" XSAVE enabled in the OS */ | 126 | #define X86_FEATURE_OSXSAVE (4*32+27) /* "" XSAVE enabled in the OS */ |
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index d52609aeeab8..a6962d9161a0 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h | |||
@@ -229,6 +229,8 @@ | |||
229 | #define MSR_IA32_APICBASE_ENABLE (1<<11) | 229 | #define MSR_IA32_APICBASE_ENABLE (1<<11) |
230 | #define MSR_IA32_APICBASE_BASE (0xfffff<<12) | 230 | #define MSR_IA32_APICBASE_BASE (0xfffff<<12) |
231 | 231 | ||
232 | #define MSR_IA32_TSCDEADLINE 0x000006e0 | ||
233 | |||
232 | #define MSR_IA32_UCODE_WRITE 0x00000079 | 234 | #define MSR_IA32_UCODE_WRITE 0x00000079 |
233 | #define MSR_IA32_UCODE_REV 0x0000008b | 235 | #define MSR_IA32_UCODE_REV 0x0000008b |
234 | 236 | ||