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

Commit 7716a5c4 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by H. Peter Anvin
Browse files

x86, ioapic: Move nr_ioapic_registers calculation to mp_register_ioapic. 



Now that all ioapic registration happens in mp_register_ioapic we can
move the calculation of nr_ioapic_registers there from enable_IO_APIC.
The number of ioapic registers is already calucated in mp_register_ioapic
so all that really needs to be done is to save the caluclated value
in nr_ioapic_registers.

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
LKML-Reference: <1269936436-7039-11-git-send-email-ebiederm@xmission.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent cf7500c0

arch/x86/kernel/apic/io_apic.c

+8 −14
Original line number Diff line number Diff line
@@ -1953,20 +1953,8 @@ static struct { int pin, apic; } ioapic_i8259 = { -1, -1 }; 


void __init enable_IO_APIC(void)

{

	union IO_APIC_reg_01 reg_01;

	int i8259_apic, i8259_pin;

	int apic;

	unsigned long flags;



	/*

	 * The number of IO-APIC IRQ registers (== #pins):

	 */

	for (apic = 0; apic < nr_ioapics; apic++) {

		raw_spin_lock_irqsave(&ioapic_lock, flags);

		reg_01.raw = io_apic_read(apic, 1);

		raw_spin_unlock_irqrestore(&ioapic_lock, flags);

		nr_ioapic_registers[apic] = reg_01.bits.entries+1;

	}



	if (!legacy_pic->nr_legacy_irqs)

		return;
@@ -4293,6 +4281,7 @@ static int bad_ioapic(unsigned long address) 
void __init mp_register_ioapic(int id, u32 address, u32 gsi_base)

{

	int idx = 0;

	int entries;



	if (bad_ioapic(address))

		return;
@@ -4311,9 +4300,14 @@ void __init mp_register_ioapic(int id, u32 address, u32 gsi_base) 
	 * Build basic GSI lookup table to facilitate gsi->io_apic lookups

	 * and to prevent reprogramming of IOAPIC pins (PCI GSIs).

	 */

	entries = io_apic_get_redir_entries(idx);

	mp_gsi_routing[idx].gsi_base = gsi_base;

	mp_gsi_routing[idx].gsi_end = gsi_base +

	    io_apic_get_redir_entries(idx) - 1;

	mp_gsi_routing[idx].gsi_end = gsi_base + entries - 1;



	/*

	 * The number of IO-APIC IRQ registers (== #pins):

	 */

	nr_ioapic_registers[idx] = entries;



	if (mp_gsi_routing[idx].gsi_end > gsi_end)

		gsi_end = mp_gsi_routing[idx].gsi_end;