phy: qcom: qmp: Add debug prints for register writes

These register prints are useful to validate the init sequence against the
Qcom internal documentation and also to share with the Qcom hw engineers to
debug issues related to PHY.

Sample debug prints:

qcom-qmp-pcie-phy 1c0e000.phy: Writing Reg: QSERDES_V5_COM_SYSCLK_EN_SEL Offset: 0x0094 Val: 0xd9
qcom-qmp-pcie-phy 1c0e000.phy: Writing Reg: QSERDES_V5_COM_HSCLK_SEL Offset: 0x0158 Val: 0x11

Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240731152548.102987-1-manivannan.sadhasivam@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
index 7b00945f7191d7288c91da43ab86765a72daae2e..a8adc3214bfe708257ceea1212ebd5c5e4d493c2 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c
@@ -2190,24 +2190,25 @@ static int qmp_combo_dp_serdes_init(struct qmp_combo *qmp)
        void __iomem *serdes = qmp->dp_serdes;
        const struct phy_configure_opts_dp *dp_opts = &qmp->dp_opts;
 
-       qmp_configure(serdes, cfg->dp_serdes_tbl, cfg->dp_serdes_tbl_num);
+       qmp_configure(qmp->dev, serdes, cfg->dp_serdes_tbl,
+                     cfg->dp_serdes_tbl_num);
 
        switch (dp_opts->link_rate) {
        case 1620:
-               qmp_configure(serdes, cfg->serdes_tbl_rbr,
-                               cfg->serdes_tbl_rbr_num);
+               qmp_configure(qmp->dev, serdes, cfg->serdes_tbl_rbr,
+                             cfg->serdes_tbl_rbr_num);
                break;
        case 2700:
-               qmp_configure(serdes, cfg->serdes_tbl_hbr,
-                               cfg->serdes_tbl_hbr_num);
+               qmp_configure(qmp->dev, serdes, cfg->serdes_tbl_hbr,
+                             cfg->serdes_tbl_hbr_num);
                break;
        case 5400:
-               qmp_configure(serdes, cfg->serdes_tbl_hbr2,
-                               cfg->serdes_tbl_hbr2_num);
+               qmp_configure(qmp->dev, serdes, cfg->serdes_tbl_hbr2,
+                             cfg->serdes_tbl_hbr2_num);
                break;
        case 8100:
-               qmp_configure(serdes, cfg->serdes_tbl_hbr3,
-                               cfg->serdes_tbl_hbr3_num);
+               qmp_configure(qmp->dev, serdes, cfg->serdes_tbl_hbr3,
+                             cfg->serdes_tbl_hbr3_num);
                break;
        default:
                /* Other link rates aren't supported */
@@ -2807,8 +2808,8 @@ static int qmp_combo_dp_power_on(struct phy *phy)
 
        qmp_combo_dp_serdes_init(qmp);
 
-       qmp_configure_lane(tx, cfg->dp_tx_tbl, cfg->dp_tx_tbl_num, 1);
-       qmp_configure_lane(tx2, cfg->dp_tx_tbl, cfg->dp_tx_tbl_num, 2);
+       qmp_configure_lane(qmp->dev, tx, cfg->dp_tx_tbl, cfg->dp_tx_tbl_num, 1);
+       qmp_configure_lane(qmp->dev, tx2, cfg->dp_tx_tbl, cfg->dp_tx_tbl_num, 2);
 
        /* Configure special DP tx tunings */
        cfg->configure_dp_tx(qmp);
@@ -2850,7 +2851,7 @@ static int qmp_combo_usb_power_on(struct phy *phy)
        unsigned int val;
        int ret;
 
-       qmp_configure(serdes, cfg->serdes_tbl, cfg->serdes_tbl_num);
+       qmp_configure(qmp->dev, serdes, cfg->serdes_tbl, cfg->serdes_tbl_num);
 
        ret = clk_prepare_enable(qmp->pipe_clk);
        if (ret) {
@@ -2859,16 +2860,17 @@ static int qmp_combo_usb_power_on(struct phy *phy)
        }
 
        /* Tx, Rx, and PCS configurations */
-       qmp_configure_lane(tx, cfg->tx_tbl, cfg->tx_tbl_num, 1);
-       qmp_configure_lane(tx2, cfg->tx_tbl, cfg->tx_tbl_num, 2);
+       qmp_configure_lane(qmp->dev, tx, cfg->tx_tbl, cfg->tx_tbl_num, 1);
+       qmp_configure_lane(qmp->dev, tx2, cfg->tx_tbl, cfg->tx_tbl_num, 2);
 
-       qmp_configure_lane(rx, cfg->rx_tbl, cfg->rx_tbl_num, 1);
-       qmp_configure_lane(rx2, cfg->rx_tbl, cfg->rx_tbl_num, 2);
+       qmp_configure_lane(qmp->dev, rx, cfg->rx_tbl, cfg->rx_tbl_num, 1);
+       qmp_configure_lane(qmp->dev, rx2, cfg->rx_tbl, cfg->rx_tbl_num, 2);
 
-       qmp_configure(pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);
+       qmp_configure(qmp->dev, pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);
 
        if (pcs_usb)
-               qmp_configure(pcs_usb, cfg->pcs_usb_tbl, cfg->pcs_usb_tbl_num);
+               qmp_configure(qmp->dev, pcs_usb, cfg->pcs_usb_tbl,
+                             cfg->pcs_usb_tbl_num);
 
        if (cfg->has_pwrdn_delay)
                usleep_range(10, 20);

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-common.h b/drivers/phy/qualcomm/phy-qcom-qmp-common.h
index 7993842105093ff67480e67ed1839279fc82ba31..b945fc14cecec4ef00143e144cea4e10225d5947 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-common.h
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-common.h
@@ -9,6 +9,7 @@
 struct qmp_phy_init_tbl {
        unsigned int offset;
        unsigned int val;
+       char *name;
        /*
         * mask of lanes for which this register is written
         * for cases when second lane needs different values
@@ -20,6 +21,7 @@ struct qmp_phy_init_tbl {
        {                               \
                .offset = o,            \
                .val = v,               \
+               .name = #o,             \
                .lane_mask = 0xff,      \
        }
 
@@ -27,13 +29,13 @@ struct qmp_phy_init_tbl {
        {                               \
                .offset = o,            \
                .val = v,               \
+               .name = #o,             \
                .lane_mask = l,         \
        }
 
-static inline void qmp_configure_lane(void __iomem *base,
-                                          const struct qmp_phy_init_tbl tbl[],
-                                          int num,
-                                          u8 lane_mask)
+static inline void qmp_configure_lane(struct device *dev, void __iomem *base,
+                                     const struct qmp_phy_init_tbl tbl[],
+                                     int num, u8 lane_mask)
 {
        int i;
        const struct qmp_phy_init_tbl *t = tbl;
@@ -45,15 +47,16 @@ static inline void qmp_configure_lane(void __iomem *base,
                if (!(t->lane_mask & lane_mask))
                        continue;
 
+               dev_dbg(dev, "Writing Reg: %s Offset: 0x%04x Val: 0x%02x\n",
+                       t->name, t->offset, t->val);
                writel(t->val, base + t->offset);
        }
 }
 
-static inline void qmp_configure(void __iomem *base,
-                                     const struct qmp_phy_init_tbl tbl[],
-                                     int num)
+static inline void qmp_configure(struct device *dev, void __iomem *base,
+                                const struct qmp_phy_init_tbl tbl[], int num)
 {
-       qmp_configure_lane(base, tbl, num, 0xff);
+       qmp_configure_lane(dev, base, tbl, num, 0xff);
 }
 
 #endif

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c
index 0442b31205638cdea16694e256c86e436a3186e6..5f89e3a3e54f565c43e41a3716534f5218e6a937 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c
@@ -288,7 +288,7 @@ static int qmp_pcie_msm8996_serdes_init(struct qmp_phy *qphy)
        unsigned int val;
        int ret;
 
-       qmp_configure(serdes, serdes_tbl, serdes_tbl_num);
+       qmp_configure(qmp->dev, serdes, serdes_tbl, serdes_tbl_num);
 
        qphy_clrbits(serdes, cfg->regs[QPHY_COM_SW_RESET], SW_RESET);
        qphy_setbits(serdes, cfg->regs[QPHY_COM_START_CONTROL],
@@ -431,9 +431,9 @@ static int qmp_pcie_msm8996_power_on(struct phy *phy)
        }
 
        /* Tx, Rx, and PCS configurations */
-       qmp_configure_lane(tx, cfg->tx_tbl, cfg->tx_tbl_num, 1);
-       qmp_configure_lane(rx, cfg->rx_tbl, cfg->rx_tbl_num, 1);
-       qmp_configure(pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);
+       qmp_configure_lane(qmp->dev, tx, cfg->tx_tbl, cfg->tx_tbl_num, 1);
+       qmp_configure_lane(qmp->dev, rx, cfg->rx_tbl, cfg->rx_tbl_num, 1);
+       qmp_configure(qmp->dev, pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);
 
        /*
         * Pull out PHY from POWER DOWN state.

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
index 5b36cc7ac78bbc929e2d0515f2f1c54fb0dbc4b5..b09ec1d7cf5a7c4e43fddd82e72a01eda2e6479f 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
@@ -3667,11 +3667,11 @@ static void qmp_pcie_init_port_b(struct qmp_pcie *qmp, const struct qmp_phy_cfg_
        tx4 = qmp->port_b + offs->tx2;
        rx4 = qmp->port_b + offs->rx2;
 
-       qmp_configure_lane(tx3, tbls->tx, tbls->tx_num, 1);
-       qmp_configure_lane(rx3, tbls->rx, tbls->rx_num, 1);
+       qmp_configure_lane(qmp->dev, tx3, tbls->tx, tbls->tx_num, 1);
+       qmp_configure_lane(qmp->dev, rx3, tbls->rx, tbls->rx_num, 1);
 
-       qmp_configure_lane(tx4, tbls->tx, tbls->tx_num, 2);
-       qmp_configure_lane(rx4, tbls->rx, tbls->rx_num, 2);
+       qmp_configure_lane(qmp->dev, tx4, tbls->tx, tbls->tx_num, 2);
+       qmp_configure_lane(qmp->dev, rx4, tbls->rx, tbls->rx_num, 2);
 }
 
 static void qmp_pcie_init_registers(struct qmp_pcie *qmp, const struct qmp_phy_cfg_tbls *tbls)
@@ -3689,25 +3689,26 @@ static void qmp_pcie_init_registers(struct qmp_pcie *qmp, const struct qmp_phy_c
        if (!tbls)
                return;
 
-       qmp_configure(serdes, tbls->serdes, tbls->serdes_num);
+       qmp_configure(qmp->dev, serdes, tbls->serdes, tbls->serdes_num);
 
-       qmp_configure_lane(tx, tbls->tx, tbls->tx_num, 1);
-       qmp_configure_lane(rx, tbls->rx, tbls->rx_num, 1);
+       qmp_configure_lane(qmp->dev, tx, tbls->tx, tbls->tx_num, 1);
+       qmp_configure_lane(qmp->dev, rx, tbls->rx, tbls->rx_num, 1);
 
        if (cfg->lanes >= 2) {
-               qmp_configure_lane(tx2, tbls->tx, tbls->tx_num, 2);
-               qmp_configure_lane(rx2, tbls->rx, tbls->rx_num, 2);
+               qmp_configure_lane(qmp->dev, tx2, tbls->tx, tbls->tx_num, 2);
+               qmp_configure_lane(qmp->dev, rx2, tbls->rx, tbls->rx_num, 2);
        }
 
-       qmp_configure(pcs, tbls->pcs, tbls->pcs_num);
-       qmp_configure(pcs_misc, tbls->pcs_misc, tbls->pcs_misc_num);
+       qmp_configure(qmp->dev, pcs, tbls->pcs, tbls->pcs_num);
+       qmp_configure(qmp->dev, pcs_misc, tbls->pcs_misc, tbls->pcs_misc_num);
 
        if (cfg->lanes >= 4 && qmp->tcsr_4ln_config) {
-               qmp_configure(serdes, cfg->serdes_4ln_tbl, cfg->serdes_4ln_num);
+               qmp_configure(qmp->dev, serdes, cfg->serdes_4ln_tbl,
+                             cfg->serdes_4ln_num);
                qmp_pcie_init_port_b(qmp, tbls);
        }
 
-       qmp_configure(ln_shrd, tbls->ln_shrd, tbls->ln_shrd_num);
+       qmp_configure(qmp->dev, ln_shrd, tbls->ln_shrd, tbls->ln_shrd_num);
 }
 
 static int qmp_pcie_init(struct phy *phy)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
index a57e8a4657f4e4232d8f175844c12849845a8a83..d964bdfe870029226482f264c78a27d0ec43bf2b 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
@@ -1527,7 +1527,7 @@ static void qmp_ufs_serdes_init(struct qmp_ufs *qmp, const struct qmp_phy_cfg_tb
 {
        void __iomem *serdes = qmp->serdes;
 
-       qmp_configure(serdes, tbls->serdes, tbls->serdes_num);
+       qmp_configure(qmp->dev, serdes, tbls->serdes, tbls->serdes_num);
 }
 
 static void qmp_ufs_lanes_init(struct qmp_ufs *qmp, const struct qmp_phy_cfg_tbls *tbls)
@@ -1536,12 +1536,12 @@ static void qmp_ufs_lanes_init(struct qmp_ufs *qmp, const struct qmp_phy_cfg_tbl
        void __iomem *tx = qmp->tx;
        void __iomem *rx = qmp->rx;
 
-       qmp_configure_lane(tx, tbls->tx, tbls->tx_num, 1);
-       qmp_configure_lane(rx, tbls->rx, tbls->rx_num, 1);
+       qmp_configure_lane(qmp->dev, tx, tbls->tx, tbls->tx_num, 1);
+       qmp_configure_lane(qmp->dev, rx, tbls->rx, tbls->rx_num, 1);
 
        if (cfg->lanes >= 2) {
-               qmp_configure_lane(qmp->tx2, tbls->tx, tbls->tx_num, 2);
-               qmp_configure_lane(qmp->rx2, tbls->rx, tbls->rx_num, 2);
+               qmp_configure_lane(qmp->dev, qmp->tx2, tbls->tx, tbls->tx_num, 2);
+               qmp_configure_lane(qmp->dev, qmp->rx2, tbls->rx, tbls->rx_num, 2);
        }
 }
 
@@ -1549,7 +1549,7 @@ static void qmp_ufs_pcs_init(struct qmp_ufs *qmp, const struct qmp_phy_cfg_tbls
 {
        void __iomem *pcs = qmp->pcs;
 
-       qmp_configure(pcs, tbls->pcs, tbls->pcs_num);
+       qmp_configure(qmp->dev, pcs, tbls->pcs, tbls->pcs_num);
 }
 
 static int qmp_ufs_get_gear_overlay(struct qmp_ufs *qmp, const struct qmp_phy_cfg *cfg)

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
index 9b0eb87b16804a0110623feb9aef73c93f33468a..2fd49355aa37645d99e49ea521b3770c4540c732 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usb.c
@@ -1649,7 +1649,7 @@ static int qmp_usb_serdes_init(struct qmp_usb *qmp)
        const struct qmp_phy_init_tbl *serdes_tbl = cfg->serdes_tbl;
        int serdes_tbl_num = cfg->serdes_tbl_num;
 
-       qmp_configure(serdes, serdes_tbl, serdes_tbl_num);
+       qmp_configure(qmp->dev, serdes, serdes_tbl, serdes_tbl_num);
 
        return 0;
 }
@@ -1730,13 +1730,13 @@ static int qmp_usb_power_on(struct phy *phy)
        }
 
        /* Tx, Rx, and PCS configurations */
-       qmp_configure_lane(tx, cfg->tx_tbl, cfg->tx_tbl_num, 1);
-       qmp_configure_lane(rx, cfg->rx_tbl, cfg->rx_tbl_num, 1);
+       qmp_configure_lane(qmp->dev, tx, cfg->tx_tbl, cfg->tx_tbl_num, 1);
+       qmp_configure_lane(qmp->dev, rx, cfg->rx_tbl, cfg->rx_tbl_num, 1);
 
-       qmp_configure(pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);
+       qmp_configure(qmp->dev, pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);
 
        if (pcs_usb)
-               qmp_configure(pcs_usb, cfg->pcs_usb_tbl, cfg->pcs_usb_tbl_num);
+               qmp_configure(qmp->dev, pcs_usb, cfg->pcs_usb_tbl, cfg->pcs_usb_tbl_num);
 
        if (cfg->has_pwrdn_delay)
                usleep_range(10, 20);

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
index 5cbc5fd529ebe18e42586472c15bfd278e56bfb6..d4fa1063ea61dc245bc934e38af944c7778c5498 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
@@ -526,7 +526,8 @@ static int qmp_usbc_power_on(struct phy *phy)
        unsigned int val;
        int ret;
 
-       qmp_configure(qmp->serdes, cfg->serdes_tbl, cfg->serdes_tbl_num);
+       qmp_configure(qmp->dev, qmp->serdes, cfg->serdes_tbl,
+                     cfg->serdes_tbl_num);
 
        ret = clk_prepare_enable(qmp->pipe_clk);
        if (ret) {
@@ -535,13 +536,13 @@ static int qmp_usbc_power_on(struct phy *phy)
        }
 
        /* Tx, Rx, and PCS configurations */
-       qmp_configure_lane(qmp->tx, cfg->tx_tbl, cfg->tx_tbl_num, 1);
-       qmp_configure_lane(qmp->rx, cfg->rx_tbl, cfg->rx_tbl_num, 1);
+       qmp_configure_lane(qmp->dev, qmp->tx, cfg->tx_tbl, cfg->tx_tbl_num, 1);
+       qmp_configure_lane(qmp->dev, qmp->rx, cfg->rx_tbl, cfg->rx_tbl_num, 1);
 
-       qmp_configure_lane(qmp->tx2, cfg->tx_tbl, cfg->tx_tbl_num, 2);
-       qmp_configure_lane(qmp->rx2, cfg->rx_tbl, cfg->rx_tbl_num, 2);
+       qmp_configure_lane(qmp->dev, qmp->tx2, cfg->tx_tbl, cfg->tx_tbl_num, 2);
+       qmp_configure_lane(qmp->dev, qmp->rx2, cfg->rx_tbl, cfg->rx_tbl_num, 2);
 
-       qmp_configure(qmp->pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);
+       qmp_configure(qmp->dev, qmp->pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);
 
        /* Pull PHY out of reset state */
        qphy_clrbits(qmp->pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);