d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initialize x2APIC mode on the resume path before accessing LAPIC.

Browse Source 
Remove unneeded disable of LAPIC in the native_lapic_xapic_mode().  We
attempt to send wakeup IPI on the resume path right after BSP wakeup,
so disabling is wrong.

Reported and tested by:	glebius, "Ranjan1018 ." <214748mv@gmail.com>
Sponsored by:	The FreeBSD Foundation
MFC after:	2 months
This commit is contained in:
Konstantin Belousov 2015-02-16 21:56:19 +00:00
parent 8dc98c2a36
commit 5f674c4cbd
4 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/amd64/amd64/mp_machdep.c
View File

@ -1507,6 +1507,7 @@ cpususpend_handler(void)
vmm_resume_p(); vmm_resume_p();
/* Resume MCA and local APIC */ /* Resume MCA and local APIC */
lapic_xapic_mode();
mca_resume(); mca_resume();
lapic_setup(0); lapic_setup(0);

1
sys/i386/i386/mp_machdep.c
View File

@ -1555,6 +1555,7 @@ cpususpend_handler(void)
cpu_ops.cpu_resume(); cpu_ops.cpu_resume();
/* Resume MCA and local APIC */ /* Resume MCA and local APIC */
lapic_xapic_mode();
mca_resume(); mca_resume();
lapic_setup(0); lapic_setup(0);

1
sys/x86/acpica/acpi_wakeup.c
View File

@ -270,6 +270,7 @@ acpi_wakeup_machdep(struct acpi_softc *sc, int state, int sleep_result,
initializecpu(); initializecpu();
PCPU_SET(switchtime, 0); PCPU_SET(switchtime, 0);
PCPU_SET(switchticks, ticks); PCPU_SET(switchticks, ticks);
lapic_xapic_mode();
#ifdef SMP #ifdef SMP
if (!CPU_EMPTY(&suspcpus)) if (!CPU_EMPTY(&suspcpus))
acpi_wakeup_cpus(sc); acpi_wakeup_cpus(sc);

1
sys/x86/x86/local_apic.c
View File

@ -527,7 +527,6 @@ native_lapic_xapic_mode(void)
saveintr = intr_disable(); saveintr = intr_disable();
if (x2apic_mode) if (x2apic_mode)
native_lapic_enable_x2apic(); native_lapic_enable_x2apic();
native_lapic_disable();
intr_restore(saveintr); intr_restore(saveintr);
} }