Commit 44e56f32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull PCI fixes from Bjorn Helgaas:

 - Revert armada8k GPIO reset change that broke Macchiatobin booting
   (Baruch Siach)

 - Use actual size config reads on ARM cns3xxx (Koen Vandeputte)

 - Fix ARM cns3xxx config write alignment issue (Koen Vandeputte)

 - Fix imx6 PHY device link error checking (Leonard Crestez)

 - Fix imx6 probe failure on chips without separate PCI power domain
   (Leonard Crestez)

* tag 'pci-v5.0-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  Revert "PCI: armada8k: Add support for gpio controlled reset signal"
  ARM: cns3xxx: Use actual size reads for PCIe
  ARM: cns3xxx: Fix writing to wrong PCI config registers after alignment
  PCI: imx: Fix checking pd_pcie_phy device link addition
  PCI: imx: Fix probe failure without power domain
parents e74c98ca f14bcc0a

arch/arm/mach-cns3xxx/pcie.c

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void __iomem *cns3xxx_pci_map_bus(struct pci_bus *bus, 
	} else /* remote PCI bus */

		base = cnspci->cfg1_regs + ((busno & 0xf) << 20);



	return base + (where & 0xffc) + (devfn << 12);

	return base + where + (devfn << 12);

}



static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn,
@@ -93,7 +93,7 @@ static int cns3xxx_pci_read_config(struct pci_bus *bus, unsigned int devfn, 
	u32 mask = (0x1ull << (size * 8)) - 1;

	int shift = (where % 4) * 8;



	ret = pci_generic_config_read32(bus, devfn, where, size, val);

	ret = pci_generic_config_read(bus, devfn, where, size, val);



	if (ret == PCIBIOS_SUCCESSFUL && !bus->number && !devfn &&

	    (where & 0xffc) == PCI_CLASS_REVISION)

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

+7 −4
Original line number Diff line number Diff line
@@ -310,6 +310,9 @@ static int imx6_pcie_attach_pd(struct device *dev) 
	imx6_pcie->pd_pcie = dev_pm_domain_attach_by_name(dev, "pcie");

	if (IS_ERR(imx6_pcie->pd_pcie))

		return PTR_ERR(imx6_pcie->pd_pcie);

	/* Do nothing when power domain missing */

	if (!imx6_pcie->pd_pcie)

		return 0;

	link = device_link_add(dev, imx6_pcie->pd_pcie,

			DL_FLAG_STATELESS |

			DL_FLAG_PM_RUNTIME |
@@ -323,13 +326,13 @@ static int imx6_pcie_attach_pd(struct device *dev) 
	if (IS_ERR(imx6_pcie->pd_pcie_phy))

		return PTR_ERR(imx6_pcie->pd_pcie_phy);



	device_link_add(dev, imx6_pcie->pd_pcie_phy,

	link = device_link_add(dev, imx6_pcie->pd_pcie_phy,

			DL_FLAG_STATELESS |

			DL_FLAG_PM_RUNTIME |

			DL_FLAG_RPM_ACTIVE);

	if (IS_ERR(link)) {

		dev_err(dev, "Failed to add device_link to pcie_phy pd: %ld\n", PTR_ERR(link));

		return PTR_ERR(link);

	if (!link) {

		dev_err(dev, "Failed to add device_link to pcie_phy pd.\n");

		return -EINVAL;

	}



	return 0;

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

+0 −16
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/resource.h>

#include <linux/of_pci.h>

#include <linux/of_irq.h>

#include <linux/gpio/consumer.h>



#include "pcie-designware.h"
@@ -30,7 +29,6 @@ struct armada8k_pcie { 
	struct dw_pcie *pci;

	struct clk *clk;

	struct clk *clk_reg;

	struct gpio_desc *reset_gpio;

};



#define PCIE_VENDOR_REGS_OFFSET		0x8000
@@ -139,12 +137,6 @@ static int armada8k_pcie_host_init(struct pcie_port *pp) 
	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct armada8k_pcie *pcie = to_armada8k_pcie(pci);



	if (pcie->reset_gpio) {

		/* assert and then deassert the reset signal */

		gpiod_set_value_cansleep(pcie->reset_gpio, 1);

		msleep(100);

		gpiod_set_value_cansleep(pcie->reset_gpio, 0);

	}

	dw_pcie_setup_rc(pp);

	armada8k_pcie_establish_link(pcie);
@@ -257,14 +249,6 @@ static int armada8k_pcie_probe(struct platform_device *pdev) 
		goto fail_clkreg;

	}



	/* Get reset gpio signal and hold asserted (logically high) */

	pcie->reset_gpio = devm_gpiod_get_optional(dev, "reset",

						   GPIOD_OUT_HIGH);

	if (IS_ERR(pcie->reset_gpio)) {

		ret = PTR_ERR(pcie->reset_gpio);

		goto fail_clkreg;

	}



	platform_set_drvdata(pdev, pcie);



	ret = armada8k_add_pcie_port(pcie, pdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE