| Message ID | 4A0EED8B.6040704@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Saturday 16 May 2009 10:44:59 am Yinghai Lu wrote: > +config X86_UPDATE_MPTABLE > + bool "Enable update mptable according to acpi" if ACPI > + default n > + depends on X86_MPPARSE && ACPI Is this any use without CONFIG_KEXEC? Maybe it should depend on KEXEC as well? Or maybe we don't need a new option at all, and could just put this code under CONFIG_KEXEC directly. > + ---help--- > + some systems do not have correct mptable. with "update_mptable" or > + "alloc_mptable" kernel could try to update mptable according to DSDT. > + Then could use kexec to start second kernel (even old) without acpi > + support or "acpi=off" Please use English conventions such as starting sentences with capital letters and capitalizing thing like "ACPI." Bjorn -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Bjorn Helgaas wrote: > On Saturday 16 May 2009 10:44:59 am Yinghai Lu wrote: > >> +config X86_UPDATE_MPTABLE >> + bool "Enable update mptable according to acpi" if ACPI >> + default n >> + depends on X86_MPPARSE && ACPI > > Is this any use without CONFIG_KEXEC? Maybe it should depend on > KEXEC as well? Or maybe we don't need a new option at all, and > could just put this code under CONFIG_KEXEC directly. If ACPI is not compiled in, we don't need it that too. > >> + ---help--- >> + some systems do not have correct mptable. with "update_mptable" or >> + "alloc_mptable" kernel could try to update mptable according to DSDT. >> + Then could use kexec to start second kernel (even old) without acpi >> + support or "acpi=off" > > Please use English conventions such as starting sentences with capital > letters and capitalizing thing like "ACPI." ok. YH -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: linux-2.6/arch/x86/Kconfig =================================================================== --- linux-2.6.orig/arch/x86/Kconfig +++ linux-2.6/arch/x86/Kconfig @@ -292,6 +292,16 @@ config X86_MPPARSE For old smp systems that do not have proper acpi support. Newer systems (esp with 64bit cpus) with acpi support, MADT and DSDT will override it +config X86_UPDATE_MPTABLE + bool "Enable update mptable according to acpi" if ACPI + default n + depends on X86_MPPARSE && ACPI + ---help--- + some systems do not have correct mptable. with "update_mptable" or + "alloc_mptable" kernel could try to update mptable according to DSDT. + Then could use kexec to start second kernel (even old) without acpi + support or "acpi=off" + config X86_BIGSMP bool "Support for big SMP systems with more than 8 CPUs" depends on X86_32 && SMP Index: linux-2.6/arch/x86/kernel/acpi/boot.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/acpi/boot.c +++ linux-2.6/arch/x86/kernel/acpi/boot.c @@ -1159,7 +1159,7 @@ void __init mp_config_acpi_legacy_irqs(v static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int trigger, int polarity) { -#ifdef CONFIG_X86_MPPARSE +#ifdef CONFIG_X86_UPDATE_MPTABLE struct mpc_intsrc mp_irq; struct pci_dev *pdev; unsigned char number; @@ -1191,6 +1191,7 @@ static int mp_config_acpi_gsi(struct dev save_mp_irq(&mp_irq); #endif + return 0; } Index: linux-2.6/arch/x86/kernel/mpparse.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/mpparse.c +++ linux-2.6/arch/x86/kernel/mpparse.c @@ -797,6 +797,8 @@ void __init find_smp_config(void) __find_smp_config(1); } +#ifdef CONFIG_X86_UPDATE_MPTABLE + #ifdef CONFIG_X86_IO_APIC static u8 __initdata irq_used[MAX_IRQ_SOURCES]; @@ -1086,3 +1088,5 @@ static int __init update_mp_table(void) } late_initcall(update_mp_table); + +#endif /* CONFIG_X86_UPDATE_MPTABLE */ Index: linux-2.6/arch/x86/include/asm/mpspec.h =================================================================== --- linux-2.6.orig/arch/x86/include/asm/mpspec.h +++ linux-2.6/arch/x86/include/asm/mpspec.h @@ -60,9 +60,15 @@ extern void get_smp_config(void); #ifdef CONFIG_X86_MPPARSE extern void find_smp_config(void); -extern void early_reserve_e820_mpc_new(void); #else static inline void find_smp_config(void) { } +#endif + +#ifdef CONFIG_X86_UPDATE_MPTABLE +extern int enable_update_mptable; +extern void early_reserve_e820_mpc_new(void); +#else +#define enable_update_mptable (0) static inline void early_reserve_e820_mpc_new(void) { } #endif @@ -72,7 +78,6 @@ extern void mp_register_ioapic(int id, u extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi); extern void mp_config_acpi_legacy_irqs(void); -extern int enable_update_mptable; struct device; extern int mp_register_gsi(struct device *dev, u32 gsi, int edge_level, int active_high_low);
so could enable it for special purpose. 1. for acpi enabled kernel kexec kernel without acpi 2. for crossing check mptable or have correct mptable even with this option enabled, user still need to use update_mpatble or alloc_mptable in command line [ Impact: new config option to disable update_mptable ] Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- arch/x86/Kconfig | 10 ++++++++++ arch/x86/include/asm/mpspec.h | 9 +++++++-- arch/x86/kernel/acpi/boot.c | 3 ++- arch/x86/kernel/mpparse.c | 4 ++++ 4 files changed, 23 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html