Merge branch 'pci/shengzhou-irq' into next (a690a4cb) · Commits · e / devices / android_kernel_samsung_universal8895

drivers/pci/pcie/portdrv_core.c

+11 −4

Original line number	Diff line number	Diff line
		@@ -200,10 +200,13 @@ static int init_service_irqs(struct pci_dev dev, int irqs, int mask)
		{
		int i, irq = -1;

		/* We have to use INTx if MSI cannot be used for PCIe PME or pciehp. */
		/*
		* If MSI cannot be used for PCIe PME or hotplug, we have to use
		* INTx or other interrupts, e.g. system shared interrupt.
		*/
		if (((mask & PCIE_PORT_SERVICE_PME) && pcie_pme_no_msi()) \|\|
		((mask & PCIE_PORT_SERVICE_HP) && pciehp_no_msi())) {
		if (dev->pin)
		if (dev->irq)
		irq = dev->irq;
		goto no_msi;
		}
		@@ -212,8 +215,12 @@ static int init_service_irqs(struct pci_dev dev, int irqs, int mask)
		if (!pcie_port_enable_msix(dev, irqs, mask))
		return 0;

		/* We're not going to use MSI-X, so try MSI and fall back to INTx */
		if (!pci_enable_msi(dev) \|\| dev->pin)
		/*
		* We're not going to use MSI-X, so try MSI and fall back to INTx.
		* If neither MSI/MSI-X nor INTx available, try other interrupt. On
		* some platforms, root port doesn't support MSI/MSI-X/INTx in RC mode.
		*/
		if (!pci_enable_msi(dev) \|\| dev->irq)
		irq = dev->irq;

		no_msi: