openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86/apic: Use lapic_is_integrated() consistently 

lapic_is_integrated() is a wrapper around APIC_INTEGRATED(), but not used
consistently.

Replace the direct usage of APIC_INTEGRATED() and fixup a hard to read tail
comment. No functional change.

[ tglx: Made it compile and work .... ]

Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: bhe@redhat.com
Link: https://lkml.kernel.org/r/1504774161-7137-2-git-send-email-douly.fnst@cn.fujitsu.com
This commit is contained in:
Dou Liyang 2017-09-07 16:49:21 +08:00 committed by Thomas Gleixner
parent e3cccbce14
commit ae41a2a40e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/kernel/apic/apic.c
View File

@ -294,14 +294,11 @@ int get_physical_broadcast(void)
*/ */
int lapic_get_maxlvt(void) int lapic_get_maxlvt(void)
{ {
unsigned int v;
v = apic_read(APIC_LVR);
/* /*
* - we always have APIC integrated on 64bit mode * - we always have APIC integrated on 64bit mode
* - 82489DXs do not report # of LVT entries * - 82489DXs do not report # of LVT entries
*/ */
return APIC_INTEGRATED(GET_APIC_VERSION(v)) ? GET_APIC_MAXLVT(v) : 2; return lapic_is_integrated() ? GET_APIC_MAXLVT(apic_read(APIC_LVR)) : 2;
} }
/* /*
@ -1531,7 +1528,9 @@ void setup_local_APIC(void)
value = APIC_DM_NMI; value = APIC_DM_NMI;
else else
value = APIC_DM_NMI | APIC_LVT_MASKED; value = APIC_DM_NMI | APIC_LVT_MASKED;
if (!lapic_is_integrated()) /* 82489DX */
/* Is 82489DX ? */
if (!lapic_is_integrated())
value |= APIC_LVT_LEVEL_TRIGGER; value |= APIC_LVT_LEVEL_TRIGGER;
apic_write(APIC_LVT1, value); apic_write(APIC_LVT1, value);