asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: use cpuinfo to check for interrupt pending message msr

Browse source 
Simplify code: no need to do a cpuid(1) again. The cpuinfo structure
has all necessary information already.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner 2008-06-09 17:27:20 +02:00 committed by Ingo Molnar
parent aa83f3f2cf
commit 732d7be17b
2 changed files with 30 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
arch/x86/kernel/cpu/amd.c
View file

@ -25,35 +25,24 @@ extern void vide(void);
__asm__(".align 4\nvide: ret"); __asm__(".align 4\nvide: ret");
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
#define CPUID_PROCESSOR_SIGNATURE 1
#define CPUID_XFAM 0x0ff00000
#define CPUID_XFAM_K8 0x00000000
#define CPUID_XFAM_10H 0x00100000
#define CPUID_XFAM_11H 0x00200000
#define CPUID_XMOD 0x000f0000
#define CPUID_XMOD_REV_F 0x00040000
/* AMD systems with C1E don't have a working lAPIC timer. Check for that. */ /* AMD systems with C1E don't have a working lAPIC timer. Check for that. */
static __cpuinit int amd_apic_timer_broken(void) static __cpuinit int amd_apic_timer_broken(struct cpuinfo_x86 *c)
{ {
u32 lo, hi; u32 lo, hi;
u32 eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE);
switch (eax & CPUID_XFAM) { if (c->x86 < 0x0F)
case CPUID_XFAM_K8: return 0;
if ((eax & CPUID_XMOD) < CPUID_XMOD_REV_F)
break; /* Family 0x0f models < rev F do not have this MSR */
case CPUID_XFAM_10H: if (c->x86 == 0x0f && c->x86_model < 0x40)
case CPUID_XFAM_11H: return 0;
rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi);
if (lo & K8_INTP_C1E_ACTIVE_MASK) { rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi);
if (smp_processor_id() != boot_cpu_physical_apicid) if (lo & K8_INTP_C1E_ACTIVE_MASK) {
printk(KERN_INFO "AMD C1E detected late. " if (smp_processor_id() != boot_cpu_physical_apicid)
" Force timer broadcast.\n"); printk(KERN_INFO "AMD C1E detected late. "
return 1; "Force timer broadcast.\n");
}
break;
default:
/* err on the side of caution */
return 1; return 1;
} }
return 0; return 0;
@ -297,7 +286,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
} }
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
if (amd_apic_timer_broken()) if (amd_apic_timer_broken(c))
local_apic_timer_disabled = 1; local_apic_timer_disabled = 1;
#endif #endif

38
arch/x86/kernel/cpu/amd_64.c
View file

@ -110,31 +110,23 @@ static void __cpuinit early_init_amd_mc(struct cpuinfo_x86 *c)
#endif #endif
} }
#define CPUID_PROCESSOR_SIGNATURE 1
#define CPUID_XFAM 0x0ff00000
#define CPUID_XFAM_K8 0x00000000
#define CPUID_XFAM_10H 0x00100000
#define CPUID_XFAM_11H 0x00200000
#define CPUID_XMOD 0x000f0000
#define CPUID_XMOD_REV_F 0x00040000
/* AMD systems with C1E don't have a working lAPIC timer. Check for that. */ /* AMD systems with C1E don't have a working lAPIC timer. Check for that. */
static __cpuinit int amd_apic_timer_broken(void) static __cpuinit int amd_apic_timer_broken(struct cpuinfo_x86 *c)
{ {
u32 lo, hi, eax = cpuid_eax(CPUID_PROCESSOR_SIGNATURE); u32 lo, hi;
switch (eax & CPUID_XFAM) { if (c->x86 < 0x0F)
case CPUID_XFAM_K8: return 0;
if ((eax & CPUID_XMOD) < CPUID_XMOD_REV_F)
break; /* Family 0x0f models < rev F do not have this MSR */
case CPUID_XFAM_10H: if (c->x86 == 0x0f && c->x86_model < 0x40)
case CPUID_XFAM_11H: return 0;
rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi);
if (lo & K8_INTP_C1E_ACTIVE_MASK) rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi);
return 1; if (lo & K8_INTP_C1E_ACTIVE_MASK) {
break; if (smp_processor_id() != boot_cpu_physical_apicid)
default: printk(KERN_INFO "AMD C1E detected late. "
/* err on the side of caution */ "Force timer broadcast.\n");
return 1; return 1;
} }
return 0; return 0;
@ -220,7 +212,7 @@ void __cpuinit init_amd(struct cpuinfo_x86 *c)
if (c->x86 == 0x10) if (c->x86 == 0x10)
amd_enable_pci_ext_cfg(c); amd_enable_pci_ext_cfg(c);
if (amd_apic_timer_broken()) if (amd_apic_timer_broken(c))
disable_apic_timer = 1; disable_apic_timer = 1;
if (c == &boot_cpu_data && c->x86 >= 0xf && c->x86 <= 0x11) { if (c == &boot_cpu_data && c->x86 >= 0xf && c->x86 <= 0x11) {