diff options
| author | Keir Fraser <keir@xen.org> | 2010-12-15 10:55:34 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2010-12-15 10:55:34 +0000 |
| commit | 3c5da143be896254ef8e86e2a0e45dae6322b3d0 (patch) | |
| tree | 0916bf33bcbfe5ebc043b848201275332b5b7288 | |
| parent | e9a67fa1885580368fb00de24678671692095d80 (diff) | |
| download | xen-3c5da143be896254ef8e86e2a0e45dae6322b3d0.tar.gz xen-3c5da143be896254ef8e86e2a0e45dae6322b3d0.tar.bz2 xen-3c5da143be896254ef8e86e2a0e45dae6322b3d0.zip | |
x86: Define APIC_TIMER_MODE_xxx in apicdef.h
Signed-off-by: Wei Gang <gang.wei@intel.com>
| -rw-r--r-- | xen/arch/x86/apic.c | 7 | ||||
| -rw-r--r-- | xen/arch/x86/hvm/vlapic.c | 4 | ||||
| -rw-r--r-- | xen/include/asm-x86/apicdef.h | 5 |
3 files changed, 7 insertions, 9 deletions
diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index 4b122ed45e..1812c68bac 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -38,11 +38,6 @@ #include <mach_apic.h> #include <io_ports.h> -#define APIC_TIMER_MODE_ONESHOT (0 << 17) -#define APIC_TIMER_MODE_PERIODIC (1 << 17) -#define APIC_TIMER_MODE_TSC_DEADLINE (2 << 17) -#define APIC_TIMER_MODE_MASK (3 << 17) - static int tdt_enabled __read_mostly; static int tdt_enable __initdata = 1; boolean_param("tdt", tdt_enable); @@ -1163,7 +1158,7 @@ static void __setup_APIC_LVTT(unsigned int clocks) ver = GET_APIC_VERSION(apic_read(APIC_LVR)); /* NB. Xen uses local APIC timer in one-shot mode. */ - lvtt_value = /*APIC_LVT_TIMER_PERIODIC |*/ LOCAL_TIMER_VECTOR; + lvtt_value = /*APIC_TIMER_MODE_PERIODIC |*/ LOCAL_TIMER_VECTOR; if (!APIC_INTEGRATED(ver)) lvtt_value |= SET_APIC_TIMER_BASE(APIC_TIMER_BASE_DIV); diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c index 84dd4d24a5..034dfd64a7 100644 --- a/xen/arch/x86/hvm/vlapic.c +++ b/xen/arch/x86/hvm/vlapic.c @@ -56,7 +56,7 @@ static unsigned int vlapic_lvt_mask[VLAPIC_LVT_NUM] = { /* LVTT */ - LVT_MASK | APIC_LVT_TIMER_PERIODIC, + LVT_MASK | APIC_TIMER_MODE_PERIODIC, /* LVTTHMR */ LVT_MASK | APIC_MODE_MASK, /* LVTPC */ @@ -79,7 +79,7 @@ static unsigned int vlapic_lvt_mask[VLAPIC_LVT_NUM] = (vlapic_get_reg(vlapic, lvt_type) & APIC_MODE_MASK) #define vlapic_lvtt_period(vlapic) \ - (vlapic_get_reg(vlapic, APIC_LVTT) & APIC_LVT_TIMER_PERIODIC) + (vlapic_get_reg(vlapic, APIC_LVTT) & APIC_TIMER_MODE_PERIODIC) /* diff --git a/xen/include/asm-x86/apicdef.h b/xen/include/asm-x86/apicdef.h index 4a026b1343..5c32f7ddce 100644 --- a/xen/include/asm-x86/apicdef.h +++ b/xen/include/asm-x86/apicdef.h @@ -90,7 +90,10 @@ #define APIC_TIMER_BASE_CLKIN 0x0 #define APIC_TIMER_BASE_TMBASE 0x1 #define APIC_TIMER_BASE_DIV 0x2 -#define APIC_LVT_TIMER_PERIODIC (1<<17) +#define APIC_TIMER_MODE_MASK (0x3<<17) +#define APIC_TIMER_MODE_ONESHOT (0x0<<17) +#define APIC_TIMER_MODE_PERIODIC (0x1<<17) +#define APIC_TIMER_MODE_TSC_DEADLINE (0x2<<17) #define APIC_LVT_MASKED (1<<16) #define APIC_LVT_LEVEL_TRIGGER (1<<15) #define APIC_LVT_REMOTE_IRR (1<<14) |