x86,apic -- don't forget to disconnect BSP discrete apic
PATCH 1/1 x86,apic -- don't forget to disconnect BSP discrete apic
In case of discrete APIC cpu_has_apic could be not set. This leads to disconnect_bsp_APIC is not called where it should.
---
Please review.
arch/x86/kernel/apic/io_apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -2002,7 +2002,7 @@ void disable_IO_APIC(void)/* * Use virtual wire A mode when interrupt remapping is enabled. */ -if (cpu_has_apic) +if (cpu_has_apic || smp_found_config)disconnect_bsp_APIC (!intr_remapping_enabled && ioapic_i8259.pin !=-1 ); }
H. Peter Anvin
reviewerQuoted 3 lines · Cyrill Gorcunov
In case of discrete APIC
cpu_has_apiccould be not set. This leads todisconnect_bsp_APICis not called where it should.
I thought we were going to turn on cpu_has_apic in this case?
-hpa
Quoted 10 lines · H. Peter Anvin
Quoted 3 lines · Cyrill Gorcunov
In case of discrete APIC
cpu_has_apiccould be not set. This leads todisconnect_bsp_APICis not called where it should.I thought we were going to turn on
cpu_has_apicin this case?-hpa
Yes, this is just a temporary fix. I'll remove this snippet as only cpu-has-apic patch will be ready (i need to re-check all ways and and i need some time for this. Hope will finish it at weekend). Dunno Peter. If there is no urgency -- lets mark that we have this temporary workaround in lklm and if we get kind of bugreport we could apply the patch shortly :)
H. Peter Anvin
reviewerQuoted 10 lines · Cyrill Gorcunov
Quoted 9 lines · H. Peter Anvin
Quoted 3 lines · Cyrill Gorcunov
In case of discrete APIC
cpu_has_apiccould be not set. This leads todisconnect_bsp_APICis not called where it should.I thought we were going to turn on
cpu_has_apicin this case?-hpa
Quoted 6 lines
Yes, this is just a temporary fix. I'll remove this snippet as only cpu-has-apic patch will be ready (i need to re-check all ways and and i need some time for this. Hope will finish it at weekend). Dunno Peter. If there is no urgency -- lets mark that we have this temporary workaround in lklm and if we get kind of bugreport we could apply the patch shortly :)
Since discrete-APIC systems are so old and rare I think it can wait for the proper fix, however, as you said, if there are unexpected problems we can reconsider.
-hpa
Signature · 2 lines
H. Peter Anvin, Intel Open Source Technology Center I work for Intel. I don't speak on their behalf.