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

Commit e24bb60e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "[POWERPC] Don't get PCI IRQ from OF for devices with no IRQ" 



This reverts commit 41550c51.

Quoth Ben Herrenschmidt:
 "Please revert this one for now.  It seems to break G5s :( Looks like
  PCI cells inside Apple IO ASICs don't have a PCI_INTERRUPT_LINE set.
  I need to figure out a better fix."

Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0bae89ec

arch/powerpc/kernel/prom_parse.c

+6 −11
Original line number Diff line number Diff line
@@ -914,17 +914,6 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) 
	u8 pin;

	int rc;



	/* We need to first check if the PCI device has a PCI interrupt at all

	 * since we have cases where the device-node might expose non-PCI

	 * interrupts, but the device has no PCI interrupt to it

	 */

	rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin);

	if (rc != 0)

		return rc;

	/* No pin, exit */

	if (pin == 0)

		return -ENODEV;



	/* Check if we have a device node, if yes, fallback to standard OF

	 * parsing

	 */
@@ -936,6 +925,12 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) 
	 * interrupt spec.  we assume #interrupt-cells is 1, which is standard

	 * for PCI. If you do different, then don't use that routine.

	 */

	rc = pci_read_config_byte(pdev, PCI_INTERRUPT_PIN, &pin);

	if (rc != 0)

		return rc;

	/* No pin, exit */

	if (pin == 0)

		return -ENODEV;



	/* Now we walk up the PCI tree */

	lspec = pin;