Commit 9f91d05e authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' 

  - Clarify that platform_get_irq() should never return 0 (Bjorn Helgaas)

  - Check for platform_get_irq() failure consistently (Bjorn Helgaas)

  - Replace zero-length array with flexible-array (Gustavo A. R. Silva)

  - Unify pcie_find_root_port() and pci_find_pcie_root_port() (Yicong Yang)

  - Quirk Intel C620 MROMs, which have non-BARs in BAR locations (Xiaochun
    Lee)

  - Fix pcie_pme_resume() and pcie_pme_remove() kernel-doc (Jay Fang)

  - Rename _DSM constants to align with spec (Krzysztof Wilczyński)

* pci/misc:
  PCI: Rename _DSM constants to align with spec
  PCI/PME: Fix kernel-doc of pcie_pme_resume() and pcie_pme_remove()
  x86/PCI: Mark Intel C620 MROMs as having non-compliant BARs
  PCI: Unify pcie_find_root_port() and pci_find_pcie_root_port()
  PCI: Replace zero-length array with flexible-array
  PCI: Check for platform_get_irq() failure consistently
  driver core: platform: Clarify that IRQ 0 is invalid
parents 08d6c8fc 3910ebac

arch/x86/pci/fixup.c

+4 −0
Original line number Diff line number Diff line
@@ -572,6 +572,10 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2fc0, pci_invalid_bar); 
DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6f60, pci_invalid_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fa0, pci_invalid_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fc0, pci_invalid_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0xa1ec, pci_invalid_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0xa1ed, pci_invalid_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0xa26c, pci_invalid_bar);

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0xa26d, pci_invalid_bar);



/*

 * Device [1022:7808]

drivers/acpi/pci_root.c

+1 −1
Original line number Diff line number Diff line
@@ -933,7 +933,7 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root, 
	 * assignments made by firmware for this host bridge.

	 */

	obj = acpi_evaluate_dsm(ACPI_HANDLE(bus->bridge), &pci_acpi_dsm_guid, 1,

	                        IGNORE_PCI_BOOT_CONFIG_DSM, NULL);

				DSM_PCI_PRESERVE_BOOT_CONFIG, NULL);

	if (obj && obj->type == ACPI_TYPE_INTEGER && obj->integer.value == 0)

		host_bridge->preserve_config = 1;

	ACPI_FREE(obj);

drivers/base/platform.c

+25 −15
Original line number Diff line number Diff line
@@ -152,23 +152,24 @@ EXPORT_SYMBOL_GPL(devm_platform_ioremap_resource_byname); 
 *		if (irq < 0)

 *			return irq;

 *

 * Return: IRQ number on success, negative error number on failure.

 * Return: non-zero IRQ number on success, negative error number on failure.

 */

int platform_get_irq_optional(struct platform_device *dev, unsigned int num)

{

	int ret;

#ifdef CONFIG_SPARC

	/* sparc does not have irqs represented as IORESOURCE_IRQ resources */

	if (!dev || num >= dev->archdata.num_irqs)

		return -ENXIO;

	return dev->archdata.irqs[num];

	ret = dev->archdata.irqs[num];

	goto out;

#else

	struct resource *r;

	int ret;



	if (IS_ENABLED(CONFIG_OF_IRQ) && dev->dev.of_node) {

		ret = of_irq_get(dev->dev.of_node, num);

		if (ret > 0 || ret == -EPROBE_DEFER)

			return ret;

			goto out;

	}



	r = platform_get_resource(dev, IORESOURCE_IRQ, num);
@@ -176,7 +177,7 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num) 
		if (r && r->flags & IORESOURCE_DISABLED) {

			ret = acpi_irq_get(ACPI_HANDLE(&dev->dev), num, r);

			if (ret)

				return ret;

				goto out;

		}

	}
@@ -190,13 +191,17 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num) 
		struct irq_data *irqd;



		irqd = irq_get_irq_data(r->start);

		if (!irqd)

			return -ENXIO;

		if (!irqd) {

			ret = -ENXIO;

			goto out;

		}

		irqd_set_trigger_type(irqd, r->flags & IORESOURCE_BITS);

	}



	if (r)

		return r->start;

	if (r) {

		ret = r->start;

		goto out;

	}



	/*

	 * For the index 0 interrupt, allow falling back to GpioInt
@@ -209,11 +214,14 @@ int platform_get_irq_optional(struct platform_device *dev, unsigned int num) 
		ret = acpi_dev_gpio_irq_get(ACPI_COMPANION(&dev->dev), num);

		/* Our callers expect -ENXIO for missing IRQs. */

		if (ret >= 0 || ret == -EPROBE_DEFER)

			return ret;

			goto out;

	}



	return -ENXIO;

	ret = -ENXIO;

#endif

out:

	WARN(ret == 0, "0 is an invalid IRQ number\n");

	return ret;

}

EXPORT_SYMBOL_GPL(platform_get_irq_optional);
@@ -231,7 +239,7 @@ EXPORT_SYMBOL_GPL(platform_get_irq_optional); 
 *		if (irq < 0)

 *			return irq;

 *

 * Return: IRQ number on success, negative error number on failure.

 * Return: non-zero IRQ number on success, negative error number on failure.

 */

int platform_get_irq(struct platform_device *dev, unsigned int num)

{
@@ -303,8 +311,10 @@ static int __platform_get_irq_byname(struct platform_device *dev, 
	}



	r = platform_get_resource_byname(dev, IORESOURCE_IRQ, name);

	if (r)

	if (r) {

		WARN(r->start == 0, "0 is an invalid IRQ number\n");

		return r->start;

	}



	return -ENXIO;

}
@@ -316,7 +326,7 @@ static int __platform_get_irq_byname(struct platform_device *dev, 
 *

 * Get an IRQ like platform_get_irq(), but then by name rather then by index.

 *

 * Return: IRQ number on success, negative error number on failure.

 * Return: non-zero IRQ number on success, negative error number on failure.

 */

int platform_get_irq_byname(struct platform_device *dev, const char *name)

{
@@ -338,7 +348,7 @@ EXPORT_SYMBOL_GPL(platform_get_irq_byname); 
 * Get an optional IRQ by name like platform_get_irq_byname(). Except that it

 * does not print an error message if an IRQ can not be obtained.

 *

 * Return: IRQ number on success, negative error number on failure.

 * Return: non-zero IRQ number on success, negative error number on failure.

 */

int platform_get_irq_byname_optional(struct platform_device *dev,

				     const char *name)

drivers/pci/controller/dwc/pci-imx6.c

+2 −2
Original line number Diff line number Diff line
@@ -868,9 +868,9 @@ static int imx6_add_pcie_port(struct imx6_pcie *imx6_pcie, 


	if (IS_ENABLED(CONFIG_PCI_MSI)) {

		pp->msi_irq = platform_get_irq_byname(pdev, "msi");

		if (pp->msi_irq <= 0) {

		if (pp->msi_irq < 0) {

			dev_err(dev, "failed to get MSI irq\n");

			return -ENODEV;

			return pp->msi_irq;

		}

	}

drivers/pci/controller/dwc/pcie-tegra194.c

+2 −2
Original line number Diff line number Diff line
@@ -2190,9 +2190,9 @@ static int tegra_pcie_dw_probe(struct platform_device *pdev) 
	}



	pp->irq = platform_get_irq_byname(pdev, "intr");

	if (!pp->irq) {

	if (pp->irq < 0) {

		dev_err(dev, "Failed to get \"intr\" interrupt\n");

		return -ENODEV;

		return pp->irq;

	}



	pcie->bpmp = tegra_bpmp_get(dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE