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: check command line when CONFIG_X86_MPPARSE is not set, v2

Browse Source 
if acpi=off, acpi=noirq and pci=noacpi, we need to disable apic.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: "Maciej W. Rozycki" <macro@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-06-20 16:11:20 -07:00 committed by Ingo Molnar
parent 88a6846c70
commit 3c999f1426
7 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1787,6 +1787,20 @@ static int __init parse_pci(char *arg)
}
early_param("pci", parse_pci);
int __init acpi_mps_check(void)
{
#if defined(CONFIG_X86_LOCAL_APIC) && !defined(CONFIG_X86_MPPARSE)
/* mptable code is not built-in*/
if (acpi_disabled || acpi_noirq) {
printk(KERN_WARNING "MPS support code is not built-in.\n"
"Using acpi=off or acpi=noirq or pci=noacpi "
"may have problem\n");
return 1;
}
#endif
return 0;
}
#ifdef CONFIG_X86_IO_APIC
static int __init parse_acpi_skip_timer_override(char *arg)
{

2
arch/x86/kernel/apic_32.c
View File

@ -57,7 +57,7 @@ unsigned long mp_lapic_addr;
*
* -1=force-disable, +1=force-enable
*/
static int enable_local_apic __initdata;
int enable_local_apic;
/* Local APIC timer verification ok */
static int local_apic_timer_verify_ok;

4
arch/x86/kernel/setup.c
View File

@ -161,6 +161,10 @@ void __init setup_per_cpu_areas(void)
char *ptr;
int cpu;
/* no processor from mptable or madt */
if (!num_processors)
num_processors = 1;
#ifdef CONFIG_HOTPLUG_CPU
prefill_possible_map();
#else

5
arch/x86/kernel/setup_32.c
View File

@ -677,6 +677,11 @@ void __init setup_arch(char **cmdline_p)
parse_early_param();
if (acpi_mps_check()){
enable_local_apic = -1;
clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
}
finish_e820_parsing();
probe_roms();

9
arch/x86/kernel/setup_64.c
View File

@ -302,6 +302,11 @@ void __init setup_arch(char **cmdline_p)
parse_early_param();
if (acpi_mps_check()) {
disable_apic = 1;
clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
}
#ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT
if (init_ohci1394_dma_early)
init_ohci1394_dma_on_all_controllers();
@ -723,6 +728,10 @@ static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c)
cpu_devs[c->x86_vendor]->c_early_init(c);
validate_pat_support(c);
/* early_param could clear that, but recall get it set again */
if (disable_apic)
clear_cpu_cap(c, X86_FEATURE_APIC);
}
/*

6
include/asm-x86/apic.h
View File

@ -39,8 +39,12 @@ extern int apic_verbosity;
extern int local_apic_timer_c2_ok;
extern int ioapic_force;
extern int disable_apic;
#ifdef CONFIG_X86_64
extern int disable_apic;
#else
extern int enable_local_apic;
#endif
/*
* Basic functions accessing APICs.
*/

6
include/linux/acpi.h
View File

@ -82,6 +82,7 @@ char * __acpi_map_table (unsigned long phys_addr, unsigned long size);
int early_acpi_boot_init(void);
int acpi_boot_init (void);
int acpi_boot_table_init (void);
int acpi_mps_check (void);
int acpi_numa_init (void);
int acpi_table_init (void);
@ -250,6 +251,11 @@ static inline int acpi_boot_table_init(void)
return 0;
}
static inline int acpi_mps_check(void)
{
return 0;
}
static inline int acpi_check_resource_conflict(struct resource *res)
{
return 0;