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

Commit a38c5380 authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Thomas Gleixner
Browse files

x86: io_apic: Split setup_ioapic_ids_from_mpc() 



Sodaville needs to setup the IO_APIC ids as the boot loader leaves
them uninitialized. Split out the setter function so it can be called
unconditionally from the sodaville board code.

Signed-off-by: default avatarSebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <20101126165020.GA26361@www.tglx.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7fb2b870

arch/x86/include/asm/io_apic.h

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries); 
extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);



extern void setup_ioapic_ids_from_mpc(void);

extern void setup_ioapic_ids_from_mpc_nocheck(void);



struct mp_ioapic_gsi{

	u32 gsi_base;

arch/x86/kernel/apic/io_apic.c

+16 −12
Original line number Diff line number Diff line
@@ -1934,8 +1934,7 @@ void disable_IO_APIC(void) 
 *

 * by Matt Domsch <Matt_Domsch@dell.com>  Tue Dec 21 12:25:05 CST 1999

 */



void __init setup_ioapic_ids_from_mpc(void)

void __init setup_ioapic_ids_from_mpc_nocheck(void)

{

	union IO_APIC_reg_00 reg_00;

	physid_mask_t phys_id_present_map;
@@ -1944,15 +1943,6 @@ void __init setup_ioapic_ids_from_mpc(void) 
	unsigned char old_id;

	unsigned long flags;



	if (acpi_ioapic)

		return;

	/*

	 * Don't check I/O APIC IDs for xAPIC systems.  They have

	 * no meaning without the serial APIC bus.

	 */

	if (!(boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)

		|| APIC_XAPIC(apic_version[boot_cpu_physical_apicid]))

		return;

	/*

	 * This is broken; anything with a real cpu count has to

	 * circumvent this idiocy regardless.
@@ -2006,7 +1996,6 @@ void __init setup_ioapic_ids_from_mpc(void) 
			physids_or(phys_id_present_map, phys_id_present_map, tmp);

		}





		/*

		 * We need to adjust the IRQ routing table

		 * if the ID changed.
@@ -2042,6 +2031,21 @@ void __init setup_ioapic_ids_from_mpc(void) 
			apic_printk(APIC_VERBOSE, " ok.\n");

	}

}



void __init setup_ioapic_ids_from_mpc(void)

{



	if (acpi_ioapic)

		return;

	/*

	 * Don't check I/O APIC IDs for xAPIC systems.  They have

	 * no meaning without the serial APIC bus.

	 */

	if (!(boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)

		|| APIC_XAPIC(apic_version[boot_cpu_physical_apicid]))

		return;

	setup_ioapic_ids_from_mpc_nocheck();

}

#endif



int no_timer_check __initdata;