Commit e714a91f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/apic: Move apic_init_uniprocessor code 



Move the code to a different place so we can make other functions
inline. Preparatory patch for further cleanups. No change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarBorislav Petkov <bp@alien8.de>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Tony Luck <tony.luck@intel.com>
Link: http://lkml.kernel.org/r/20150115211703.731329006@linutronix.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent ef4c59a4

arch/x86/kernel/apic/apic.c

+62 −63
Original line number Diff line number Diff line
@@ -1852,71 +1852,8 @@ void __init register_lapic_address(unsigned long address) 
	}

}



/*

 * This initializes the IO-APIC and APIC hardware if this is

 * a UP kernel.

 */

int apic_version[MAX_LOCAL_APIC];



int __init APIC_init_uniprocessor(void)

{

	if (disable_apic) {

		pr_info("Apic disabled\n");

		return -1;

	}

#ifdef CONFIG_X86_64

	if (!cpu_has_apic) {

		disable_apic = 1;

		pr_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])) {

		pr_err("BIOS bug, local APIC 0x%x not detected!...\n",

			boot_cpu_physical_apicid);

		return -1;

	}

#endif



	default_setup_apic_routing();



	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

	 * 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();



	/* Enable IO-APICs before enabling error vector */

	enable_IO_APIC();



	bsp_end_local_APIC_setup();



	if (smp_found_config)

		setup_IO_APIC();



	x86_init.timers.setup_percpu_clockev();

	return 0;

}



/*

 * Local APIC interrupts

 */
@@ -2268,6 +2205,68 @@ void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, u32 v)) 
	}

}



/*

 * This initializes the IO-APIC and APIC hardware if this is

 * a UP kernel.

 */

int __init APIC_init_uniprocessor(void)

{

	if (disable_apic) {

		pr_info("Apic disabled\n");

		return -1;

	}

#ifdef CONFIG_X86_64

	if (!cpu_has_apic) {

		disable_apic = 1;

		pr_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])) {

		pr_err("BIOS bug, local APIC 0x%x not detected!...\n",

			boot_cpu_physical_apicid);

		return -1;

	}

#endif



	default_setup_apic_routing();



	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

	 * 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();



	if (smp_found_config)

		enable_IO_APIC();



	bsp_end_local_APIC_setup();



	setup_IO_APIC();



	x86_init.timers.setup_percpu_clockev();

	return 0;

}



/*

 * Power management

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE