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

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

x86/acpi: move pin_programmed bit map to io_apic.c 



Prepare to call setup_io_apic_routing() in pcibios_irq_enable()
also remove not needed member apic_id.

[ Impact: clean up, prepare for future change ]

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Len Brown <lenb@kernel.org>
LKML-Reference: <4A01C3DD.3050104@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a31f8205

arch/x86/kernel/acpi/boot.c

+2 −16
Original line number Diff line number Diff line
@@ -904,10 +904,8 @@ extern int es7000_plat; 
#endif



static struct {

	int apic_id;

	int gsi_base;

	int gsi_end;

	DECLARE_BITMAP(pin_programmed, MP_MAX_IOAPIC_PIN + 1);

} mp_ioapic_routing[MAX_IO_APICS];



int mp_find_ioapic(int gsi)
@@ -996,7 +994,6 @@ 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).

	 */

	mp_ioapic_routing[idx].apic_id = mp_ioapics[idx].apicid;

	mp_ioapic_routing[idx].gsi_base = gsi_base;

	mp_ioapic_routing[idx].gsi_end = gsi_base +

	    io_apic_get_redir_entries(idx);
@@ -1189,7 +1186,7 @@ static int mp_config_acpi_gsi(struct device *dev, u32 gsi, int triggering, 
	mp_irq.srcbus = number;

	mp_irq.srcbusirq = (((devfn >> 3) & 0x1f) << 2) | ((pin - 1) & 3);

	ioapic = mp_find_ioapic(gsi);

	mp_irq.dstapic = mp_ioapic_routing[ioapic].apic_id;

	mp_irq.dstapic = mp_ioapics[ioapic].apicid;

	mp_irq.dstirq = mp_find_ioapic_pin(ioapic, gsi);



	save_mp_irq(&mp_irq);
@@ -1224,23 +1221,12 @@ int mp_register_gsi(struct device *dev, u32 gsi, int triggering, int polarity) 


	if (ioapic_pin > MP_MAX_IOAPIC_PIN) {

		printk(KERN_ERR "Invalid reference to IOAPIC pin "

		       "%d-%d\n", mp_ioapic_routing[ioapic].apic_id,

		       "%d-%d\n", mp_ioapics[ioapic].apicid,

		       ioapic_pin);

		return gsi;

	}

	mp_config_acpi_gsi(dev, gsi, triggering, polarity);



	/*

	 * Avoid pin reprogramming.  PRTs typically include entries

	 * with redundant pin->gsi mappings (but unique PCI devices);

	 * we only program the IOAPIC on the first.

	 */

	if (test_bit(ioapic_pin, mp_ioapic_routing[ioapic].pin_programmed)) {

		pr_debug("Pin %d-%d already programmed\n",

			 mp_ioapic_routing[ioapic].apic_id, ioapic_pin);

		return gsi;

	}

	set_bit(ioapic_pin, mp_ioapic_routing[ioapic].pin_programmed);

	io_apic_set_pci_routing(dev, ioapic, ioapic_pin, gsi,

				triggering == ACPI_EDGE_SENSITIVE ? 0 : 1,

				polarity == ACPI_ACTIVE_HIGH ? 0 : 1);

arch/x86/kernel/apic/io_apic.c

+24 −1
Original line number Diff line number Diff line
@@ -3922,7 +3922,7 @@ int __init io_apic_get_version(int ioapic) 
}

#endif



int io_apic_set_pci_routing(struct device *dev, int ioapic, int pin, int irq,

static int __io_apic_set_pci_routing(struct device *dev, int ioapic, int pin, int irq,

				 int triggering, int polarity)

{

	struct irq_desc *desc;
@@ -3959,6 +3959,29 @@ int io_apic_set_pci_routing(struct device *dev, int ioapic, int pin, int irq, 
	return 0;

}



static struct {

	DECLARE_BITMAP(pin_programmed, MP_MAX_IOAPIC_PIN + 1);

} mp_ioapic_routing[MAX_IO_APICS];



int io_apic_set_pci_routing(struct device *dev, int ioapic, int pin, int irq,

				 int triggering, int polarity)

{



	/*

	 * Avoid pin reprogramming.  PRTs typically include entries

	 * with redundant pin->gsi mappings (but unique PCI devices);

	 * we only program the IOAPIC on the first.

	 */

	if (test_bit(pin, mp_ioapic_routing[ioapic].pin_programmed)) {

		pr_debug("Pin %d-%d already programmed\n",

			 mp_ioapics[ioapic].apicid, pin);

		return 0;

	}

	set_bit(pin, mp_ioapic_routing[ioapic].pin_programmed);



	return __io_apic_set_pci_routing(dev, ioapic, pin, irq,

					 triggering, polarity);

}



int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity)

{