| Message ID | 20190104165335.13205-4-andrew.smirnov@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCIE support for i.MX8MQ | expand |
Am Freitag, den 04.01.2019, 08:53 -0800 schrieb Andrey Smirnov: > Both i.MX7D and i.MX8MQ have the same behaviour when it comes to > clearing DIRECT_SPEED_CHANGE bit when no speed change occur. To > account for that change the code handling that to use a generic flag > instead of checking IP block variant. > > > Cc: Bjorn Helgaas <bhelgaas@google.com> > > Cc: Fabio Estevam <fabio.estevam@nxp.com> > > Cc: Chris Healy <cphealy@gmail.com> > > Cc: Lucas Stach <l.stach@pengutronix.de> > > Cc: Leonard Crestez <leonard.crestez@nxp.com> > > Cc: "A.s. Dong" <aisheng.dong@nxp.com> > > Cc: Richard Zhu <hongxing.zhu@nxp.com> > Cc: linux-imx@nxp.com > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Cc: linux-pci@vger.kernel.org > Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> Reviewed-by: Lucas Stach <l.stach@pengutronix.de> > --- > drivers/pci/controller/dwc/pci-imx6.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > index c55d93c1187d..75ee0cd7af3b 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -42,6 +42,7 @@ enum imx6_pcie_variants { > }; > > > #define IMX6_PCIE_FLAG_IMX6_PHY BIT(0) > > +#define IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE BIT(1) > > struct imx6_pcie_drvdata { > > enum imx6_pcie_variants variant; > @@ -711,7 +712,8 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) > > tmp |= PORT_LOGIC_SPEED_CHANGE; > > dw_pcie_writel_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL, tmp); > > > - if (imx6_pcie->drvdata->variant != IMX7D) { > > + if (imx6_pcie->drvdata->flags & > > + IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE) { > > /* > > * On i.MX7, DIRECT_SPEED_CHANGE behaves differently > > * from i.MX6 family when no link speed transition > @@ -1097,15 +1099,18 @@ static void imx6_pcie_shutdown(struct platform_device *pdev) > static const struct imx6_pcie_drvdata drvdata[] = { > > [IMX6Q] = { > > .variant = IMX6Q, > > - .flags = IMX6_PCIE_FLAG_IMX6_PHY, > > + .flags = IMX6_PCIE_FLAG_IMX6_PHY | > > + IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE, > > }, > > [IMX6SX] = { > > .variant = IMX6SX, > > - .flags = IMX6_PCIE_FLAG_IMX6_PHY, > > + .flags = IMX6_PCIE_FLAG_IMX6_PHY | > > + IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE, > > }, > > [IMX6QP] = { > > .variant = IMX6QP, > > - .flags = IMX6_PCIE_FLAG_IMX6_PHY, > > + .flags = IMX6_PCIE_FLAG_IMX6_PHY | > > + IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE, > > }, > > [IMX7D] = { > > .variant = IMX7D,
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index c55d93c1187d..75ee0cd7af3b 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -42,6 +42,7 @@ enum imx6_pcie_variants { }; #define IMX6_PCIE_FLAG_IMX6_PHY BIT(0) +#define IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE BIT(1) struct imx6_pcie_drvdata { enum imx6_pcie_variants variant; @@ -711,7 +712,8 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) tmp |= PORT_LOGIC_SPEED_CHANGE; dw_pcie_writel_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL, tmp); - if (imx6_pcie->drvdata->variant != IMX7D) { + if (imx6_pcie->drvdata->flags & + IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE) { /* * On i.MX7, DIRECT_SPEED_CHANGE behaves differently * from i.MX6 family when no link speed transition @@ -1097,15 +1099,18 @@ static void imx6_pcie_shutdown(struct platform_device *pdev) static const struct imx6_pcie_drvdata drvdata[] = { [IMX6Q] = { .variant = IMX6Q, - .flags = IMX6_PCIE_FLAG_IMX6_PHY, + .flags = IMX6_PCIE_FLAG_IMX6_PHY | + IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE, }, [IMX6SX] = { .variant = IMX6SX, - .flags = IMX6_PCIE_FLAG_IMX6_PHY, + .flags = IMX6_PCIE_FLAG_IMX6_PHY | + IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE, }, [IMX6QP] = { .variant = IMX6QP, - .flags = IMX6_PCIE_FLAG_IMX6_PHY, + .flags = IMX6_PCIE_FLAG_IMX6_PHY | + IMX6_PCIE_FLAG_IMX6_SPEED_CHANGE, }, [IMX7D] = { .variant = IMX7D,
Both i.MX7D and i.MX8MQ have the same behaviour when it comes to clearing DIRECT_SPEED_CHANGE bit when no speed change occur. To account for that change the code handling that to use a generic flag instead of checking IP block variant. Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Fabio Estevam <fabio.estevam@nxp.com> Cc: Chris Healy <cphealy@gmail.com> Cc: Lucas Stach <l.stach@pengutronix.de> Cc: Leonard Crestez <leonard.crestez@nxp.com> Cc: "A.s. Dong" <aisheng.dong@nxp.com> Cc: Richard Zhu <hongxing.zhu@nxp.com> Cc: linux-imx@nxp.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linux-pci@vger.kernel.org Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com> --- drivers/pci/controller/dwc/pci-imx6.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)