| Message ID | 1728981213-8771-5-git-send-email-hongxing.zhu@nxp.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | A bunch of changes to refine i.MX PCIe driver | expand |
On Tue, Oct 15, 2024 at 04:33:28PM +0800, Richard Zhu wrote: > i.MX7D only has one PCIe controller, so controller_id should always be 0. > The previous code is incorrect although yielding the correct result. Fix by > removing IMX7D from the switch case branch. > > Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> > Reviewed-by: Frank Li <Frank.Li@nxp.com> > --- > drivers/pci/controller/dwc/pci-imx6.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > index 2ae6fa4b5d32..ca8714c625fe 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -1338,7 +1338,6 @@ static int imx_pcie_probe(struct platform_device *pdev) > switch (imx_pcie->drvdata->variant) { > case IMX8MQ: > case IMX8MQ_EP: > - case IMX7D: > if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR) This is just *wrong*. You cannot hardcode the MMIO address in the driver. Even though this code is old, you should fix it instead of building on top of it. - Mani
> -----Original Message----- > From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Sent: 2024年10月23日 0:56 > To: Hongxing Zhu <hongxing.zhu@nxp.com> > Cc: kw@linux.com; bhelgaas@google.com; lpieralisi@kernel.org; Frank Li > <frank.li@nxp.com>; l.stach@pengutronix.de; robh+dt@kernel.org; > conor+dt@kernel.org; shawnguo@kernel.org; > krzysztof.kozlowski+dt@linaro.org; festevam@gmail.com; > s.hauer@pengutronix.de; linux-pci@vger.kernel.org; > linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org; > devicetree@vger.kernel.org; kernel@pengutronix.de; imx@lists.linux.dev > Subject: Re: [PATCH v4 4/9] PCI: imx6: Correct controller_id generation logic > for i.MX7D > > On Tue, Oct 15, 2024 at 04:33:28PM +0800, Richard Zhu wrote: > > i.MX7D only has one PCIe controller, so controller_id should always be 0. > > The previous code is incorrect although yielding the correct result. > > Fix by removing IMX7D from the switch case branch. > > > > Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> > > Reviewed-by: Frank Li <Frank.Li@nxp.com> > > --- > > drivers/pci/controller/dwc/pci-imx6.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c > > b/drivers/pci/controller/dwc/pci-imx6.c > > index 2ae6fa4b5d32..ca8714c625fe 100644 > > --- a/drivers/pci/controller/dwc/pci-imx6.c > > +++ b/drivers/pci/controller/dwc/pci-imx6.c > > @@ -1338,7 +1338,6 @@ static int imx_pcie_probe(struct platform_device > *pdev) > > switch (imx_pcie->drvdata->variant) { > > case IMX8MQ: > > case IMX8MQ_EP: > > - case IMX7D: > > if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR) > > This is just *wrong*. You cannot hardcode the MMIO address in the driver. > Even though this code is old, you should fix it instead of building on top of it. Hi Manivannan: Thanks for your comments. To avoid break DT compatibility, a proper method should be figured out to fix the hardcode here. But it should be another story, how about to add this to the TO-DO list, and issue the patch later? Best Regards Richard Zhu > > - Mani > > -- > மணிவண்ணன் சதாசிவம்
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 2ae6fa4b5d32..ca8714c625fe 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -1338,7 +1338,6 @@ static int imx_pcie_probe(struct platform_device *pdev) switch (imx_pcie->drvdata->variant) { case IMX8MQ: case IMX8MQ_EP: - case IMX7D: if (dbi_base->start == IMX8MQ_PCIE2_BASE_ADDR) imx_pcie->controller_id = 1; break;