Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d867e531 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: keep MP_intsrc_info untouched if we do not update mptable 



Daniel Exner reported IO-APIC enumeration breakage in linux-next.

Alexey Starikovskiy found out that it might be related to
commit 2944e16b "x86: update mptable".

use enable_update_mptable to decide if need check before add mp_irqs array.

Reported-by: default avatarDaniel Exner <webmaster@dragonslave.de>
Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 9a27f5c5

arch/x86/kernel/acpi/boot.c

+3 −0
Original line number Diff line number Diff line
@@ -1172,6 +1172,9 @@ int mp_config_acpi_gsi(unsigned char number, unsigned int devfn, u8 pin, 
	struct mpc_config_intsrc intsrc;

	int ioapic;



	if (!enable_update_mptable)

		return 0;



	/* print the entry should happen on mptable identically */

	intsrc.mpc_type = MP_INTSRC;

	intsrc.mpc_irqtype = mp_INT;

arch/x86/kernel/mpparse.c

+7 −6
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ 
#include <mach_mpparse.h>

#endif



int enable_update_mptable;



/*

 * Checksum an MP configuration block.

 */
@@ -295,6 +297,7 @@ void MP_intsrc_info(struct mpc_config_intsrc *m) 


	print_MP_intsrc_info(m);



	if (enable_update_mptable)

		for (i = 0; i < mp_irq_entries; i++) {

			if (!mp_irq_mpc_intsrc_cmp(&mp_irqs[i], m))

				return;
@@ -1110,8 +1113,6 @@ out: 
	return 0;

}



int __initdata enable_update_mptable;



static int __init update_mptable_setup(char *str)

{

	enable_update_mptable = 1;

include/asm-x86/mpspec.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ extern void mp_config_acpi_legacy_irqs(void); 
extern int mp_register_gsi(u32 gsi, int edge_level, int active_high_low);

extern void MP_intsrc_info(struct mpc_config_intsrc *m);

#ifdef CONFIG_X86_IO_APIC

extern int enable_update_mptable;

extern int mp_config_acpi_gsi(unsigned char number, unsigned int devfn, u8 pin,

				u32 gsi, int triggering, int polarity);

#else