Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 07:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: keep MP_intsrc_info untouched if we do not update mptable

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

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

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

Reported-by: Daniel Exner <webmaster@dragonslave.de>
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-06-14 01:26:41 -07:00 committed by Ingo Molnar
parent 9a27f5c516
commit d867e5310b
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/acpi/boot.c
View File

@ -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;

13
arch/x86/kernel/mpparse.c
View File

@ -34,6 +34,8 @@
#include <mach_mpparse.h>
#endif
int enable_update_mptable;
/*
* Checksum an MP configuration block.
*/
@ -295,10 +297,11 @@ void MP_intsrc_info(struct mpc_config_intsrc *m)
print_MP_intsrc_info(m);
for (i = 0; i < mp_irq_entries; i++) {
if (!mp_irq_mpc_intsrc_cmp(&mp_irqs[i], m))
return;
}
if (enable_update_mptable)
for (i = 0; i < mp_irq_entries; i++) {
if (!mp_irq_mpc_intsrc_cmp(&mp_irqs[i], m))
return;
}
assign_to_mp_irq(m, &mp_irqs[mp_irq_entries]);
if (++mp_irq_entries == MAX_IRQ_SOURCES)
@ -1110,8 +1113,6 @@ out:
return 0;
}
int __initdata enable_update_mptable;
static int __init update_mptable_setup(char *str)
{
enable_update_mptable = 1;

1
include/asm-x86/mpspec.h
View File

@ -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