Merge branch 'remotes/lorenzo/pci/keystone' (518fc4a3) · Commits · 戴 / test

- Fix link training so we can do it more than once (Yurii Monakov) - Fix keystone outbound window mapping (Yurii Monakov) - Fix error handling when DT lacks "num-viewport" (Kishon Vijay Abraham I) * remotes/lorenzo/pci/keystone: PCI: keystone: Fix error handling when "num-viewport" DT property is not populated PCI: keystone: Fix outbound region mapping PCI: keystone: Fix link training retries initiation

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -422,7 +422,7 @@ static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)
		lower_32_bits(start) \| OB_ENABLEN);
		ks_pcie_app_writel(ks_pcie, OB_OFFSET_HI(i),
		upper_32_bits(start));
		start += OB_WIN_SIZE;
		start += OB_WIN_SIZE * SZ_1M;
		}

		val = ks_pcie_app_readl(ks_pcie, CMD_STATUS);
		@@ -510,7 +510,7 @@ static void ks_pcie_stop_link(struct dw_pcie *pci)
		/* Disable Link training */
		val = ks_pcie_app_readl(ks_pcie, CMD_STATUS);
		val &= ~LTSSM_EN_VAL;
		ks_pcie_app_writel(ks_pcie, CMD_STATUS, LTSSM_EN_VAL \| val);
		ks_pcie_app_writel(ks_pcie, CMD_STATUS, val);
		}

		static int ks_pcie_start_link(struct dw_pcie *pci)
		@@ -1354,7 +1354,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
		ret = of_property_read_u32(np, "num-viewport", &num_viewport);
		if (ret < 0) {
		dev_err(dev, "unable to read num-viewport property\n");
		return ret;
		goto err_get_sync;
		}

		/*

Admin message