diff options
| author | Dave Jones <davej@suse.de> | 2002-04-02 20:02:27 -0800 |
|---|---|---|
| committer | Dave Jones <davej@suse.de> | 2002-04-02 20:02:27 -0800 |
| commit | 24cece3a0826f66abb75fa4688dca1478f6858e8 (patch) | |
| tree | 8c151380b608f4743d5b7d316da0b90a72bc40d1 /include | |
| parent | e2b0649ddb837f06bf436561a134d5ffbf555865 (diff) | |
[PATCH] x86 bluesmoke update.
o Make MCE compile time optional (Paul Gortmaker)
o P4 thermal trip monitoring. (Zwane Mwaikambo)
o Non-fatal MCE logging. (Me)
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/apicdef.h | 12 | ||||
| -rw-r--r-- | include/asm-i386/hw_irq.h | 1 | ||||
| -rw-r--r-- | include/asm-i386/msr.h | 9 |
3 files changed, 19 insertions, 3 deletions
diff --git a/include/asm-i386/apicdef.h b/include/asm-i386/apicdef.h index f855a7d88d82..a91e6ede6b0a 100644 --- a/include/asm-i386/apicdef.h +++ b/include/asm-i386/apicdef.h @@ -71,6 +71,7 @@ #define GET_APIC_DEST_FIELD(x) (((x)>>24)&0xFF) #define SET_APIC_DEST_FIELD(x) ((x)<<24) #define APIC_LVTT 0x320 +#define APIC_LVTTHMR 0x330 #define APIC_LVTPC 0x340 #define APIC_LVT0 0x350 #define APIC_LVT_TIMER_BASE_MASK (0x3<<18) @@ -280,7 +281,16 @@ struct local_apic { u32 __reserved_4[3]; } lvt_timer; -/*330*/ struct { u32 __reserved[4]; } __reserved_15; +/*330*/ struct { /* LVT - Thermal Sensor */ + u32 vector : 8, + delivery_mode : 3, + __reserved_1 : 1, + delivery_status : 1, + __reserved_2 : 3, + mask : 1, + __reserved_3 : 15; + u32 __reserved_4[3]; + } lvt_thermal; /*340*/ struct { /* LVT - Performance Counter */ u32 vector : 8, diff --git a/include/asm-i386/hw_irq.h b/include/asm-i386/hw_irq.h index 1461dab08d90..bf447a1b97b2 100644 --- a/include/asm-i386/hw_irq.h +++ b/include/asm-i386/hw_irq.h @@ -43,6 +43,7 @@ #define RESCHEDULE_VECTOR 0xfc #define CALL_FUNCTION_VECTOR 0xfb +#define THERMAL_APIC_VECTOR 0xf0 /* * Local APIC timer IRQ vector is on a different priority level, * to work around the 'lost local interrupt if more than 2 IRQ diff --git a/include/asm-i386/msr.h b/include/asm-i386/msr.h index 4a16e96dd361..2a57654f0d0f 100644 --- a/include/asm-i386/msr.h +++ b/include/asm-i386/msr.h @@ -57,8 +57,13 @@ #define MSR_IA32_MCG_STATUS 0x17a #define MSR_IA32_MCG_CTL 0x17b -#define MSR_IA32_EVNTSEL0 0x186 -#define MSR_IA32_EVNTSEL1 0x187 +#define MSR_P6_EVNTSEL0 0x186 +#define MSR_P6_EVNTSEL1 0x187 + +#define MSR_IA32_THERM_CONTROL 0x19a +#define MSR_IA32_THERM_INTERRUPT 0x19b +#define MSR_IA32_THERM_STATUS 0x19c +#define MSR_IA32_MISC_ENABLE 0x1a0 #define MSR_IA32_DEBUGCTLMSR 0x1d9 #define MSR_IA32_LASTBRANCHFROMIP 0x1db |