Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40bd3a5f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v4.9-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

PCI changes for the v4.9 merge window:
 "Here are some more changes I'd like to have in v4.9.  There's one
  small Tegra bug fix in the PHY poweroff path, which is only used in
  failure paths.

  The rest is all strictly cleanup that should make host bridge drivers
  more readable, but shouldn't actually change any behavior.

  Summary:

   - use local struct device pointers in many host bridge drivers for
     clarity

   - remove unused platform data

   - use generic DesignWare accessors

   - misc cleanups: remove redundant structure entries and re-order
     structure members to put comon generic fields first etc"

* tag 'pci-v4.9-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (108 commits)
  MAINTAINERS: Add maintainer for the PCIe Marvell Armada 8K driver
  MAINTAINERS: Add DT binding to the Aardvark PCIe driver maintainer
  PCI: rockchip: Indent "if" statement body
  PCI: hisi: Reorder struct hisi_pcie
  PCI: hisi: Pass device-specific struct to internal functions
  PCI: hisi: Include register block base in PCIE_SYS_STATE4 address
  PCI: dra7xx: Reorder struct dra7xx_pcie
  PCI: xilinx-nwl: Remove unused platform data
  PCI: xilinx-nwl: Add local struct device pointers
  PCI: xilinx: Removed unused xilinx_pcie_assign_msi() argument
  PCI: xilinx: Remove unused platform data
  PCI: xilinx: Add local struct device pointers
  PCI: xgene: Add register accessors
  PCI: xgene: Pass struct xgene_pcie_port to setup functions
  PCI: xgene: Remove unused platform data
  PCI: tegra: Remove unused platform data
  PCI: tegra: Add local struct device pointers
  PCI: tegra: Fix argument order in tegra_pcie_phy_disable()
  PCI: rockchip: Remove unused platform data
  PCI: rcar-gen2: Add local struct device pointers
  ...
parents 44dc8c9d 217c6d21

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -9189,6 +9189,14 @@ S: Maintained 
F:	Documentation/devicetree/bindings/pci/versatile.txt

F:	drivers/pci/host/pci-versatile.c



PCI DRIVER FOR ARMADA 8K

M:	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/pci-armada8k.txt

F:	drivers/pci/host/pcie-armada8k.c



PCI DRIVER FOR APPLIEDMICRO XGENE

M:	Tanmay Inamdar <tinamdar@apm.com>

L:	linux-pci@vger.kernel.org
@@ -9235,6 +9243,7 @@ M: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/pci/aardvark-pci.txt

F:	drivers/pci/host/pci-aardvark.c



PCI DRIVER FOR NVIDIA TEGRA

drivers/pci/host/pci-aardvark.c

+20 −19
Original line number Diff line number Diff line
@@ -230,20 +230,20 @@ static int advk_pcie_link_up(struct advk_pcie *pcie) 


static int advk_pcie_wait_for_link(struct advk_pcie *pcie)

{

	struct device *dev = &pcie->pdev->dev;

	int retries;



	/* check if the link is up or not */

	for (retries = 0; retries < LINK_WAIT_MAX_RETRIES; retries++) {

		if (advk_pcie_link_up(pcie)) {

			dev_info(&pcie->pdev->dev, "link up\n");

			dev_info(dev, "link up\n");

			return 0;

		}



		usleep_range(LINK_WAIT_USLEEP_MIN, LINK_WAIT_USLEEP_MAX);

	}



	dev_err(&pcie->pdev->dev, "link never came up\n");



	dev_err(dev, "link never came up\n");

	return -ETIMEDOUT;

}
@@ -376,6 +376,7 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie) 


static void advk_pcie_check_pio_status(struct advk_pcie *pcie)

{

	struct device *dev = &pcie->pdev->dev;

	u32 reg;

	unsigned int status;

	char *strcomp_status, *str_posted;
@@ -407,12 +408,13 @@ static void advk_pcie_check_pio_status(struct advk_pcie *pcie) 
	else

		str_posted = "Posted";



	dev_err(&pcie->pdev->dev, "%s PIO Response Status: %s, %#x @ %#x\n",

	dev_err(dev, "%s PIO Response Status: %s, %#x @ %#x\n",

		str_posted, strcomp_status, reg, advk_readl(pcie, PIO_ADDR_LS));

}



static int advk_pcie_wait_pio(struct advk_pcie *pcie)

{

	struct device *dev = &pcie->pdev->dev;

	unsigned long timeout;



	timeout = jiffies + msecs_to_jiffies(PIO_TIMEOUT_MS);
@@ -426,7 +428,7 @@ static int advk_pcie_wait_pio(struct advk_pcie *pcie) 
			return 0;

	}



	dev_err(&pcie->pdev->dev, "config read/write timed out\n");

	dev_err(dev, "config read/write timed out\n");

	return -ETIMEDOUT;

}
@@ -560,10 +562,11 @@ static int advk_pcie_alloc_msi(struct advk_pcie *pcie) 


static void advk_pcie_free_msi(struct advk_pcie *pcie, int hwirq)

{

	struct device *dev = &pcie->pdev->dev;



	mutex_lock(&pcie->msi_used_lock);

	if (!test_bit(hwirq, pcie->msi_irq_in_use))

		dev_err(&pcie->pdev->dev, "trying to free unused MSI#%d\n",

			hwirq);

		dev_err(dev, "trying to free unused MSI#%d\n", hwirq);

	else

		clear_bit(hwirq, pcie->msi_irq_in_use);

	mutex_unlock(&pcie->msi_used_lock);
@@ -910,6 +913,7 @@ static int advk_pcie_parse_request_of_pci_ranges(struct advk_pcie *pcie) 


static int advk_pcie_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct advk_pcie *pcie;

	struct resource *res;

	struct pci_bus *bus, *child;
@@ -917,31 +921,29 @@ static int advk_pcie_probe(struct platform_device *pdev) 
	struct device_node *msi_node;

	int ret, irq;



	pcie = devm_kzalloc(&pdev->dev, sizeof(struct advk_pcie),

			    GFP_KERNEL);

	pcie = devm_kzalloc(dev, sizeof(struct advk_pcie), GFP_KERNEL);

	if (!pcie)

		return -ENOMEM;



	pcie->pdev = pdev;

	platform_set_drvdata(pdev, pcie);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	pcie->base = devm_ioremap_resource(&pdev->dev, res);

	pcie->base = devm_ioremap_resource(dev, res);

	if (IS_ERR(pcie->base))

		return PTR_ERR(pcie->base);



	irq = platform_get_irq(pdev, 0);

	ret = devm_request_irq(&pdev->dev, irq, advk_pcie_irq_handler,

	ret = devm_request_irq(dev, irq, advk_pcie_irq_handler,

			       IRQF_SHARED | IRQF_NO_THREAD, "advk-pcie",

			       pcie);

	if (ret) {

		dev_err(&pdev->dev, "Failed to register interrupt\n");

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

		return ret;

	}



	ret = advk_pcie_parse_request_of_pci_ranges(pcie);

	if (ret) {

		dev_err(&pdev->dev, "Failed to parse resources\n");

		dev_err(dev, "Failed to parse resources\n");

		return ret;

	}
@@ -949,24 +951,24 @@ static int advk_pcie_probe(struct platform_device *pdev) 


	ret = advk_pcie_init_irq_domain(pcie);

	if (ret) {

		dev_err(&pdev->dev, "Failed to initialize irq\n");

		dev_err(dev, "Failed to initialize irq\n");

		return ret;

	}



	ret = advk_pcie_init_msi_irq_domain(pcie);

	if (ret) {

		dev_err(&pdev->dev, "Failed to initialize irq\n");

		dev_err(dev, "Failed to initialize irq\n");

		advk_pcie_remove_irq_domain(pcie);

		return ret;

	}



	msi_node = of_parse_phandle(pdev->dev.of_node, "msi-parent", 0);

	msi_node = of_parse_phandle(dev->of_node, "msi-parent", 0);

	if (msi_node)

		msi = of_pci_find_msi_chip_by_node(msi_node);

	else

		msi = NULL;



	bus = pci_scan_root_bus_msi(&pdev->dev, 0, &advk_pcie_ops,

	bus = pci_scan_root_bus_msi(dev, 0, &advk_pcie_ops,

				    pcie, &pcie->resources, &pcie->msi);

	if (!bus) {

		advk_pcie_remove_msi_irq_domain(pcie);
@@ -980,7 +982,6 @@ static int advk_pcie_probe(struct platform_device *pdev) 
		pcie_bus_configure_settings(child);



	pci_bus_add_devices(bus);



	return 0;

}

drivers/pci/host/pci-dra7xx.c

+45 −58
Original line number Diff line number Diff line
@@ -64,11 +64,10 @@ 
#define	DRA7XX_CPU_TO_BUS_ADDR				0x0FFFFFFF



struct dra7xx_pcie {

	void __iomem		*base;

	struct phy		**phy;

	int			phy_count;

	struct device		*dev;

	struct pcie_port	pp;

	void __iomem		*base;		/* DT ti_conf */

	int			phy_count;	/* DT phy-names count */

	struct phy		**phy;

};



#define to_dra7xx_pcie(x)	container_of((x), struct dra7xx_pcie, pp)
@@ -84,17 +83,6 @@ static inline void dra7xx_pcie_writel(struct dra7xx_pcie *pcie, u32 offset, 
	writel(value, pcie->base + offset);

}



static inline u32 dra7xx_pcie_readl_rc(struct pcie_port *pp, u32 offset)

{

	return readl(pp->dbi_base + offset);

}



static inline void dra7xx_pcie_writel_rc(struct pcie_port *pp, u32 offset,

					 u32 value)

{

	writel(value, pp->dbi_base + offset);

}



static int dra7xx_pcie_link_up(struct pcie_port *pp)

{

	struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pp);
@@ -103,13 +91,14 @@ static int dra7xx_pcie_link_up(struct pcie_port *pp) 
	return !!(reg & LINK_UP);

}



static int dra7xx_pcie_establish_link(struct pcie_port *pp)

static int dra7xx_pcie_establish_link(struct dra7xx_pcie *dra7xx)

{

	struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pp);

	struct pcie_port *pp = &dra7xx->pp;

	struct device *dev = pp->dev;

	u32 reg;



	if (dw_pcie_link_up(pp)) {

		dev_err(pp->dev, "link is already up\n");

		dev_err(dev, "link is already up\n");

		return 0;

	}
@@ -120,10 +109,8 @@ static int dra7xx_pcie_establish_link(struct pcie_port *pp) 
	return dw_pcie_wait_for_link(pp);

}



static void dra7xx_pcie_enable_interrupts(struct pcie_port *pp)

static void dra7xx_pcie_enable_interrupts(struct dra7xx_pcie *dra7xx)

{

	struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pp);



	dra7xx_pcie_writel(dra7xx, PCIECTRL_DRA7XX_CONF_IRQSTATUS_MAIN,

			   ~INTERRUPTS);

	dra7xx_pcie_writel(dra7xx,
@@ -142,6 +129,8 @@ static void dra7xx_pcie_enable_interrupts(struct pcie_port *pp) 


static void dra7xx_pcie_host_init(struct pcie_port *pp)

{

	struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pp);



	pp->io_base &= DRA7XX_CPU_TO_BUS_ADDR;

	pp->mem_base &= DRA7XX_CPU_TO_BUS_ADDR;

	pp->cfg0_base &= DRA7XX_CPU_TO_BUS_ADDR;
@@ -149,10 +138,10 @@ static void dra7xx_pcie_host_init(struct pcie_port *pp) 


	dw_pcie_setup_rc(pp);



	dra7xx_pcie_establish_link(pp);

	dra7xx_pcie_establish_link(dra7xx);

	if (IS_ENABLED(CONFIG_PCI_MSI))

		dw_pcie_msi_init(pp);

	dra7xx_pcie_enable_interrupts(pp);

	dra7xx_pcie_enable_interrupts(dra7xx);

}



static struct pcie_host_ops dra7xx_pcie_host_ops = {
@@ -196,8 +185,8 @@ static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp) 


static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg)

{

	struct pcie_port *pp = arg;

	struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pp);

	struct dra7xx_pcie *dra7xx = arg;

	struct pcie_port *pp = &dra7xx->pp;

	u32 reg;



	reg = dra7xx_pcie_readl(dra7xx, PCIECTRL_DRA7XX_CONF_IRQSTATUS_MSI);
@@ -223,51 +212,51 @@ static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg) 
static irqreturn_t dra7xx_pcie_irq_handler(int irq, void *arg)

{

	struct dra7xx_pcie *dra7xx = arg;

	struct device *dev = dra7xx->pp.dev;

	u32 reg;



	reg = dra7xx_pcie_readl(dra7xx, PCIECTRL_DRA7XX_CONF_IRQSTATUS_MAIN);



	if (reg & ERR_SYS)

		dev_dbg(dra7xx->dev, "System Error\n");

		dev_dbg(dev, "System Error\n");



	if (reg & ERR_FATAL)

		dev_dbg(dra7xx->dev, "Fatal Error\n");

		dev_dbg(dev, "Fatal Error\n");



	if (reg & ERR_NONFATAL)

		dev_dbg(dra7xx->dev, "Non Fatal Error\n");

		dev_dbg(dev, "Non Fatal Error\n");



	if (reg & ERR_COR)

		dev_dbg(dra7xx->dev, "Correctable Error\n");

		dev_dbg(dev, "Correctable Error\n");



	if (reg & ERR_AXI)

		dev_dbg(dra7xx->dev, "AXI tag lookup fatal Error\n");

		dev_dbg(dev, "AXI tag lookup fatal Error\n");



	if (reg & ERR_ECRC)

		dev_dbg(dra7xx->dev, "ECRC Error\n");

		dev_dbg(dev, "ECRC Error\n");



	if (reg & PME_TURN_OFF)

		dev_dbg(dra7xx->dev,

		dev_dbg(dev,

			"Power Management Event Turn-Off message received\n");



	if (reg & PME_TO_ACK)

		dev_dbg(dra7xx->dev,

		dev_dbg(dev,

			"Power Management Turn-Off Ack message received\n");



	if (reg & PM_PME)

		dev_dbg(dra7xx->dev,

			"PM Power Management Event message received\n");

		dev_dbg(dev, "PM Power Management Event message received\n");



	if (reg & LINK_REQ_RST)

		dev_dbg(dra7xx->dev, "Link Request Reset\n");

		dev_dbg(dev, "Link Request Reset\n");



	if (reg & LINK_UP_EVT)

		dev_dbg(dra7xx->dev, "Link-up state change\n");

		dev_dbg(dev, "Link-up state change\n");



	if (reg & CFG_BME_EVT)

		dev_dbg(dra7xx->dev, "CFG 'Bus Master Enable' change\n");

		dev_dbg(dev, "CFG 'Bus Master Enable' change\n");



	if (reg & CFG_MSE_EVT)

		dev_dbg(dra7xx->dev, "CFG 'Memory Space Enable' change\n");

		dev_dbg(dev, "CFG 'Memory Space Enable' change\n");



	dra7xx_pcie_writel(dra7xx, PCIECTRL_DRA7XX_CONF_IRQSTATUS_MAIN, reg);
@@ -278,13 +267,9 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, 
				       struct platform_device *pdev)

{

	int ret;

	struct pcie_port *pp;

	struct pcie_port *pp = &dra7xx->pp;

	struct device *dev = pp->dev;

	struct resource *res;

	struct device *dev = &pdev->dev;



	pp = &dra7xx->pp;

	pp->dev = dev;

	pp->ops = &dra7xx_pcie_host_ops;



	pp->irq = platform_get_irq(pdev, 1);

	if (pp->irq < 0) {
@@ -292,12 +277,11 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, 
		return -EINVAL;

	}



	ret = devm_request_irq(&pdev->dev, pp->irq,

			       dra7xx_pcie_msi_irq_handler,

	ret = devm_request_irq(dev, pp->irq, dra7xx_pcie_msi_irq_handler,

			       IRQF_SHARED | IRQF_NO_THREAD,

			       "dra7-pcie-msi",	pp);

			       "dra7-pcie-msi",	dra7xx);

	if (ret) {

		dev_err(&pdev->dev, "failed to request irq\n");

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

		return ret;

	}
@@ -314,7 +298,7 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, 


	ret = dw_pcie_host_init(pp);

	if (ret) {

		dev_err(dra7xx->dev, "failed to initialize host\n");

		dev_err(dev, "failed to initialize host\n");

		return ret;

	}
@@ -332,6 +316,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) 
	void __iomem *base;

	struct resource *res;

	struct dra7xx_pcie *dra7xx;

	struct pcie_port *pp;

	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	char name[10];
@@ -343,6 +328,10 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) 
	if (!dra7xx)

		return -ENOMEM;



	pp = &dra7xx->pp;

	pp->dev = dev;

	pp->ops = &dra7xx_pcie_host_ops;



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(dev, "missing IRQ resource\n");
@@ -390,7 +379,6 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) 


	dra7xx->base = base;

	dra7xx->phy = phy;

	dra7xx->dev = dev;

	dra7xx->phy_count = phy_count;



	pm_runtime_enable(dev);
@@ -407,7 +395,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) 
		ret = devm_gpio_request_one(dev, gpio_sel, gpio_flags,

					    "pcie_reset");

		if (ret) {

			dev_err(&pdev->dev, "gpio%d request failed, ret %d\n",

			dev_err(dev, "gpio%d request failed, ret %d\n",

				gpio_sel, ret);

			goto err_gpio;

		}
@@ -420,12 +408,11 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) 
	reg &= ~LTSSM_EN;

	dra7xx_pcie_writel(dra7xx, PCIECTRL_DRA7XX_CONF_DEVICE_CMD, reg);



	platform_set_drvdata(pdev, dra7xx);



	ret = dra7xx_add_pcie_port(dra7xx, pdev);

	if (ret < 0)

		goto err_gpio;



	platform_set_drvdata(pdev, dra7xx);

	return 0;



err_gpio:
@@ -451,9 +438,9 @@ static int dra7xx_pcie_suspend(struct device *dev) 
	u32 val;



	/* clear MSE */

	val = dra7xx_pcie_readl_rc(pp, PCI_COMMAND);

	val = dw_pcie_readl_rc(pp, PCI_COMMAND);

	val &= ~PCI_COMMAND_MEMORY;

	dra7xx_pcie_writel_rc(pp, PCI_COMMAND, val);

	dw_pcie_writel_rc(pp, PCI_COMMAND, val);



	return 0;

}
@@ -465,9 +452,9 @@ static int dra7xx_pcie_resume(struct device *dev) 
	u32 val;



	/* set MSE */

	val = dra7xx_pcie_readl_rc(pp, PCI_COMMAND);

	val = dw_pcie_readl_rc(pp, PCI_COMMAND);

	val |= PCI_COMMAND_MEMORY;

	dra7xx_pcie_writel_rc(pp, PCI_COMMAND, val);

	dw_pcie_writel_rc(pp, PCI_COMMAND, val);



	return 0;

}

drivers/pci/host/pci-exynos.c

+102 −118

File changed.

Preview size limit exceeded, changes collapsed.

drivers/pci/host/pci-imx6.c

+126 −124

File changed.

Preview size limit exceeded, changes collapsed.