Commit a0fd361d authored by Rob Herring's avatar Rob Herring Committed by Lorenzo Pieralisi
Browse files

PCI: dwc: Move "dbi", "dbi2", and "addr_space" resource setup into common code 

Most DWC drivers use the common register resource names "dbi", "dbi2", and
"addr_space", so let's move their setup into the DWC common code.

This means 'dbi_base' in particular is setup later, but it looks like no
drivers touch DBI registers before dw_pcie_host_init or dw_pcie_ep_init.

Link: https://lore.kernel.org/r/20201105211159.1814485-4-robh@kernel.org


Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Acked-by: default avatarJingoo Han <jingoohan1@gmail.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Murali Karicheri <m-karicheri2@ti.com>
Cc: Minghuan Lian <minghuan.Lian@nxp.com>
Cc: Mingkai Hu <mingkai.hu@nxp.com>
Cc: Roy Zang <roy.zang@nxp.com>
Cc: Jonathan Chocron <jonnyc@amazon.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
Cc: Xiaowei Song <songxiaowei@hisilicon.com>
Cc: Binghui Wang <wangbinghui@hisilicon.com>
Cc: Andy Gross <agross@kernel.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Stanimir Varbanov <svarbanov@mm-sol.com>
Cc: Pratyush Anand <pratyush.anand@gmail.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: linux-omap@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-arm-kernel@axis.com
Cc: linux-arm-msm@vger.kernel.org
Cc: linux-tegra@vger.kernel.org
parent 1d567aac

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

+0 −8
Original line number Diff line number Diff line
@@ -578,7 +578,6 @@ static int __init dra7xx_add_pcie_ep(struct dra7xx_pcie *dra7xx, 
{

	int ret;

	struct dw_pcie_ep *ep;

	struct resource *res;

	struct device *dev = &pdev->dev;

	struct dw_pcie *pci = dra7xx->pci;
@@ -594,13 +593,6 @@ static int __init dra7xx_add_pcie_ep(struct dra7xx_pcie *dra7xx, 
	if (IS_ERR(pci->dbi_base2))

		return PTR_ERR(pci->dbi_base2);



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "addr_space");

	if (!res)

		return -EINVAL;



	ep->phys_base = res->start;

	ep->addr_size = resource_size(res);



	ret = dw_pcie_ep_init(ep);

	if (ret) {

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

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

+1 −28
Original line number Diff line number Diff line
@@ -977,33 +977,6 @@ static const struct dw_pcie_ep_ops ks_pcie_am654_ep_ops = { 
	.get_features = &ks_pcie_am654_get_features,

};



static int __init ks_pcie_add_pcie_ep(struct keystone_pcie *ks_pcie,

				      struct platform_device *pdev)

{

	int ret;

	struct dw_pcie_ep *ep;

	struct resource *res;

	struct device *dev = &pdev->dev;

	struct dw_pcie *pci = ks_pcie->pci;



	ep = &pci->ep;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "addr_space");

	if (!res)

		return -EINVAL;



	ep->phys_base = res->start;

	ep->addr_size = resource_size(res);



	ret = dw_pcie_ep_init(ep);

	if (ret) {

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

		return ret;

	}



	return 0;

}



static void ks_pcie_disable_phy(struct keystone_pcie *ks_pcie)

{

	int num_lanes = ks_pcie->num_lanes;
@@ -1313,7 +1286,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev) 
		}



		pci->ep.ops = ep_ops;

		ret = ks_pcie_add_pcie_ep(ks_pcie, pdev);

		ret = dw_pcie_ep_init(&pci->ep);

		if (ret < 0)

			goto err_get_sync;

		break;

drivers/pci/controller/dwc/pci-layerscape-ep.c

+2 −35
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 


#include "pcie-designware.h"



#define PCIE_DBI2_OFFSET		0x1000	/* DBI2 base address*/



#define to_ls_pcie_ep(x)	dev_get_drvdata((x)->dev)



struct ls_pcie_ep_drvdata {
@@ -124,34 +122,6 @@ static const struct of_device_id ls_pcie_ep_of_match[] = { 
	{ },

};



static int __init ls_add_pcie_ep(struct ls_pcie_ep *pcie,

				 struct platform_device *pdev)

{

	struct dw_pcie *pci = pcie->pci;

	struct device *dev = pci->dev;

	struct dw_pcie_ep *ep;

	struct resource *res;

	int ret;



	ep = &pci->ep;

	ep->ops = pcie->drvdata->ops;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "addr_space");

	if (!res)

		return -EINVAL;



	ep->phys_base = res->start;

	ep->addr_size = resource_size(res);



	ret = dw_pcie_ep_init(ep);

	if (ret) {

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

		return ret;

	}



	return 0;

}



static int __init ls_pcie_ep_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -159,7 +129,6 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev) 
	struct ls_pcie_ep *pcie;

	struct pci_epc_features *ls_epc;

	struct resource *dbi_base;

	int ret;



	pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);

	if (!pcie)
@@ -188,13 +157,11 @@ static int __init ls_pcie_ep_probe(struct platform_device *pdev) 
	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);



	pci->dbi_base2 = pci->dbi_base + PCIE_DBI2_OFFSET;

	pci->ep.ops = &ls_pcie_ep_ops;



	platform_set_drvdata(pdev, pcie);



	ret = ls_add_pcie_ep(pcie, pdev);



	return ret;

	return dw_pcie_ep_init(&pci->ep);

}



static struct platform_driver ls_pcie_ep_driver = {

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

+1 −8
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ static int al_pcie_probe(struct platform_device *pdev) 
	struct device *dev = &pdev->dev;

	struct resource *controller_res;

	struct resource *ecam_res;

	struct resource *dbi_res;

	struct al_pcie *al_pcie;

	struct dw_pcie *pci;
@@ -365,11 +364,6 @@ static int al_pcie_probe(struct platform_device *pdev) 
	al_pcie->pci = pci;

	al_pcie->dev = dev;



	dbi_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");

	pci->dbi_base = devm_pci_remap_cfg_resource(dev, dbi_res);

	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);



	ecam_res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "config");

	if (!ecam_res) {

		dev_err(dev, "couldn't find 'config' reg in DT\n");
@@ -386,8 +380,7 @@ static int al_pcie_probe(struct platform_device *pdev) 
		return PTR_ERR(al_pcie->controller_base);

	}



	dev_dbg(dev, "From DT: dbi_base: %pR, controller_base: %pR\n",

		dbi_res, controller_res);

	dev_dbg(dev, "From DT: controller_base: %pR\n", controller_res);



	platform_set_drvdata(pdev, al_pcie);

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

+4 −39
Original line number Diff line number Diff line
@@ -403,38 +403,6 @@ static const struct dw_pcie_ep_ops pcie_ep_ops = { 
	.raise_irq = artpec6_pcie_raise_irq,

};



static int artpec6_add_pcie_ep(struct artpec6_pcie *artpec6_pcie,

			       struct platform_device *pdev)

{

	int ret;

	struct dw_pcie_ep *ep;

	struct resource *res;

	struct device *dev = &pdev->dev;

	struct dw_pcie *pci = artpec6_pcie->pci;



	ep = &pci->ep;

	ep->ops = &pcie_ep_ops;



	pci->dbi_base2 = devm_platform_ioremap_resource_byname(pdev, "dbi2");

	if (IS_ERR(pci->dbi_base2))

		return PTR_ERR(pci->dbi_base2);



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "addr_space");

	if (!res)

		return -EINVAL;



	ep->phys_base = res->start;

	ep->addr_size = resource_size(res);



	ret = dw_pcie_ep_init(ep);

	if (ret) {

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

		return ret;

	}



	return 0;

}



static int artpec6_pcie_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -469,10 +437,6 @@ static int artpec6_pcie_probe(struct platform_device *pdev) 
	artpec6_pcie->variant = variant;

	artpec6_pcie->mode = mode;



	pci->dbi_base = devm_platform_ioremap_resource_byname(pdev, "dbi");

	if (IS_ERR(pci->dbi_base))

		return PTR_ERR(pci->dbi_base);



	artpec6_pcie->phy_base =

		devm_platform_ioremap_resource_byname(pdev, "phy");

	if (IS_ERR(artpec6_pcie->phy_base))
@@ -504,9 +468,10 @@ static int artpec6_pcie_probe(struct platform_device *pdev) 
		val = artpec6_pcie_readl(artpec6_pcie, PCIECFG);

		val &= ~PCIECFG_DEVICE_TYPE_MASK;

		artpec6_pcie_writel(artpec6_pcie, PCIECFG, val);

		ret = artpec6_add_pcie_ep(artpec6_pcie, pdev);

		if (ret < 0)

			return ret;



		pci->ep.ops = &pcie_ep_ops;



		return dw_pcie_ep_init(&pci->ep);

		break;

	}

	default: