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

Merge tag 'pci-v4.5-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:
 "Enumeration:
    Revert x86 pcibios_alloc_irq() to fix regression (Bjorn Helgaas)

  Marvell MVEBU host bridge driver:
    Restrict build to 32-bit ARM (Thierry Reding)"

* tag 'pci-v4.5-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: mvebu: Restrict build to 32-bit ARM
  Revert "PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()"
  Revert "PCI: Add helpers to manage pci_dev->irq and pci_dev->irq_managed"
  Revert "x86/PCI: Don't alloc pcibios-irq when MSI is enabled"
parents b9ea44bf 61d9e854

arch/x86/include/asm/pci_x86.h

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ extern raw_spinlock_t pci_config_lock; 
extern int (*pcibios_enable_irq)(struct pci_dev *dev);

extern void (*pcibios_disable_irq)(struct pci_dev *dev);



extern bool mp_should_keep_irq(struct device *dev);



struct pci_raw_ops {

	int (*read)(unsigned int domain, unsigned int bus, unsigned int devfn,

						int reg, int len, u32 *val);

arch/x86/pci/common.c

+10 −16
Original line number Diff line number Diff line
@@ -711,30 +711,24 @@ int pcibios_add_device(struct pci_dev *dev) 
	return 0;

}



int pcibios_alloc_irq(struct pci_dev *dev)

int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	/*

	 * If the PCI device was already claimed by core code and has

	 * MSI enabled, probing of the pcibios IRQ will overwrite

	 * dev->irq.  So bail out if MSI is already enabled.

	 */

	if (pci_dev_msi_enabled(dev))

		return -EBUSY;

	int err;



	if ((err = pci_enable_resources(dev, mask)) < 0)

		return err;



	if (!pci_dev_msi_enabled(dev))

		return pcibios_enable_irq(dev);

	return 0;

}



void pcibios_free_irq(struct pci_dev *dev)

void pcibios_disable_device (struct pci_dev *dev)

{

	if (pcibios_disable_irq)

	if (!pci_dev_msi_enabled(dev) && pcibios_disable_irq)

		pcibios_disable_irq(dev);

}



int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	return pci_enable_resources(dev, mask);

}



int pci_ext_cfg_avail(void)

{

	if (raw_pci_ext_ops)

arch/x86/pci/intel_mid_pci.c

+3 −6
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev) 
	int polarity;

	int ret;



	if (pci_has_managed_irq(dev))

	if (dev->irq_managed && dev->irq > 0)

		return 0;



	switch (intel_mid_identify_cpu()) {
@@ -256,13 +256,10 @@ static int intel_mid_pci_irq_enable(struct pci_dev *dev) 


static void intel_mid_pci_irq_disable(struct pci_dev *dev)

{

	if (pci_has_managed_irq(dev)) {

	if (!mp_should_keep_irq(&dev->dev) && dev->irq_managed &&

	    dev->irq > 0) {

		mp_unmap_irq(dev->irq);

		dev->irq_managed = 0;

		/*

		 * Don't reset dev->irq here, otherwise

		 * intel_mid_pci_irq_enable() will fail on next call.

		 */

	}

}

arch/x86/pci/irq.c

+19 −4
Original line number Diff line number Diff line
@@ -1202,7 +1202,7 @@ static int pirq_enable_irq(struct pci_dev *dev) 
			struct pci_dev *temp_dev;

			int irq;



			if (pci_has_managed_irq(dev))

			if (dev->irq_managed && dev->irq > 0)

				return 0;



			irq = IO_APIC_get_PCI_irq_vector(dev->bus->number,
@@ -1230,7 +1230,8 @@ static int pirq_enable_irq(struct pci_dev *dev) 
			}

			dev = temp_dev;

			if (irq >= 0) {

				pci_set_managed_irq(dev, irq);

				dev->irq_managed = 1;

				dev->irq = irq;

				dev_info(&dev->dev, "PCI->APIC IRQ transform: "

					 "INT %c -> IRQ %d\n", 'A' + pin - 1, irq);

				return 0;
@@ -1256,10 +1257,24 @@ static int pirq_enable_irq(struct pci_dev *dev) 
	return 0;

}



bool mp_should_keep_irq(struct device *dev)

{

	if (dev->power.is_prepared)

		return true;

#ifdef CONFIG_PM

	if (dev->power.runtime_status == RPM_SUSPENDING)

		return true;

#endif



	return false;

}



static void pirq_disable_irq(struct pci_dev *dev)

{

	if (io_apic_assign_pci_irqs && pci_has_managed_irq(dev)) {

	if (io_apic_assign_pci_irqs && !mp_should_keep_irq(&dev->dev) &&

	    dev->irq_managed && dev->irq) {

		mp_unmap_irq(dev->irq);

		pci_reset_managed_irq(dev);

		dev->irq = 0;

		dev->irq_managed = 0;

	}

}

drivers/acpi/pci_irq.c

+13 −4
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev) 
		return 0;

	}



	if (pci_has_managed_irq(dev))

	if (dev->irq_managed && dev->irq > 0)

		return 0;



	entry = acpi_pci_irq_lookup(dev, pin);
@@ -451,7 +451,8 @@ int acpi_pci_irq_enable(struct pci_dev *dev) 
		kfree(entry);

		return rc;

	}

	pci_set_managed_irq(dev, rc);

	dev->irq = rc;

	dev->irq_managed = 1;



	if (link)

		snprintf(link_desc, sizeof(link_desc), " -> Link[%s]", link);
@@ -474,9 +475,17 @@ void acpi_pci_irq_disable(struct pci_dev *dev) 
	u8 pin;



	pin = dev->pin;

	if (!pin || !pci_has_managed_irq(dev))

	if (!pin || !dev->irq_managed || dev->irq <= 0)

		return;



	/* Keep IOAPIC pin configuration when suspending */

	if (dev->dev.power.is_prepared)

		return;

#ifdef	CONFIG_PM

	if (dev->dev.power.runtime_status == RPM_SUSPENDING)

		return;

#endif



	entry = acpi_pci_irq_lookup(dev, pin);

	if (!entry)

		return;
@@ -496,6 +505,6 @@ void acpi_pci_irq_disable(struct pci_dev *dev) 
	dev_dbg(&dev->dev, "PCI INT %c disabled\n", pin_name(pin));

	if (gsi >= 0) {

		acpi_unregister_gsi(gsi);

		pci_reset_managed_irq(dev);

		dev->irq_managed = 0;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE