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

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

x86/pci: add 4 more return parameters to IO_APIC_get_PCI_irq_vector() 



To prepare those params for pcibios_irq_enable() to call setup_io_apic_routing().

[ Impact: extend function call API to prepare for new functionality ]

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

arch/x86/include/asm/hw_irq.h

+3 −1
Original line number Diff line number Diff line
@@ -63,7 +63,9 @@ extern unsigned long io_apic_irqs; 
extern void init_VISWS_APIC_irqs(void);

extern void setup_IO_APIC(void);

extern void disable_IO_APIC(void);

extern int IO_APIC_get_PCI_irq_vector(int bus, int slot, int fn);

extern int IO_APIC_get_PCI_irq_vector(int bus, int devfn, int pin,

					int *ioapic, int *ioapic_pin,

					int *trigger, int *polarity);

extern void setup_ioapic_dest(void);



extern void enable_IO_APIC(void);

arch/x86/kernel/apic/io_apic.c

+59 −48
Original line number Diff line number Diff line
@@ -873,54 +873,6 @@ static int __init find_isa_irq_apic(int irq, int type) 
	return -1;

}



/*

 * Find a specific PCI IRQ entry.

 * Not an __init, possibly needed by modules

 */

static int pin_2_irq(int idx, int apic, int pin);



int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin)

{

	int apic, i, best_guess = -1;



	apic_printk(APIC_DEBUG, "querying PCI -> IRQ mapping bus:%d, slot:%d, pin:%d.\n",

		bus, slot, pin);

	if (test_bit(bus, mp_bus_not_pci)) {

		apic_printk(APIC_VERBOSE, "PCI BIOS passed nonexistent PCI bus %d!\n", bus);

		return -1;

	}

	for (i = 0; i < mp_irq_entries; i++) {

		int lbus = mp_irqs[i].srcbus;



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

			if (mp_ioapics[apic].apicid == mp_irqs[i].dstapic ||

			    mp_irqs[i].dstapic == MP_APIC_ALL)

				break;



		if (!test_bit(lbus, mp_bus_not_pci) &&

		    !mp_irqs[i].irqtype &&

		    (bus == lbus) &&

		    (slot == ((mp_irqs[i].srcbusirq >> 2) & 0x1f))) {

			int irq = pin_2_irq(i, apic, mp_irqs[i].dstirq);



			if (!(apic || IO_APIC_IRQ(irq)))

				continue;



			if (pin == (mp_irqs[i].srcbusirq & 3))

				return irq;

			/*

			 * Use the first all-but-pin matching entry as a

			 * best-guess fuzzy result for broken mptables.

			 */

			if (best_guess < 0)

				best_guess = irq;

		}

	}

	return best_guess;

}



EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);



#if defined(CONFIG_EISA) || defined(CONFIG_MCA)

/*

 * EISA Edge/Level control register, ELCR
@@ -1139,6 +1091,65 @@ static int pin_2_irq(int idx, int apic, int pin) 
	return irq;

}



/*

 * Find a specific PCI IRQ entry.

 * Not an __init, possibly needed by modules

 */

int IO_APIC_get_PCI_irq_vector(int bus, int slot, int pin,

				int *ioapic, int *ioapic_pin,

				int *trigger, int *polarity)

{

	int apic, i, best_guess = -1;



	apic_printk(APIC_DEBUG,

		    "querying PCI -> IRQ mapping bus:%d, slot:%d, pin:%d.\n",

		    bus, slot, pin);

	if (test_bit(bus, mp_bus_not_pci)) {

		apic_printk(APIC_VERBOSE,

			    "PCI BIOS passed nonexistent PCI bus %d!\n", bus);

		return -1;

	}

	for (i = 0; i < mp_irq_entries; i++) {

		int lbus = mp_irqs[i].srcbus;



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

			if (mp_ioapics[apic].apicid == mp_irqs[i].dstapic ||

			    mp_irqs[i].dstapic == MP_APIC_ALL)

				break;



		if (!test_bit(lbus, mp_bus_not_pci) &&

		    !mp_irqs[i].irqtype &&

		    (bus == lbus) &&

		    (slot == ((mp_irqs[i].srcbusirq >> 2) & 0x1f))) {

			int irq = pin_2_irq(i, apic, mp_irqs[i].dstirq);



			if (!(apic || IO_APIC_IRQ(irq)))

				continue;



			if (pin == (mp_irqs[i].srcbusirq & 3)) {

				*ioapic = apic;

				*ioapic_pin = mp_irqs[i].dstirq;

				*trigger = irq_trigger(i);

				*polarity = irq_polarity(i);

				return irq;

			}

			/*

			 * Use the first all-but-pin matching entry as a

			 * best-guess fuzzy result for broken mptables.

			 */

			if (best_guess < 0) {

				*ioapic = apic;

				*ioapic_pin = mp_irqs[i].dstirq;

				*trigger = irq_trigger(i);

				*polarity = irq_polarity(i);

				best_guess = irq;

			}

		}

	}

	return best_guess;

}

EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);



void lock_vector_lock(void)

{

	/* Used to the online set of cpus does not change

arch/x86/pci/irq.c

+20 −4
Original line number Diff line number Diff line
@@ -1051,12 +1051,16 @@ static void __init pcibios_fixup_irqs(void) 
		 */

		if (io_apic_assign_pci_irqs) {

			int irq;

			int ioapic = -1, ioapic_pin = -1;

			int triggering, polarity;



			/*

			 * interrupt pins are numbered starting from 1

			 */

			irq = IO_APIC_get_PCI_irq_vector(dev->bus->number,

				PCI_SLOT(dev->devfn), pin - 1);

						PCI_SLOT(dev->devfn), pin - 1,

						&ioapic, &ioapic_pin,

						&triggering, &polarity);

			/*

			 * Busses behind bridges are typically not listed in the

			 * MP-table.  In this case we have to look up the IRQ
@@ -1072,7 +1076,10 @@ static void __init pcibios_fixup_irqs(void) 
				pin = pci_swizzle_interrupt_pin(dev, pin);

				bus = bridge->bus->number;

				irq = IO_APIC_get_PCI_irq_vector(bus,

						PCI_SLOT(bridge->devfn), pin - 1);

						PCI_SLOT(bridge->devfn),

						pin - 1,

						&ioapic, &ioapic_pin,

						&triggering, &polarity);

				if (irq >= 0)

					dev_warn(&dev->dev,

						"using bridge %s INT %c to "
@@ -1221,8 +1228,14 @@ static int pirq_enable_irq(struct pci_dev *dev) 


		if (io_apic_assign_pci_irqs) {

			int irq;

			int ioapic = -1, ioapic_pin = -1;

			int triggering, polarity;



			irq = IO_APIC_get_PCI_irq_vector(dev->bus->number, PCI_SLOT(dev->devfn), pin - 1);

			irq = IO_APIC_get_PCI_irq_vector(dev->bus->number,

						PCI_SLOT(dev->devfn),

						pin - 1,

						&ioapic, &ioapic_pin,

						&triggering, &polarity);

			/*

			 * Busses behind bridges are typically not listed in the MP-table.

			 * In this case we have to look up the IRQ based on the parent bus,
@@ -1235,7 +1248,10 @@ static int pirq_enable_irq(struct pci_dev *dev) 


				pin = pci_swizzle_interrupt_pin(dev, pin);

				irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number,

						PCI_SLOT(bridge->devfn), pin - 1);

						PCI_SLOT(bridge->devfn),

						pin - 1,

						&ioapic, &ioapic_pin,

						&triggering, &polarity);

				if (irq >= 0)

					dev_warn(&dev->dev, "using bridge %s "

						 "INT %c to get IRQ %d\n",

drivers/pci/hotplug/ibmphp_core.c

+30 −26
Original line number Diff line number Diff line
@@ -153,12 +153,17 @@ int ibmphp_init_devno(struct slot **cur_slot) 
		return -1;

	}

	for (loop = 0; loop < len; loop++) {

		if ((*cur_slot)->number == rtable->slots[loop].slot) {

		if ((*cur_slot)->bus == rtable->slots[loop].bus) {

		if ((*cur_slot)->number == rtable->slots[loop].slot &&

		    (*cur_slot)->bus == rtable->slots[loop].bus) {

			int ioapic = -1, ioapic_pin = -1;

			int triggering, polarity;



			(*cur_slot)->device = PCI_SLOT(rtable->slots[loop].devfn);

			for (i = 0; i < 4; i++)

				(*cur_slot)->irq[i] = IO_APIC_get_PCI_irq_vector((int) (*cur_slot)->bus,

						(int) (*cur_slot)->device, i);

						(int) (*cur_slot)->device, i.

						&ioapic, &ioapic_pin,

						&triggering, &polarity);



			debug("(*cur_slot)->irq[0] = %x\n",

					(*cur_slot)->irq[0]);
@@ -193,7 +198,6 @@ int ibmphp_init_devno(struct slot **cur_slot) 
			return 0;

		}

	}

	}



	kfree(rtable);

	return -1;