| Message ID | 1728981213-8771-4-git-send-email-hongxing.zhu@nxp.com |
|---|---|
| State | New |
| Headers | show |
| Series | A bunch of changes to refine i.MX PCIe driver | expand |
On Tue, Oct 15, 2024 at 04:33:27PM +0800, Richard Zhu wrote: > Since dbi2 and atu regs are added for i.MX8M PCIes. Fetch the dbi2 and iATU > base addresses from DT directly, and remove the useless codes. > Again, what will happen to old dts that don't define these regions? - Mani > Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> > --- > drivers/pci/controller/dwc/pci-imx6.c | 20 -------------------- > 1 file changed, 20 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > index 52a8b2dc828a..2ae6fa4b5d32 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -1113,7 +1113,6 @@ static int imx_add_pcie_ep(struct imx_pcie *imx_pcie, > struct platform_device *pdev) > { > int ret; > - unsigned int pcie_dbi2_offset; > struct dw_pcie_ep *ep; > struct dw_pcie *pci = imx_pcie->pci; > struct dw_pcie_rp *pp = &pci->pp; > @@ -1123,25 +1122,6 @@ static int imx_add_pcie_ep(struct imx_pcie *imx_pcie, > ep = &pci->ep; > ep->ops = &pcie_ep_ops; > > - switch (imx_pcie->drvdata->variant) { > - case IMX8MQ_EP: > - case IMX8MM_EP: > - case IMX8MP_EP: > - pcie_dbi2_offset = SZ_1M; > - break; > - default: > - pcie_dbi2_offset = SZ_4K; > - break; > - } > - > - pci->dbi_base2 = pci->dbi_base + pcie_dbi2_offset; > - > - /* > - * FIXME: Ideally, dbi2 base address should come from DT. But since only IMX95 is defining > - * "dbi2" in DT, "dbi_base2" is set to NULL here for that platform alone so that the DWC > - * core code can fetch that from DT. But once all platform DTs were fixed, this and the > - * above "dbi_base2" setting should be removed. > - */ > if (device_property_match_string(dev, "reg-names", "dbi2") >= 0) > pci->dbi_base2 = NULL; > > -- > 2.37.1 >
On Tue, Oct 22, 2024 at 10:18:01PM +0530, Manivannan Sadhasivam wrote: > On Tue, Oct 15, 2024 at 04:33:27PM +0800, Richard Zhu wrote: > > Since dbi2 and atu regs are added for i.MX8M PCIes. Fetch the dbi2 and iATU > > base addresses from DT directly, and remove the useless codes. > > > > Again, what will happen to old dts that don't define these regions? Upsteam dts's have not enabled EP function. So not function broken for old upsteam's dtb. Frank > > - Mani > > > Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> > > --- > > drivers/pci/controller/dwc/pci-imx6.c | 20 -------------------- > > 1 file changed, 20 deletions(-) > > > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > > index 52a8b2dc828a..2ae6fa4b5d32 100644 > > --- a/drivers/pci/controller/dwc/pci-imx6.c > > +++ b/drivers/pci/controller/dwc/pci-imx6.c > > @@ -1113,7 +1113,6 @@ static int imx_add_pcie_ep(struct imx_pcie *imx_pcie, > > struct platform_device *pdev) > > { > > int ret; > > - unsigned int pcie_dbi2_offset; > > struct dw_pcie_ep *ep; > > struct dw_pcie *pci = imx_pcie->pci; > > struct dw_pcie_rp *pp = &pci->pp; > > @@ -1123,25 +1122,6 @@ static int imx_add_pcie_ep(struct imx_pcie *imx_pcie, > > ep = &pci->ep; > > ep->ops = &pcie_ep_ops; > > > > - switch (imx_pcie->drvdata->variant) { > > - case IMX8MQ_EP: > > - case IMX8MM_EP: > > - case IMX8MP_EP: > > - pcie_dbi2_offset = SZ_1M; > > - break; > > - default: > > - pcie_dbi2_offset = SZ_4K; > > - break; > > - } > > - > > - pci->dbi_base2 = pci->dbi_base + pcie_dbi2_offset; > > - > > - /* > > - * FIXME: Ideally, dbi2 base address should come from DT. But since only IMX95 is defining > > - * "dbi2" in DT, "dbi_base2" is set to NULL here for that platform alone so that the DWC > > - * core code can fetch that from DT. But once all platform DTs were fixed, this and the > > - * above "dbi_base2" setting should be removed. > > - */ > > if (device_property_match_string(dev, "reg-names", "dbi2") >= 0) > > pci->dbi_base2 = NULL; > > > > -- > > 2.37.1 > > > > -- > மணிவண்ணன் சதாசிவம்
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 52a8b2dc828a..2ae6fa4b5d32 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1113,7 +1113,6 @@ static int imx_add_pcie_ep(struct imx_pcie *imx_pcie, struct platform_device *pdev) { int ret; - unsigned int pcie_dbi2_offset; struct dw_pcie_ep *ep; struct dw_pcie *pci = imx_pcie->pci; struct dw_pcie_rp *pp = &pci->pp; @@ -1123,25 +1122,6 @@ static int imx_add_pcie_ep(struct imx_pcie *imx_pcie, ep = &pci->ep; ep->ops = &pcie_ep_ops; - switch (imx_pcie->drvdata->variant) { - case IMX8MQ_EP: - case IMX8MM_EP: - case IMX8MP_EP: - pcie_dbi2_offset = SZ_1M; - break; - default: - pcie_dbi2_offset = SZ_4K; - break; - } - - pci->dbi_base2 = pci->dbi_base + pcie_dbi2_offset; - - /* - * FIXME: Ideally, dbi2 base address should come from DT. But since only IMX95 is defining - * "dbi2" in DT, "dbi_base2" is set to NULL here for that platform alone so that the DWC - * core code can fetch that from DT. But once all platform DTs were fixed, this and the - * above "dbi_base2" setting should be removed. - */ if (device_property_match_string(dev, "reg-names", "dbi2") >= 0) pci->dbi_base2 = NULL;
Since dbi2 and atu regs are added for i.MX8M PCIes. Fetch the dbi2 and iATU base addresses from DT directly, and remove the useless codes. Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> --- drivers/pci/controller/dwc/pci-imx6.c | 20 -------------------- 1 file changed, 20 deletions(-)