Commit 6c777e87 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Revert "PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()" 

991de2e5 ("PCI, x86: Implement pcibios_alloc_irq() and
pcibios_free_irq()") appeared in v4.3 and helps support IOAPIC hotplug.

Олег reported that the Elcus-1553 TA1-PCI driver worked in v4.2 but not
v4.3 and bisected it to 991de2e5.  Sunjin reported that the RocketRAID
272x driver worked in v4.2 but not v4.3.  In both cases booting with
"pci=routirq" is a workaround.

I think the problem is that after 991de2e5, we no longer call
pcibios_enable_irq() for upstream bridges.  Prior to 991de2e5, when a
driver called pci_enable_device(), we recursively called
pcibios_enable_irq() for upstream bridges via pci_enable_bridge().

After 991de2e5, we call pcibios_enable_irq() from pci_device_probe()
instead of the pci_enable_device() path, which does *not* call
pcibios_enable_irq() for upstream bridges.

Revert 991de2e5 to fix these driver regressions.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=111211


Fixes: 991de2e5 ("PCI, x86: Implement pcibios_alloc_irq() and pcibios_free_irq()")
Reported-and-tested-by: default avatarОлег Мороз <oleg.moroz@mcc.vniiem.ru>
Reported-by: default avatarSunjin Yang <fan4326@gmail.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarRafael J. Wysocki <rafael@kernel.org>
CC: Jiang Liu <jiang.liu@linux.intel.com>
parent 67b4eab9

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

+11 −9
Original line number Diff line number Diff line
@@ -711,22 +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)

{

	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

+2 −5
Original line number Diff line number Diff line
@@ -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 (dev->irq_managed && dev->irq > 0) {

	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

+14 −1
Original line number Diff line number Diff line
@@ -1257,9 +1257,22 @@ 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 && dev->irq_managed && dev->irq) {

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

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

		mp_unmap_irq(dev->irq);

		dev->irq = 0;

		dev->irq_managed = 0;

drivers/acpi/pci_irq.c

+8 −1
Original line number Diff line number Diff line
@@ -478,6 +478,14 @@ void acpi_pci_irq_disable(struct pci_dev *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;
@@ -498,6 +506,5 @@ void acpi_pci_irq_disable(struct pci_dev *dev) 
	if (gsi >= 0) {

		acpi_unregister_gsi(gsi);

		dev->irq_managed = 0;

		dev->irq = 0;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE