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

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

x86: merge APIC_init_uniprocessor 



Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f28c0ae2

arch/x86/kernel/apic_32.c

+45 −6
Original line number Diff line number Diff line
@@ -1355,6 +1355,17 @@ int apic_version[MAX_APICS]; 


int __init APIC_init_uniprocessor(void)

{

#ifdef CONFIG_X86_64

	if (disable_apic) {

		printk(KERN_INFO "Apic disabled\n");

		return -1;

	}

	if (!cpu_has_apic) {

		disable_apic = 1;

		printk(KERN_INFO "Apic disabled by BIOS\n");

		return -1;

	}

#else

	if (!smp_found_config && !cpu_has_apic)

		return -1;
@@ -1368,11 +1379,20 @@ int __init APIC_init_uniprocessor(void) 
		clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);

		return -1;

	}

#endif



#ifdef HAVE_X2APIC

	enable_IR_x2apic();

#endif

#ifdef CONFIG_X86_64

	setup_apic_routing();

#endif

	verify_local_APIC();



	connect_bsp_APIC();



#ifdef CONFIG_X86_64

	apic_write(APIC_ID, SET_APIC_ID(boot_cpu_physical_apicid));

#else

	/*

	 * Hack: In case of kdump, after a crash, kernel might be booting

	 * on a cpu with non-zero lapic id. But boot_cpu_physical_apicid
@@ -1380,22 +1400,41 @@ int __init APIC_init_uniprocessor(void) 
	 */

# ifdef CONFIG_CRASH_DUMP

	boot_cpu_physical_apicid = read_apic_id();

# endif

#endif

	physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);



	setup_local_APIC();



#ifdef CONFIG_X86_64

	/*

	 * Now enable IO-APICs, actually call clear_IO_APIC

	 * We need clear_IO_APIC before enabling vector on BP

	 */

	if (!skip_ioapic_setup && nr_ioapics)

		enable_IO_APIC();

#endif



#ifdef CONFIG_X86_IO_APIC

	if (!smp_found_config || skip_ioapic_setup || !nr_ioapics)

#endif

		localise_nmi_watchdog();

	end_local_APIC_setup();



#ifdef CONFIG_X86_IO_APIC

	if (smp_found_config)

		if (!skip_ioapic_setup && nr_ioapics)

	if (smp_found_config && !skip_ioapic_setup && nr_ioapics)

		setup_IO_APIC();

# ifdef CONFIG_X86_64

	else

		nr_ioapics = 0;

# endif

#endif



#ifdef CONFIG_X86_64

	setup_boot_APIC_clock();

	check_nmi_watchdog();

#else

	setup_boot_clock();

#endif



	return 0;

}

arch/x86/kernel/apic_64.c

+45 −3
Original line number Diff line number Diff line
@@ -1351,6 +1351,7 @@ int apic_version[MAX_APICS]; 


int __init APIC_init_uniprocessor(void)

{

#ifdef CONFIG_X86_64

	if (disable_apic) {

		printk(KERN_INFO "Apic disabled\n");

		return -1;
@@ -1360,37 +1361,78 @@ int __init APIC_init_uniprocessor(void) 
		printk(KERN_INFO "Apic disabled by BIOS\n");

		return -1;

	}

#else

	if (!smp_found_config && !cpu_has_apic)

		return -1;



	/*

	 * Complain if the BIOS pretends there is one.

	 */

	if (!cpu_has_apic &&

	    APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) {

		printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n",

		       boot_cpu_physical_apicid);

		clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);

		return -1;

	}

#endif



#ifdef HAVE_X2APIC

	enable_IR_x2apic();

#endif

#ifdef CONFIG_X86_64

	setup_apic_routing();

#endif



	verify_local_APIC();



	connect_bsp_APIC();



	physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);

#ifdef CONFIG_X86_64

	apic_write(APIC_ID, SET_APIC_ID(boot_cpu_physical_apicid));



#else

	/*

	 * Hack: In case of kdump, after a crash, kernel might be booting

	 * on a cpu with non-zero lapic id. But boot_cpu_physical_apicid

	 * might be zero if read from MP tables. Get it from LAPIC.

	 */

# ifdef CONFIG_CRASH_DUMP

	boot_cpu_physical_apicid = read_apic_id();

# endif

#endif

	physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);

	setup_local_APIC();



#ifdef CONFIG_X86_64

	/*

	 * Now enable IO-APICs, actually call clear_IO_APIC

	 * We need clear_IO_APIC before enabling vector on BP

	 */

	if (!skip_ioapic_setup && nr_ioapics)

		enable_IO_APIC();

#endif



#ifdef CONFIG_X86_IO_APIC

	if (!smp_found_config || skip_ioapic_setup || !nr_ioapics)

#endif

		localise_nmi_watchdog();

	end_local_APIC_setup();



#ifdef CONFIG_X86_IO_APIC

	if (smp_found_config && !skip_ioapic_setup && nr_ioapics)

		setup_IO_APIC();

# ifdef CONFIG_X86_64

	else

		nr_ioapics = 0;

# endif

#endif



#ifdef CONFIG_X86_64

	setup_boot_APIC_clock();

	check_nmi_watchdog();

#else

	setup_boot_clock();

#endif



	return 0;

}