Commit 8bcca265 authored by Hou Zhiqiang's avatar Hou Zhiqiang Committed by Lorenzo Pieralisi
Browse files

PCI: dwc: Move iATU detection earlier 

dw_pcie_ep_init() depends on the detected iATU region numbers to allocate
the in/outbound window management bitmap.  It fails after 281f1f99
("PCI: dwc: Detect number of iATU windows").

Move the iATU region detection into a new function, move the detection to
the very beginning of dw_pcie_host_init() and dw_pcie_ep_init().  Also
remove it from the dw_pcie_setup(), since it's more like a software
initialization step than hardware setup.

Link: https://lore.kernel.org/r/20210125044803.4310-1-Zhiqiang.Hou@nxp.com
Link: https://lore.kernel.org/linux-pci/20210407131255.702054-1-dmitry.baryshkov@linaro.org
Link: https://lore.kernel.org/r/20210413142219.2301430-1-dmitry.baryshkov@linaro.org


Fixes: 281f1f99 ("PCI: dwc: Detect number of iATU windows")
Tested-by: default avatarKunihiko Hayashi <hayashi.kunihiko@socionext.com>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Tested-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: default avatarHou Zhiqiang <Zhiqiang.Hou@nxp.com>
[DB: moved dw_pcie_iatu_detect to happen after host_init callback]
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Cc: stable@vger.kernel.org	# v5.11+
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
parent 7d499169

drivers/pci/controller/dwc/pcie-designware-ep.c

+2 −0
Original line number Diff line number Diff line
@@ -705,6 +705,8 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep) 
		}

	}



	dw_pcie_iatu_detect(pci);



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

	if (!res)

		return -EINVAL;

drivers/pci/controller/dwc/pcie-designware-host.c

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ int dw_pcie_host_init(struct pcie_port *pp) 
		if (ret)

			goto err_free_msi;

	}

	dw_pcie_iatu_detect(pci);



	dw_pcie_setup_rc(pp);

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

+8 −3
Original line number Diff line number Diff line
@@ -660,11 +660,9 @@ static void dw_pcie_iatu_detect_regions(struct dw_pcie *pci) 
	pci->num_ob_windows = ob;

}



void dw_pcie_setup(struct dw_pcie *pci)

void dw_pcie_iatu_detect(struct dw_pcie *pci)

{

	u32 val;

	struct device *dev = pci->dev;

	struct device_node *np = dev->of_node;

	struct platform_device *pdev = to_platform_device(dev);



	if (pci->version >= 0x480A || (!pci->version &&
@@ -693,6 +691,13 @@ void dw_pcie_setup(struct dw_pcie *pci) 


	dev_info(pci->dev, "Detected iATU regions: %u outbound, %u inbound",

		 pci->num_ob_windows, pci->num_ib_windows);

}



void dw_pcie_setup(struct dw_pcie *pci)

{

	u32 val;

	struct device *dev = pci->dev;

	struct device_node *np = dev->of_node;



	if (pci->link_gen > 0)

		dw_pcie_link_set_max_speed(pci, pci->link_gen);

drivers/pci/controller/dwc/pcie-designware.h

+1 −0
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ int dw_pcie_prog_inbound_atu(struct dw_pcie *pci, u8 func_no, int index, 
void dw_pcie_disable_atu(struct dw_pcie *pci, int index,

			 enum dw_pcie_region_type type);

void dw_pcie_setup(struct dw_pcie *pci);

void dw_pcie_iatu_detect(struct dw_pcie *pci);



static inline void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val)

{