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

Commit 84684c74 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Andi Kleen
Browse files

PNP: avoid legacy IDE IRQs 

If an IDE controller is in compatibility mode, it expects to use
IRQs 14 and 15, so PNP should avoid them.

This patch should resolve this problem report:
  parallel driver grabs IRQ14 preventing legacy SFF ATA controller from working
  https://bugzilla.novell.com/show_bug.cgi?id=375836



Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
parent 1f32ca31

drivers/pnp/resource.c

+57 −11
Original line number Original line Diff line number Diff line
@@ -286,6 +286,61 @@ static irqreturn_t pnp_test_handler(int irq, void *dev_id) 
	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}





#ifdef CONFIG_PCI

static int pci_dev_uses_irq(struct pnp_dev *pnp, struct pci_dev *pci,

			    unsigned int irq)

{

	u32 class;

	u8 progif;



	if (pci->irq == irq) {

		dev_dbg(&pnp->dev, "device %s using irq %d\n",

			pci_name(pci), irq);

		return 1;

	}



	/*

	 * See pci_setup_device() and ata_pci_sff_activate_host() for

	 * similar IDE legacy detection.

	 */

	pci_read_config_dword(pci, PCI_CLASS_REVISION, &class);

	class >>= 8;		/* discard revision ID */

	progif = class & 0xff;

	class >>= 8;



	if (class == PCI_CLASS_STORAGE_IDE) {

		/*

		 * Unless both channels are native-PCI mode only,

		 * treat the compatibility IRQs as busy.

		 */

		if ((progif & 0x5) != 0x5)

			if (pci_get_legacy_ide_irq(pci, 0) == irq ||

			    pci_get_legacy_ide_irq(pci, 1) == irq) {

				dev_dbg(&pnp->dev, "legacy IDE device %s "

					"using irq %d\n", pci_name(pci), irq);

				return 1;

			}

	}



	return 0;

}

#endif



static int pci_uses_irq(struct pnp_dev *pnp, unsigned int irq)

{

#ifdef CONFIG_PCI

	struct pci_dev *pci = NULL;



	for_each_pci_dev(pci) {

		if (pci_dev_uses_irq(pnp, pci, irq)) {

			pci_dev_put(pci);

			return 1;

		}

	}

#endif

	return 0;

}



int pnp_check_irq(struct pnp_dev *dev, struct resource *res)

int pnp_check_irq(struct pnp_dev *dev, struct resource *res)

{

{

	int i;

	int i;
@@ -317,18 +372,9 @@ int pnp_check_irq(struct pnp_dev *dev, struct resource *res) 
		}

		}

	}

	}





#ifdef CONFIG_PCI

	/* check if the resource is being used by a pci device */

	/* check if the resource is being used by a pci device */

	{

	if (pci_uses_irq(dev, *irq))

		struct pci_dev *pci = NULL;

		for_each_pci_dev(pci) {

			if (pci->irq == *irq) {

				pci_dev_put(pci);

		return 0;

		return 0;

			}

		}

	}

#endif





	/* check if the resource is already in use, skip if the

	/* check if the resource is already in use, skip if the

	 * device is active because it itself may be in use */

	 * device is active because it itself may be in use */