Re: [PATCH v7 06/16] PCI: imx6: Simplify ltssm_enable() by using ltssm_off and ltssm_mask

Manivannan Sadhasivam
2024-01-07T03:25:05Z

On Wed, Dec 27, 2023 at 01:27:17PM -0500, Frank Li wrote:
> Add drvdata::ltssm_off and drvdata::ltssm_mask to simple
> imx6_pcie_ltssm_enable(disable)() logic.
>
> Signed-off-by: Frank Li <Frank.Li@nxp.com>

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

- Mani

> ---
>
> Notes:
> Change from v1 to v3
> - none
>
> drivers/pci/controller/dwc/pci-imx6.c | 37 ++++++++++++---------------
> 1 file changed, 16 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
> index 332c392f8e5bc..588bfb616260e 100644
> --- a/drivers/pci/controller/dwc/pci-imx6.c
> +++ b/drivers/pci/controller/dwc/pci-imx6.c
> @@ -75,6 +75,8 @@ struct imx6_pcie_drvdata {
> int dbi_length;
> const char *gpr;
> const char *clk_names[IMX6_PCIE_MAX_CLKS];
> + const u32 ltssm_off;
> + const u32 ltssm_mask;
> };
>
> struct imx6_pcie {
> @@ -775,18 +777,11 @@ static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie)
> static void imx6_pcie_ltssm_enable(struct device *dev)
> {
> struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev);
> + const struct imx6_pcie_drvdata *drvdata = imx6_pcie->drvdata;
>
> - switch (imx6_pcie->drvdata->variant) {
> - case IMX6Q:
> - case IMX6SX:
> - case IMX6QP:
> - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
> - IMX6Q_GPR12_PCIE_CTL_2,
> - IMX6Q_GPR12_PCIE_CTL_2);
> - break;
> - default:
> - break;
> - }
> + if (drvdata->ltssm_mask)
> + regmap_update_bits(imx6_pcie->iomuxc_gpr, drvdata->ltssm_off, drvdata->ltssm_mask,
> + drvdata->ltssm_mask);
>
> reset_control_deassert(imx6_pcie->apps_reset);
> }
> @@ -794,17 +789,11 @@ static void imx6_pcie_ltssm_enable(struct device *dev)
> static void imx6_pcie_ltssm_disable(struct device *dev)
> {
> struct imx6_pcie *imx6_pcie = dev_get_drvdata(dev);
> + const struct imx6_pcie_drvdata *drvdata = imx6_pcie->drvdata;
>
> - switch (imx6_pcie->drvdata->variant) {
> - case IMX6Q:
> - case IMX6SX:
> - case IMX6QP:
> - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
> - IMX6Q_GPR12_PCIE_CTL_2, 0);
> - break;
> - default:
> - break;
> - }
> + if (drvdata->ltssm_mask)
> + regmap_update_bits(imx6_pcie->iomuxc_gpr, drvdata->ltssm_off,
> + drvdata->ltssm_mask, 0);
>
> reset_control_assert(imx6_pcie->apps_reset);
> }
> @@ -1385,6 +1374,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
> .dbi_length = 0x200,
> .gpr = "fsl,imx6q-iomuxc-gpr",
> .clk_names = {"pcie_bus", "pcie", "pcie_phy"},
> + .ltssm_off = IOMUXC_GPR12,
> + .ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
> },
> [IMX6SX] = {
> .variant = IMX6SX,
> @@ -1393,6 +1384,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
> IMX6_PCIE_FLAG_SUPPORTS_SUSPEND,
> .gpr = "fsl,imx6q-iomuxc-gpr",
> .clk_names = {"pcie_bus", "pcie", "pcie_phy", "pcie_inbound_axi"},
> + .ltssm_off = IOMUXC_GPR12,
> + .ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
> },
> [IMX6QP] = {
> .variant = IMX6QP,
> @@ -1402,6 +1395,8 @@ static const struct imx6_pcie_drvdata drvdata[] = {
> .dbi_length = 0x200,
> .gpr = "fsl,imx6q-iomuxc-gpr",
> .clk_names = {"pcie_bus", "pcie", "pcie_phy"},
> + .ltssm_off = IOMUXC_GPR12,
> + .ltssm_mask = IMX6Q_GPR12_PCIE_CTL_2,
> },
> [IMX7D] = {
> .variant = IMX7D,
> --
> 2.34.1
>

--
மணிவண்ணன் சதாசிவம்