phy: qcom-qmp: further prep cleanups
Subsystems (2)
v2 cover phy: qcom-qmp: further prep cleanups
Here's the next batch of QMP cleanups in preparation for adding support for SC8280XP and its four-lane PCIe PHYs.
Note that these apply on top of the following two series that have been reviewed and should be ready to be merged when the PHY tree opens:
https://lore.kernel.org/linux-arm-msm/[email protected]/ https://lore.kernel.org/all/[email protected]/
After this I have one more series of related cleanups before posting the SC8280XP support.
Johan
Changes in v2
- move the 1 ms PCIe "power-down" delay to after starting the PHY which was probably the intention all along. This is done in a separate new patch 9/14. (Dmitry)
Johan Hovold (14):
phy: qcom-qmp: drop regulator error message
phy: qcom-qmp: drop superfluous comments
phy: qcom-qmp-combo: drop unused in-layout configuration
phy: qcom-qmp-pcie: drop redundant ipq8074 power on
phy: qcom-qmp-pcie-msm8996: drop unused in-layout configuration
phy: qcom-qmp-ufs: drop unused in-layout configuration
phy: qcom-qmp-usb: drop unused in-layout configuration
phy: qcom-qmp-pcie: drop power-down delay config
phy: qcom-qmp-pcie: replace power-down delay
phy: qcom-qmp-pcie-msm8996: drop power-down delay config
phy: qcom-qmp-combo: drop sc8280xp power-down delay
phy: qcom-qmp-combo: drop power-down delay config
phy: qcom-qmp-usb: drop sc8280xp power-down delay
phy: qcom-qmp-usb: drop power-down delay config
drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 81 +++---------- .../phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 55 ++------- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 106 +++--------------- drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 48 ++------ drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 89 ++------------- 5 files changed, 64 insertions(+), 315 deletions(-)
Signature · 1 line
2.35.1
PATCH v2 5/14 phy: qcom-qmp-pcie-msm8996: drop unused in-layout configuration
The MSM8996 QMP PCIe PHY driver no longer uses the "in-layout" configuration macro to configure registers that are typically accessed using "regs_layout" arrays (e.g. QPHY_START_CTRL) so drop this unused feature.
--- .../phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 34 ++++--------------- 1 file changed, 6 insertions(+), 28 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c +6 -28
@@ -46,11 +46,6 @@struct qmp_phy_init_tbl {unsigned int offset;unsigned int val; -/* -* register part of layout ? -* if yes, then offset gives index in the reg-layout -*/ -bool in_layout;/* * mask of lanes for which this register is written * for cases when second lane needs different values
@@ -65,14 +60,6 @@ struct qmp_phy_init_tbl { .lane_mask = 0xff, \ } -#define QMP_PHY_INIT_CFG_L (o, v) \ - { \ - .offset = o, \ - .val = v, \ - .in_layout = true, \ - .lane_mask = 0xff, \ - } -#define QMP_PHY_INIT_CFG_LANE (o, v, l) \ { \ .offset = o, \
@@ -346,7 +333,6 @@ static const struct qmp_phy_cfg msm8996_pciephy_cfg = { };static void qmp_pcie_msm8996_configure_lane (void __iomem *base, -const unsigned int *regs,const struct qmp_phy_init_tbl tbl[],int num,u8 lane_mask)
@@ -361,19 +347,15 @@ static void qmp_pcie_msm8996_configure_lane(void __iomem *base,if (!(t->lane_mask & lane_mask))continue ; -if (t->in_layout) -writel (t->val, base + regs[t->offset]); -else -writel (t->val, base + t->offset); +writel (t->val, base + t->offset); } }static void qmp_pcie_msm8996_configure (void __iomem *base, -const unsigned int *regs,const struct qmp_phy_init_tbl tbl[],int num) { -qmp_pcie_msm8996_configure_lane (base, regs, tbl, num,0xff ); +qmp_pcie_msm8996_configure_lane (base, tbl, num,0xff ); }static int qmp_pcie_msm8996_serdes_init (struct qmp_phy *qphy)
@@ -387,7 +369,7 @@ static int qmp_pcie_msm8996_serdes_init(struct qmp_phy *qphy)unsigned int mask, val;int ret; -qmp_pcie_msm8996_configure (serdes, cfg->regs, serdes_tbl, serdes_tbl_num); +qmp_pcie_msm8996_configure (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],
@@ -531,13 +513,9 @@ static int qmp_pcie_msm8996_power_on(struct phy *phy) }/* Tx, Rx, and PCS configurations */ -qmp_pcie_msm8996_configure_lane (tx, cfg->regs, cfg->tx_tbl, - cfg->tx_tbl_num,1 ); - -qmp_pcie_msm8996_configure_lane (rx, cfg->regs, cfg->rx_tbl, - cfg->rx_tbl_num,1 ); - -qmp_pcie_msm8996_configure (pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num); +qmp_pcie_msm8996_configure_lane (tx, cfg->tx_tbl, cfg->tx_tbl_num,1 ); +qmp_pcie_msm8996_configure_lane (rx, cfg->rx_tbl, cfg->rx_tbl_num,1 ); +qmp_pcie_msm8996_configure (pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);/* * Pull out PHY from POWER DOWN state.
Signature · 1 line
2.35.1
PATCH v2 3/14 phy: qcom-qmp-combo: drop unused in-layout configuration
In reply to Johan HovoldThe QMP combo PHY driver does not use the "in-layout" configuration macro to configure registers that are typically accessed using "regs_layout" arrays (e.g. QPHY_START_CTRL) so drop this unused feature.
--- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 54 ++++++----------------- 1 file changed, 14 insertions(+), 40 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-combo.c +14 -40
@@ -69,11 +69,6 @@struct qmp_phy_init_tbl {unsigned int offset;unsigned int val; -/* -* register part of layout ? -* if yes, then offset gives index in the reg-layout -*/ -bool in_layout;/* * mask of lanes for which this register is written * for cases when second lane needs different values
@@ -88,14 +83,6 @@ struct qmp_phy_init_tbl { .lane_mask = 0xff, \ } -#define QMP_PHY_INIT_CFG_L (o, v) \ - { \ - .offset = o, \ - .val = v, \ - .in_layout = true, \ - .lane_mask = 0xff, \ - } -#define QMP_PHY_INIT_CFG_LANE (o, v, l) \ { \ .offset = o, \
@@ -1346,7 +1333,6 @@ static const struct qmp_phy_combo_cfg sm8250_usb3dpphy_cfg = { };static void qmp_combo_configure_lane (void __iomem *base, -const unsigned int *regs,const struct qmp_phy_init_tbl tbl[],int num,u8 lane_mask)
@@ -1361,19 +1347,15 @@ static void qmp_combo_configure_lane(void __iomem *base,if (!(t->lane_mask & lane_mask))continue ; -if (t->in_layout) -writel (t->val, base + regs[t->offset]); -else -writel (t->val, base + t->offset); +writel (t->val, base + t->offset); } }static void qmp_combo_configure (void __iomem *base, -const unsigned int *regs,const struct qmp_phy_init_tbl tbl[],int num) { -qmp_combo_configure_lane (base, regs, tbl, num,0xff ); +qmp_combo_configure_lane (base, tbl, num,0xff ); }static int qmp_combo_serdes_init (struct qmp_phy *qphy)
@@ -1384,28 +1366,24 @@ static int qmp_combo_serdes_init(struct qmp_phy *qphy)const struct qmp_phy_init_tbl *serdes_tbl = cfg->serdes_tbl;int serdes_tbl_num = cfg->serdes_tbl_num; -qmp_combo_configure (serdes, cfg->regs, serdes_tbl, serdes_tbl_num); +qmp_combo_configure (serdes, serdes_tbl, serdes_tbl_num);if (cfg->type ==PHY_TYPE_DP ) {switch (dp_opts->link_rate) {case 1620 : -qmp_combo_configure (serdes, cfg->regs, - cfg->serdes_tbl_rbr, +qmp_combo_configure (serdes, cfg->serdes_tbl_rbr, cfg->serdes_tbl_rbr_num);break ;case 2700 : -qmp_combo_configure (serdes, cfg->regs, - cfg->serdes_tbl_hbr, +qmp_combo_configure (serdes, cfg->serdes_tbl_hbr, cfg->serdes_tbl_hbr_num);break ;case 5400 : -qmp_combo_configure (serdes, cfg->regs, - cfg->serdes_tbl_hbr2, +qmp_combo_configure (serdes, cfg->serdes_tbl_hbr2, cfg->serdes_tbl_hbr2_num);break ;case 8100 : -qmp_combo_configure (serdes, cfg->regs, - cfg->serdes_tbl_hbr3, +qmp_combo_configure (serdes, cfg->serdes_tbl_hbr3, cfg->serdes_tbl_hbr3_num);break ;default :
@@ -2069,29 +2047,25 @@ static int qmp_combo_power_on(struct phy *phy) }/* Tx, Rx, and PCS configurations */ -qmp_combo_configure_lane (tx, cfg->regs, cfg->tx_tbl, cfg->tx_tbl_num,1 ); +qmp_combo_configure_lane (tx, cfg->tx_tbl, cfg->tx_tbl_num,1 ); -if (cfg->lanes >=2 ) { -qmp_combo_configure_lane (qphy->tx2, cfg->regs, cfg->tx_tbl, - cfg->tx_tbl_num,2 ); - } +if (cfg->lanes >=2 ) +qmp_combo_configure_lane (qphy->tx2, cfg->tx_tbl, cfg->tx_tbl_num,2 );/* Configure special DP tx tunings */ if (cfg->type ==PHY_TYPE_DP ) cfg->configure_dp_tx (qphy); -qmp_combo_configure_lane (rx, cfg->regs, cfg->rx_tbl, cfg->rx_tbl_num,1 ); +qmp_combo_configure_lane (rx, cfg->rx_tbl, cfg->rx_tbl_num,1 ); -if (cfg->lanes >=2 ) { -qmp_combo_configure_lane (qphy->rx2, cfg->regs, cfg->rx_tbl, - cfg->rx_tbl_num,2 ); - } +if (cfg->lanes >=2 ) +qmp_combo_configure_lane (qphy->rx2, cfg->rx_tbl, cfg->rx_tbl_num,2 );/* Configure link rate, swing, etc. */ if (cfg->type ==PHY_TYPE_DP ) cfg->configure_dp_phy (qphy);else -qmp_combo_configure (pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num); +qmp_combo_configure (pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);if (cfg->has_pwrdn_delay)usleep_range (cfg->pwrdn_delay_min, cfg->pwrdn_delay_max);
Signature · 1 line
2.35.1
PATCH v2 11/14 phy: qcom-qmp-combo: drop sc8280xp power-down delay
In reply to Johan HovoldThe SC8280XP combo PHY does not need a delay before starting the USB PHY (which is what the has_pwrdn_delay config option really controls) so drop the unnecessary delay.
--- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-combo.c +0 -4
@@ -1210,10 +1210,6 @@ static const struct qmp_phy_cfg sc8280xp_usb43dp_usb_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN, .phy_status = PHYSTATUS, - - .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, };static const struct qmp_phy_cfg sc8280xp_usb43dp_dp_cfg = {
Signature · 7 lines
2.35.1 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v2 2/14 phy: qcom-qmp: drop superfluous comments
In reply to Johan HovoldDrop some unnecessary or incorrect comments.
--- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 4 ---- drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 3 --- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 3 --- drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 3 --- drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 5 ----- 5 files changed, 18 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-combo.c +0 -4
@@ -1949,7 +1949,6 @@ static int qmp_combo_com_init(struct qmp_phy *qphy)return 0 ; } -/* turn on regulator supplies */ ret =regulator_bulk_enable (cfg->num_vregs, qmp->vregs);if (ret) {dev_err (qmp->dev,"failed to enable regulators, err=%d\n" , ret);
@@ -2779,7 +2778,6 @@ static int qmp_combo_probe(struct platform_device *pdev) qmp->dev = dev;dev_set_drvdata (dev, qmp); -/* Get the specific init parameters of QMP phy */ combo_cfg =of_device_get_match_data (dev);if (!combo_cfg)return -EINVAL ;
@@ -2787,7 +2785,6 @@ static int qmp_combo_probe(struct platform_device *pdev) usb_cfg = combo_cfg->usb_cfg; cfg = usb_cfg;/* Setup clks and regulators */ -/* per PHY serdes; usually located at base address */ usb_serdes = serdes =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (serdes))return PTR_ERR (serdes);
@@ -2796,7 +2793,6 @@ static int qmp_combo_probe(struct platform_device *pdev)if (IS_ERR (qmp->dp_com))return PTR_ERR (qmp->dp_com); -/* Only two serdes for combo PHY */ dp_serdes =devm_platform_ioremap_resource (pdev,2 );if (IS_ERR (dp_serdes))return PTR_ERR (dp_serdes);
drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c +0 -3
@@ -420,7 +420,6 @@ static int qmp_pcie_msm8996_com_init(struct qmp_phy *qphy)return 0 ; } -/* turn on regulator supplies */ ret =regulator_bulk_enable (cfg->num_vregs, qmp->vregs);if (ret) {dev_err (qmp->dev,"failed to enable regulators, err=%d\n" , ret);
@@ -845,12 +844,10 @@ static int qmp_pcie_msm8996_probe(struct platform_device *pdev) qmp->dev = dev;dev_set_drvdata (dev, qmp); -/* Get the specific init parameters of QMP phy */ cfg =of_device_get_match_data (dev);if (!cfg)return -EINVAL ; -/* per PHY serdes; usually located at base address */ serdes =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (serdes))return PTR_ERR (serdes);
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +0 -3
@@ -1978,7 +1978,6 @@ static int qmp_pcie_init(struct phy *phy)const struct qmp_phy_cfg *cfg = qphy->cfg;int ret; -/* turn on regulator supplies */ ret =regulator_bulk_enable (cfg->num_vregs, qmp->vregs);if (ret) {dev_err (qmp->dev,"failed to enable regulators, err=%d\n" , ret);
@@ -2425,12 +2424,10 @@ static int qmp_pcie_probe(struct platform_device *pdev) qmp->dev = dev;dev_set_drvdata (dev, qmp); -/* Get the specific init parameters of QMP phy */ cfg =of_device_get_match_data (dev);if (!cfg)return -EINVAL ; -/* per PHY serdes; usually located at base address */ serdes =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (serdes))return PTR_ERR (serdes);
drivers/phy/qualcomm/phy-qcom-qmp-ufs.c +0 -3
@@ -849,7 +849,6 @@ static int qmp_ufs_com_init(struct qmp_phy *qphy)void __iomem *pcs = qphy->pcs;int ret; -/* turn on regulator supplies */ ret =regulator_bulk_enable (cfg->num_vregs, qmp->vregs);if (ret) {dev_err (qmp->dev,"failed to enable regulators, err=%d\n" , ret);
@@ -1194,12 +1193,10 @@ static int qmp_ufs_probe(struct platform_device *pdev) qmp->dev = dev;dev_set_drvdata (dev, qmp); -/* Get the specific init parameters of QMP phy */ cfg =of_device_get_match_data (dev);if (!cfg)return -EINVAL ; -/* per PHY serdes; usually located at base address */ serdes =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (serdes))return PTR_ERR (serdes);
drivers/phy/qualcomm/phy-qcom-qmp-usb.c +0 -5
@@ -2120,7 +2120,6 @@ static int qmp_usb_init(struct phy *phy)void __iomem *dp_com = qmp->dp_com;int ret; -/* turn on regulator supplies */ ret =regulator_bulk_enable (cfg->num_vregs, qmp->vregs);if (ret) {dev_err (qmp->dev,"failed to enable regulators, err=%d\n" , ret);
@@ -2229,7 +2228,6 @@ static int qmp_usb_power_on(struct phy *phy) cfg->rx_tbl, cfg->rx_tbl_num, 2); } -/* Configure link rate, swing, etc. */ qmp_usb_configure (pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num);if (cfg->has_pwrdn_delay)
@@ -2719,17 +2717,14 @@ static int qmp_usb_probe(struct platform_device *pdev) qmp->dev = dev;dev_set_drvdata (dev, qmp); -/* Get the specific init parameters of QMP phy */ cfg =of_device_get_match_data (dev);if (!cfg)return -EINVAL ; -/* per PHY serdes; usually located at base address */ serdes =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (serdes))return PTR_ERR (serdes); -/* per PHY dp_com; if PHY has dp_com control block */ if (cfg->has_phy_dp_com_ctrl) { qmp->dp_com =devm_platform_ioremap_resource (pdev,1 );if (IS_ERR (qmp->dp_com))
Signature · 1 line
2.35.1
PATCH v2 4/14 phy: qcom-qmp-pcie: drop redundant ipq8074 power on
In reply to Johan HovoldThe PCS initialisation table for IPQ8074 includes updates of the reset and start-control registers which is already handled explicitly by the driver during power on.
Drop the redundant register write from the IPQ8074 configuration table and along with it the now unused "in-layout" configuration macro and code.
--- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 42 +++++------------------- 1 file changed, 9 insertions(+), 33 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +9 -33
@@ -42,11 +42,6 @@struct qmp_phy_init_tbl {unsigned int offset;unsigned int val; -/* -* register part of layout ? -* if yes, then offset gives index in the reg-layout -*/ -bool in_layout;/* * mask of lanes for which this register is written * for cases when second lane needs different values
@@ -61,14 +56,6 @@ struct qmp_phy_init_tbl { .lane_mask = 0xff, \ } -#define QMP_PHY_INIT_CFG_L (o, v) \ - { \ - .offset = o, \ - .val = v, \ - .in_layout = true, \ - .lane_mask = 0xff, \ - } -#define QMP_PHY_INIT_CFG_LANE (o, v, l) \ { \ .offset = o, \
@@ -388,8 +375,6 @@ static const struct qmp_phy_init_tbl ipq8074_pcie_pcs_tbl[] = {QMP_PHY_INIT_CFG (QPHY_V2_PCS_RX_SIGDET_LVL ,0x99 ),QMP_PHY_INIT_CFG (QPHY_V2_PCS_TXDEEMPH_M6DB_V0 ,0x15 ), QMP_PHY_INIT_CFG(QPHY_V2_PCS_TXDEEMPH_M3P5DB_V0, 0xe), -QMP_PHY_INIT_CFG_L (QPHY_SW_RESET ,0x0 ), - QMP_PHY_INIT_CFG_L(QPHY_START_CTRL, 0x3), }; static const struct qmp_phy_init_tbl ipq8074_pcie_gen3_serdes_tbl[] = {
@@ -1896,7 +1881,6 @@ static const struct qmp_phy_cfg sm8450_qmp_gen4x2_pciephy_cfg = { };static void qmp_pcie_configure_lane (void __iomem *base, -const unsigned int *regs,const struct qmp_phy_init_tbl tbl[],int num,u8 lane_mask)
@@ -1911,30 +1895,25 @@ static void qmp_pcie_configure_lane(void __iomem *base,if (!(t->lane_mask & lane_mask))continue ; -if (t->in_layout) -writel (t->val, base + regs[t->offset]); -else -writel (t->val, base + t->offset); +writel (t->val, base + t->offset); } }static void qmp_pcie_configure (void __iomem *base, -const unsigned int *regs,const struct qmp_phy_init_tbl tbl[],int num) { -qmp_pcie_configure_lane (base, regs, tbl, num,0xff ); +qmp_pcie_configure_lane (base, tbl, num,0xff ); }static void qmp_pcie_serdes_init (struct qmp_phy *qphy,const struct qmp_phy_cfg_tables *tables) { -const struct qmp_phy_cfg *cfg = qphy->cfg;void __iomem *serdes = qphy->serdes;if (!tables)return ; -qmp_pcie_configure (serdes, cfg->regs, tables->serdes, tables->serdes_num); +qmp_pcie_configure (serdes, tables->serdes, tables->serdes_num); }static void qmp_pcie_lanes_init (struct qmp_phy *qphy,const struct qmp_phy_cfg_tables *tables)
@@ -1946,29 +1925,26 @@ static void qmp_pcie_lanes_init(struct qmp_phy *qphy, const struct qmp_phy_cfg_tif (!tables)return ; -qmp_pcie_configure_lane (tx, cfg->regs, tables->tx, tables->tx_num,1 ); +qmp_pcie_configure_lane (tx, tables->tx, tables->tx_num,1 );if (cfg->lanes >=2 ) -qmp_pcie_configure_lane (qphy->tx2, cfg->regs, tables->tx, tables->tx_num,2 ); +qmp_pcie_configure_lane (qphy->tx2, tables->tx, tables->tx_num,2 ); -qmp_pcie_configure_lane (rx, cfg->regs, tables->rx, tables->rx_num,1 ); +qmp_pcie_configure_lane (rx, tables->rx, tables->rx_num,1 );if (cfg->lanes >=2 ) -qmp_pcie_configure_lane (qphy->rx2, cfg->regs, tables->rx, tables->rx_num,2 ); +qmp_pcie_configure_lane (qphy->rx2, tables->rx, tables->rx_num,2 ); }static void qmp_pcie_pcs_init (struct qmp_phy *qphy,const struct qmp_phy_cfg_tables *tables) { -const struct qmp_phy_cfg *cfg = qphy->cfg;void __iomem *pcs = qphy->pcs;void __iomem *pcs_misc = qphy->pcs_misc;if (!tables)return ; -qmp_pcie_configure (pcs, cfg->regs, - tables->pcs, tables->pcs_num); -qmp_pcie_configure (pcs_misc, cfg->regs, - tables->pcs_misc, tables->pcs_misc_num); +qmp_pcie_configure (pcs, tables->pcs, tables->pcs_num); +qmp_pcie_configure (pcs_misc, tables->pcs_misc, tables->pcs_misc_num); }static int qmp_pcie_init (struct phy *phy)
Signature · 1 line
2.35.1
PATCH v2 10/14 phy: qcom-qmp-pcie-msm8996: drop power-down delay config
In reply to Johan HovoldThe power-down delay was included in the first version of the QMP driver for MSM8996 as an optional delay after powering on the PHY (using POWER_DOWN_CONTROL) and just before starting it. Later changes modified this sequence by powering on before initialising the PHY, but the optional delay stayed where it was (i.e. before starting the PHY).
The vendor driver does not use a delay before starting the PHY and this is likely not needed on any platform unless there is a corresponding delay in the vendor kernel init sequence tables (i.e. in devicetree).
Let's keep the delay for now, but drop the redundant configuration options while increasing the unnecessarily low timer slack somewhat.
--- drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c +2 -13
@@ -41,7 +41,7 @@#define PHY_INIT_COMPLETE_TIMEOUT 10000#define POWER_DOWN_DELAY_US_MIN 10 -#define POWER_DOWN_DELAY_US_MAX 11 +#define POWER_DOWN_DELAY_US_MAX 20struct qmp_phy_init_tbl {unsigned int offset;
@@ -203,12 +203,6 @@ struct qmp_phy_cfg {unsigned int mask_com_pcs_ready;/* bit offset of PHYSTATUS in QPHY_PCS_STATUS register */ unsigned int phy_status; - -/* true, if PHY needs delay after POWER_DOWN */ -bool has_pwrdn_delay; -/* power_down delay in usec */ -int pwrdn_delay_min; -int pwrdn_delay_max; };/**
@@ -326,10 +320,6 @@ static const struct qmp_phy_cfg msm8996_pciephy_cfg = { .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, .mask_com_pcs_ready = PCS_READY, .phy_status = PHYSTATUS, - - .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, }; static void qmp_pcie_msm8996_configure_lane(void __iomem *base,
@@ -523,8 +513,7 @@ static int qmp_pcie_msm8996_power_on(struct phy *phy)*/ qphy_setbits (pcs,QPHY_V2_PCS_POWER_DOWN_CONTROL , cfg->pwrdn_ctrl); -if (cfg->has_pwrdn_delay) -usleep_range (cfg->pwrdn_delay_min, cfg->pwrdn_delay_max); +usleep_range (POWER_DOWN_DELAY_US_MIN ,POWER_DOWN_DELAY_US_MAX );/* Pull PHY out of reset state */ qphy_clrbits (pcs, cfg->regs[QPHY_SW_RESET ],SW_RESET );
Signature · 7 lines
2.35.1 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v2 7/14 phy: qcom-qmp-usb: drop unused in-layout configuration
In reply to Johan HovoldThe QMP USB PHY driver does not use the "in-layout" configuration macro to configure registers that are typically accessed using "regs_layout" arrays (e.g. QPHY_START_CTRL) so drop this unused feature.
--- drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 42 ++++++------------------- 1 file changed, 10 insertions(+), 32 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-usb.c +10 -32
@@ -69,11 +69,6 @@struct qmp_phy_init_tbl {unsigned int offset;unsigned int val; -/* -* register part of layout ? -* if yes, then offset gives index in the reg-layout -*/ -bool in_layout;/* * mask of lanes for which this register is written * for cases when second lane needs different values
@@ -88,14 +83,6 @@ struct qmp_phy_init_tbl { .lane_mask = 0xff, \ } -#define QMP_PHY_INIT_CFG_L (o, v) \ - { \ - .offset = o, \ - .val = v, \ - .in_layout = true, \ - .lane_mask = 0xff, \ - } -#define QMP_PHY_INIT_CFG_LANE (o, v, l) \ { \ .offset = o, \
@@ -2069,7 +2056,6 @@ static const struct qmp_phy_cfg qcm2290_usb3phy_cfg = { };static void qmp_usb_configure_lane (void __iomem *base, -const unsigned int *regs,const struct qmp_phy_init_tbl tbl[],int num,u8 lane_mask)
@@ -2084,19 +2070,15 @@ static void qmp_usb_configure_lane(void __iomem *base,if (!(t->lane_mask & lane_mask))continue ; -if (t->in_layout) -writel (t->val, base + regs[t->offset]); -else -writel (t->val, base + t->offset); +writel (t->val, base + t->offset); } }static void qmp_usb_configure (void __iomem *base, -const unsigned int *regs,const struct qmp_phy_init_tbl tbl[],int num) { -qmp_usb_configure_lane (base, regs, tbl, num,0xff ); +qmp_usb_configure_lane (base, tbl, num,0xff ); }static int qmp_usb_serdes_init (struct qmp_phy *qphy)
@@ -2106,7 +2088,7 @@ static int qmp_usb_serdes_init(struct qmp_phy *qphy)const struct qmp_phy_init_tbl *serdes_tbl = cfg->serdes_tbl;int serdes_tbl_num = cfg->serdes_tbl_num; -qmp_usb_configure (serdes, cfg->regs, serdes_tbl, serdes_tbl_num); +qmp_usb_configure (serdes, serdes_tbl, serdes_tbl_num);return 0 ; }
@@ -2214,21 +2196,17 @@ static int qmp_usb_power_on(struct phy *phy) }/* Tx, Rx, and PCS configurations */ -qmp_usb_configure_lane (tx, cfg->regs, cfg->tx_tbl, cfg->tx_tbl_num,1 ); +qmp_usb_configure_lane (tx, cfg->tx_tbl, cfg->tx_tbl_num,1 ); -if (cfg->lanes >=2 ) { -qmp_usb_configure_lane (qphy->tx2, cfg->regs, - cfg->tx_tbl, cfg->tx_tbl_num,2 ); - } +if (cfg->lanes >=2 ) +qmp_usb_configure_lane (qphy->tx2, cfg->tx_tbl, cfg->tx_tbl_num,2 ); -qmp_usb_configure_lane (rx, cfg->regs, cfg->rx_tbl, cfg->rx_tbl_num,1 ); +qmp_usb_configure_lane (rx, cfg->rx_tbl, cfg->rx_tbl_num,1 ); -if (cfg->lanes >=2 ) { -qmp_usb_configure_lane (qphy->rx2, cfg->regs, - cfg->rx_tbl, cfg->rx_tbl_num,2 ); - } +if (cfg->lanes >=2 ) +qmp_usb_configure_lane (qphy->rx2, cfg->rx_tbl, cfg->rx_tbl_num,2 ); -qmp_usb_configure (pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num); +qmp_usb_configure (pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);if (cfg->has_pwrdn_delay)usleep_range (cfg->pwrdn_delay_min, cfg->pwrdn_delay_max);
Signature · 1 line
2.35.1
PATCH v2 1/14 phy: qcom-qmp: drop regulator error message
In reply to Johan HovoldRegulator core already logs an error message in case requesting a regulator fails so drop the mostly redundant error message from probe.
--- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 3 +-- drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 3 +-- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 3 +-- drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 3 +-- drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-combo.c +1 -2
@@ -2816,8 +2816,7 @@ static int qmp_combo_probe(struct platform_device *pdev) ret =qmp_combo_vreg_init (dev, cfg);if (ret) -return dev_err_probe (dev, ret, -"failed to get regulator supplies\n" ); +return ret; num =of_get_available_child_count (dev->of_node);/* do we have a rogue child node ? */
drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c +1 -2
@@ -869,8 +869,7 @@ static int qmp_pcie_msm8996_probe(struct platform_device *pdev) ret =qmp_pcie_msm8996_vreg_init (dev, cfg);if (ret) -return dev_err_probe (dev, ret, -"failed to get regulator supplies\n" ); +return ret; num =of_get_available_child_count (dev->of_node);/* do we have a rogue child node ? */
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +1 -2
@@ -2445,8 +2445,7 @@ static int qmp_pcie_probe(struct platform_device *pdev) ret =qmp_pcie_vreg_init (dev, cfg);if (ret) -return dev_err_probe (dev, ret, -"failed to get regulator supplies\n" ); +return ret; num =of_get_available_child_count (dev->of_node);/* do we have a rogue child node ? */
drivers/phy/qualcomm/phy-qcom-qmp-ufs.c +1 -2
@@ -1210,8 +1210,7 @@ static int qmp_ufs_probe(struct platform_device *pdev) ret =qmp_ufs_vreg_init (dev, cfg);if (ret) -return dev_err_probe (dev, ret, -"failed to get regulator supplies\n" ); +return ret; num =of_get_available_child_count (dev->of_node);/* do we have a rogue child node ? */
drivers/phy/qualcomm/phy-qcom-qmp-usb.c +1 -2
@@ -2746,8 +2746,7 @@ static int qmp_usb_probe(struct platform_device *pdev) ret =qmp_usb_vreg_init (dev, cfg);if (ret) -return dev_err_probe (dev, ret, -"failed to get regulator supplies\n" ); +return ret; num =of_get_available_child_count (dev->of_node);/* do we have a rogue child node ? */
Signature · 1 line
2.35.1
PATCH v2 8/14 phy: qcom-qmp-pcie: drop power-down delay config
In reply to Johan HovoldThe power-down delay was included in the first version of the QMP driver as an optional delay after powering on the PHY (using POWER_DOWN_CONTROL) and just before starting it. Later changes modified this sequence by powering on before initialising the PHY, but the optional delay stayed where it was (i.e. before starting the PHY).
The vendor driver does not use a delay before starting the PHY and this is likely not needed on any platform unless there is a corresponding delay in the vendor kernel init sequence tables (i.e. in devicetree).
Let's keep the delay for now, but drop the redundant delay period configuration while increasing the unnecessarily low timer slack somewhat.
--- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 27 +----------------------- 1 file changed, 1 insertion(+), 26 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +1 -26
@@ -1362,9 +1362,6 @@ struct qmp_phy_cfg {/* true, if PHY needs delay after POWER_DOWN */ bool has_pwrdn_delay; -/* power_down delay in usec */ -int pwrdn_delay_min; -int pwrdn_delay_max;/* QMP PHY pipe clock interface rate */ unsigned long pipe_clock_rate;
@@ -1500,8 +1497,6 @@ static const struct qmp_phy_cfg ipq8074_pciephy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = 995, /* us */ - .pwrdn_delay_max = 1005, /* us */ };static const struct qmp_phy_cfg ipq8074_pciephy_gen3_cfg = {
@@ -1529,8 +1524,6 @@ static const struct qmp_phy_cfg ipq8074_pciephy_gen3_cfg = { .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, .has_pwrdn_delay = true, - .pwrdn_delay_min = 995, /* us */ - .pwrdn_delay_max = 1005, /* us */ .pipe_clock_rate = 250000000, };
@@ -1562,8 +1555,6 @@ static const struct qmp_phy_cfg ipq6018_pciephy_cfg = { .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, .has_pwrdn_delay = true, - .pwrdn_delay_min = 995, /* us */ - .pwrdn_delay_max = 1005, /* us */ };static const struct qmp_phy_cfg sdm845_qmp_pciephy_cfg = {
@@ -1594,8 +1585,6 @@ static const struct qmp_phy_cfg sdm845_qmp_pciephy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = 995, /* us */ - .pwrdn_delay_max = 1005, /* us */ };static const struct qmp_phy_cfg sdm845_qhp_pciephy_cfg = {
@@ -1624,8 +1613,6 @@ static const struct qmp_phy_cfg sdm845_qhp_pciephy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = 995, /* us */ - .pwrdn_delay_max = 1005, /* us */ };static const struct qmp_phy_cfg sm8250_qmp_gen3x1_pciephy_cfg = {
@@ -1666,8 +1653,6 @@ static const struct qmp_phy_cfg sm8250_qmp_gen3x1_pciephy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = 995, /* us */ - .pwrdn_delay_max = 1005, /* us */ };static const struct qmp_phy_cfg sm8250_qmp_gen3x2_pciephy_cfg = {
@@ -1708,8 +1693,6 @@ static const struct qmp_phy_cfg sm8250_qmp_gen3x2_pciephy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = 995, /* us */ - .pwrdn_delay_max = 1005, /* us */ };static const struct qmp_phy_cfg msm8998_pciephy_cfg = {
@@ -1765,8 +1748,6 @@ static const struct qmp_phy_cfg sc8180x_pciephy_cfg = { .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, .has_pwrdn_delay = true, - .pwrdn_delay_min = 995, /* us */ - .pwrdn_delay_max = 1005, /* us */ };static const struct qmp_phy_cfg sdx55_qmp_pciephy_cfg = {
@@ -1797,8 +1778,6 @@ static const struct qmp_phy_cfg sdx55_qmp_pciephy_cfg = { .phy_status = PHYSTATUS_4_20, .has_pwrdn_delay = true, - .pwrdn_delay_min = 995, /* us */ - .pwrdn_delay_max = 1005, /* us */ };static const struct qmp_phy_cfg sm8450_qmp_gen3x1_pciephy_cfg = {
@@ -1829,8 +1808,6 @@ static const struct qmp_phy_cfg sm8450_qmp_gen3x1_pciephy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = 995, /* us */ - .pwrdn_delay_max = 1005, /* us */ };static const struct qmp_phy_cfg sm8450_qmp_gen4x2_pciephy_cfg = {
@@ -1876,8 +1853,6 @@ static const struct qmp_phy_cfg sm8450_qmp_gen4x2_pciephy_cfg = { .phy_status = PHYSTATUS_4_20, .has_pwrdn_delay = true, - .pwrdn_delay_min = 995, /* us */ - .pwrdn_delay_max = 1005, /* us */ }; static void qmp_pcie_configure_lane(void __iomem *base,
@@ -2037,7 +2012,7 @@ static int qmp_pcie_power_on(struct phy *phy)qmp_pcie_pcs_init (qphy, mode_tables);if (cfg->has_pwrdn_delay) -usleep_range (cfg->pwrdn_delay_min, cfg->pwrdn_delay_max); +usleep_range (1000 ,1200 );/* Pull PHY out of reset state */ qphy_clrbits (pcs, cfg->regs[QPHY_SW_RESET ],SW_RESET );
Signature · 7 lines
2.35.1 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v2 12/14 phy: qcom-qmp-combo: drop power-down delay config
In reply to Johan HovoldThe power-down delay was included in the first version of the QMP driver as an optional delay after powering on the PHY (using POWER_DOWN_CONTROL) and just before starting it. Later changes modified this sequence by powering on before initialising the PHY, but the optional delay stayed where it was (i.e. before starting the PHY).
The vendor driver does not use a delay before starting the PHY and this is likely not needed on any platform unless there is a corresponding delay in the vendor kernel init sequence tables (i.e. in devicetree).
Let's keep the delay for now, but drop the redundant delay period configuration while increasing the unnecessarily low timer slack somewhat.
--- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-combo.c +1 -15
@@ -63,8 +63,6 @@#define CLAMP_EN BIT(0)/* enables i/o clamp_n */ #define PHY_INIT_COMPLETE_TIMEOUT 10000 -#define POWER_DOWN_DELAY_US_MIN 10 -#define POWER_DOWN_DELAY_US_MAX 11struct qmp_phy_init_tbl {unsigned int offset;
@@ -860,9 +858,6 @@ struct qmp_phy_cfg {/* true, if PHY needs delay after POWER_DOWN */ bool has_pwrdn_delay; -/* power_down delay in usec */ -int pwrdn_delay_min; -int pwrdn_delay_max;/* Offset from PCS to PCS_USB region */ unsigned int pcs_usb_offset;
@@ -1031,8 +1026,6 @@ static const struct qmp_phy_cfg sc7180_usb3phy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, };static const struct qmp_phy_cfg sc7180_dpphy_cfg = {
@@ -1102,8 +1095,6 @@ static const struct qmp_phy_cfg sdm845_usb3phy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, };static const struct qmp_phy_combo_cfg sdm845_usb3dpphy_cfg = {
@@ -1138,10 +1129,7 @@ static const struct qmp_phy_cfg sm8150_usb3phy_cfg = { .pwrdn_ctrl = SW_PWRDN, .phy_status = PHYSTATUS, - .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, };static const struct qmp_phy_cfg sc8180x_dpphy_cfg = {
@@ -1282,8 +1270,6 @@ static const struct qmp_phy_cfg sm8250_usb3phy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, };static const struct qmp_phy_cfg sm8250_dpphy_cfg = {
@@ -2064,7 +2050,7 @@ static int qmp_combo_power_on(struct phy *phy)qmp_combo_configure (pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);if (cfg->has_pwrdn_delay) -usleep_range (cfg->pwrdn_delay_min, cfg->pwrdn_delay_max); +usleep_range (10 ,20 );if (cfg->type !=PHY_TYPE_DP ) {/* Pull PHY out of reset state */
Signature · 1 line
2.35.1
PATCH v2 9/14 phy: qcom-qmp-pcie: replace power-down delay
In reply to Johan HovoldThe power-down delay was included in the first version of the QMP driver as an optional delay after powering on the PHY (using POWER_DOWN_CONTROL) and just before starting it. Later changes modified this sequence by powering on before initialising the PHY, but the optional delay stayed where it was (i.e. before starting the PHY).
The vendor driver does not use a delay before starting the PHY and this is likely not needed on any platform unless there is a corresponding delay in the vendor kernel init sequence tables (i.e. in devicetree).
But as the vendor kernel do have a 1 ms delay *after* starting the PHY and before starting to poll the status it is possible that later contributors have simply not noticed that the mainline power-down delay is not equivalent.
As the current delay before even starting the PHY is pretty much pointless and likely a mistake, move the delay after starting the PHY which avoids a few iterations of polling and speeds up startup by 1 ms (the poll loop otherwise takes about 1.8 ms).
Note that MSM8998 has never used a power-down delay so add a flag to skip the delay in case starting the PHY is faster on MSM8998. This can be removed after someone takes a measurement.
--- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 33 +++++------------------- 1 file changed, 6 insertions(+), 27 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +6 -27
@@ -1360,8 +1360,7 @@ struct qmp_phy_cfg {/* bit offset of PHYSTATUS in QPHY_PCS_STATUS register */ unsigned int phy_status; -/* true, if PHY needs delay after POWER_DOWN */ -bool has_pwrdn_delay; +bool skip_start_delay;/* QMP PHY pipe clock interface rate */ unsigned long pipe_clock_rate;
@@ -1495,8 +1494,6 @@ static const struct qmp_phy_cfg ipq8074_pciephy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, .phy_status = PHYSTATUS, - - .has_pwrdn_delay = true, };static const struct qmp_phy_cfg ipq8074_pciephy_gen3_cfg = {
@@ -1523,8 +1520,6 @@ static const struct qmp_phy_cfg ipq8074_pciephy_gen3_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, - .has_pwrdn_delay = true, - .pipe_clock_rate = 250000000, };
@@ -1553,8 +1548,6 @@ static const struct qmp_phy_cfg ipq6018_pciephy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, - - .has_pwrdn_delay = true, };static const struct qmp_phy_cfg sdm845_qmp_pciephy_cfg = {
@@ -1583,8 +1576,6 @@ static const struct qmp_phy_cfg sdm845_qmp_pciephy_cfg = { .start_ctrl = PCS_START | SERDES_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, .phy_status = PHYSTATUS, - - .has_pwrdn_delay = true, };static const struct qmp_phy_cfg sdm845_qhp_pciephy_cfg = {
@@ -1611,8 +1602,6 @@ static const struct qmp_phy_cfg sdm845_qhp_pciephy_cfg = { .start_ctrl = PCS_START | SERDES_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, .phy_status = PHYSTATUS, - - .has_pwrdn_delay = true, };static const struct qmp_phy_cfg sm8250_qmp_gen3x1_pciephy_cfg = {
@@ -1651,8 +1640,6 @@ static const struct qmp_phy_cfg sm8250_qmp_gen3x1_pciephy_cfg = { .start_ctrl = PCS_START | SERDES_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, .phy_status = PHYSTATUS, - - .has_pwrdn_delay = true, };static const struct qmp_phy_cfg sm8250_qmp_gen3x2_pciephy_cfg = {
@@ -1691,8 +1678,6 @@ static const struct qmp_phy_cfg sm8250_qmp_gen3x2_pciephy_cfg = { .start_ctrl = PCS_START | SERDES_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, .phy_status = PHYSTATUS, - - .has_pwrdn_delay = true, };static const struct qmp_phy_cfg msm8998_pciephy_cfg = {
@@ -1719,6 +1704,8 @@ static const struct qmp_phy_cfg msm8998_pciephy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, .phy_status = PHYSTATUS, + + .skip_start_delay = true, };static const struct qmp_phy_cfg sc8180x_pciephy_cfg = {
@@ -1746,8 +1733,6 @@ static const struct qmp_phy_cfg sc8180x_pciephy_cfg = { .start_ctrl = PCS_START | SERDES_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, - - .has_pwrdn_delay = true, };static const struct qmp_phy_cfg sdx55_qmp_pciephy_cfg = {
@@ -1776,8 +1761,6 @@ static const struct qmp_phy_cfg sdx55_qmp_pciephy_cfg = { .start_ctrl = PCS_START | SERDES_START, .pwrdn_ctrl = SW_PWRDN, .phy_status = PHYSTATUS_4_20, - - .has_pwrdn_delay = true, };static const struct qmp_phy_cfg sm8450_qmp_gen3x1_pciephy_cfg = {
@@ -1806,8 +1789,6 @@ static const struct qmp_phy_cfg sm8450_qmp_gen3x1_pciephy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, .phy_status = PHYSTATUS, - - .has_pwrdn_delay = true, };static const struct qmp_phy_cfg sm8450_qmp_gen4x2_pciephy_cfg = {
@@ -1851,8 +1832,6 @@ static const struct qmp_phy_cfg sm8450_qmp_gen4x2_pciephy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL, .phy_status = PHYSTATUS_4_20, - - .has_pwrdn_delay = true, }; static void qmp_pcie_configure_lane(void __iomem *base,
@@ -2011,15 +1990,15 @@ static int qmp_pcie_power_on(struct phy *phy)qmp_pcie_pcs_init (qphy, &cfg->tables);qmp_pcie_pcs_init (qphy, mode_tables); -if (cfg->has_pwrdn_delay) -usleep_range (1000 ,1200 ); -/* Pull PHY out of reset state */ qphy_clrbits (pcs, cfg->regs[QPHY_SW_RESET ],SW_RESET );/* start SerDes and Phy-Coding-Sublayer */ qphy_setbits (pcs, cfg->regs[QPHY_START_CTRL ], cfg->start_ctrl); +if (!cfg->skip_start_delay) +usleep_range (1000 ,1200 ); + status = pcs + cfg->regs[QPHY_PCS_STATUS ]; mask = cfg->phy_status; ready =0 ;
Signature · 7 lines
2.35.1 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH v2 13/14 phy: qcom-qmp-usb: drop sc8280xp power-down delay
In reply to Johan HovoldThe SC8280XP PHY does not need a delay before starting the PHY (which is what the has_pwrdn_delay config option really controls) so drop the unnecessary delay.
--- drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-usb.c +0 -4
@@ -1718,10 +1718,6 @@ static const struct qmp_phy_cfg sc8280xp_usb3_uniphy_cfg = { .start_ctrl = SERDES_START | PCS_START, .pwrdn_ctrl = SW_PWRDN, .phy_status = PHYSTATUS, - - .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, };static const struct qmp_phy_cfg qmp_v3_usb3_uniphy_cfg = {
Signature · 1 line
2.35.1
PATCH v2 14/14 phy: qcom-qmp-usb: drop power-down delay config
In reply to Johan HovoldThe power-down delay was included in the first version of the QMP driver as an optional delay after powering on the PHY (using POWER_DOWN_CONTROL) and just before starting it. Later changes modified this sequence by powering on before initialising the PHY, but the optional delay stayed where it was (i.e. before starting the PHY).
The vendor driver does not use a delay before starting the PHY and this is likely not needed on any platform unless there is a corresponding delay in the vendor kernel init sequence tables (i.e. in devicetree).
Let's keep the delay for now, but drop the redundant delay period configuration while increasing the unnecessarily low timer slack somewhat.
--- drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 35 +------------------------ 1 file changed, 1 insertion(+), 34 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-usb.c +1 -34
@@ -63,8 +63,6 @@#define CLAMP_EN BIT(0)/* enables i/o clamp_n */ #define PHY_INIT_COMPLETE_TIMEOUT 10000 -#define POWER_DOWN_DELAY_US_MIN 10 -#define POWER_DOWN_DELAY_US_MAX 11struct qmp_phy_init_tbl {unsigned int offset;
@@ -1452,9 +1450,6 @@ struct qmp_phy_cfg {/* true, if PHY needs delay after POWER_DOWN */ bool has_pwrdn_delay; -/* power_down delay in usec */ -int pwrdn_delay_min; -int pwrdn_delay_max;/* true, if PHY has a separate DP_COM control block */ bool has_phy_dp_com_ctrl;
@@ -1660,9 +1655,6 @@ static const struct qmp_phy_cfg qmp_v3_usb3phy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, - .has_phy_dp_com_ctrl = true, };
@@ -1690,9 +1682,6 @@ static const struct qmp_phy_cfg sc7180_usb3phy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, - .has_phy_dp_com_ctrl = true, };
@@ -1744,8 +1733,6 @@ static const struct qmp_phy_cfg qmp_v3_usb3_uniphy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, };static const struct qmp_phy_cfg msm8998_usb3phy_cfg = {
@@ -1798,11 +1785,7 @@ static const struct qmp_phy_cfg sm8150_usb3phy_cfg = { .pwrdn_ctrl = SW_PWRDN, .phy_status = PHYSTATUS, - .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, - .has_phy_dp_com_ctrl = true, };
@@ -1833,8 +1816,6 @@ static const struct qmp_phy_cfg sm8150_usb3_uniphy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, };static const struct qmp_phy_cfg sm8250_usb3phy_cfg = {
@@ -1864,9 +1845,6 @@ static const struct qmp_phy_cfg sm8250_usb3phy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, - .has_phy_dp_com_ctrl = true, };
@@ -1897,8 +1875,6 @@ static const struct qmp_phy_cfg sm8250_usb3_uniphy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, };static const struct qmp_phy_cfg sdx55_usb3_uniphy_cfg = {
@@ -1928,8 +1904,6 @@ static const struct qmp_phy_cfg sdx55_usb3_uniphy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, };static const struct qmp_phy_cfg sdx65_usb3_uniphy_cfg = {
@@ -1959,8 +1933,6 @@ static const struct qmp_phy_cfg sdx65_usb3_uniphy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, };static const struct qmp_phy_cfg sm8350_usb3phy_cfg = {
@@ -1990,9 +1962,6 @@ static const struct qmp_phy_cfg sm8350_usb3phy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, - .has_phy_dp_com_ctrl = true, };
@@ -2023,8 +1992,6 @@ static const struct qmp_phy_cfg sm8350_usb3_uniphy_cfg = { .phy_status = PHYSTATUS, .has_pwrdn_delay = true, - .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN, - .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX, };static const struct qmp_phy_cfg qcm2290_usb3phy_cfg = {
@@ -2205,7 +2172,7 @@ static int qmp_usb_power_on(struct phy *phy)qmp_usb_configure (pcs, cfg->pcs_tbl, cfg->pcs_tbl_num);if (cfg->has_pwrdn_delay) -usleep_range (cfg->pwrdn_delay_min, cfg->pwrdn_delay_max); +usleep_range (10 ,20 );/* Pull PHY out of reset state */ qphy_clrbits (pcs, cfg->regs[QPHY_SW_RESET ],SW_RESET );
Signature · 1 line
2.35.1
PATCH v2 6/14 phy: qcom-qmp-ufs: drop unused in-layout configuration
In reply to Johan HovoldThe QMP UFS PHY driver does not use the "in-layout" configuration macro to configure registers that are typically accessed using "regs_layout" arrays (e.g. QPHY_START_CTRL) so drop this unused feature.
--- drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 42 ++++++------------------- 1 file changed, 10 insertions(+), 32 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-ufs.c +10 -32
@@ -41,11 +41,6 @@struct qmp_phy_init_tbl {unsigned int offset;unsigned int val; -/* -* register part of layout ? -* if yes, then offset gives index in the reg-layout -*/ -bool in_layout;/* * mask of lanes for which this register is written * for cases when second lane needs different values
@@ -60,14 +55,6 @@ struct qmp_phy_init_tbl { .lane_mask = 0xff, \ } -#define QMP_PHY_INIT_CFG_L (o, v) \ - { \ - .offset = o, \ - .val = v, \ - .in_layout = true, \ - .lane_mask = 0xff, \ - } -#define QMP_PHY_INIT_CFG_LANE (o, v, l) \ { \ .offset = o, \
@@ -800,7 +787,6 @@ static const struct qmp_phy_cfg sm8450_ufsphy_cfg = { };static void qmp_ufs_configure_lane (void __iomem *base, -const unsigned int *regs,const struct qmp_phy_init_tbl tbl[],int num,u8 lane_mask)
@@ -815,19 +801,15 @@ static void qmp_ufs_configure_lane(void __iomem *base,if (!(t->lane_mask & lane_mask))continue ; -if (t->in_layout) -writel (t->val, base + regs[t->offset]); -else -writel (t->val, base + t->offset); +writel (t->val, base + t->offset); } }static void qmp_ufs_configure (void __iomem *base, -const unsigned int *regs,const struct qmp_phy_init_tbl tbl[],int num) { -qmp_ufs_configure_lane (base, regs, tbl, num,0xff ); +qmp_ufs_configure_lane (base, tbl, num,0xff ); }static int qmp_ufs_serdes_init (struct qmp_phy *qphy)
@@ -837,7 +819,7 @@ static int qmp_ufs_serdes_init(struct qmp_phy *qphy)const struct qmp_phy_init_tbl *serdes_tbl = cfg->serdes_tbl;int serdes_tbl_num = cfg->serdes_tbl_num; -qmp_ufs_configure (serdes, cfg->regs, serdes_tbl, serdes_tbl_num); +qmp_ufs_configure (serdes, serdes_tbl, serdes_tbl_num);return 0 ; }
@@ -941,21 +923,17 @@ static int qmp_ufs_power_on(struct phy *phy)qmp_ufs_serdes_init (qphy);/* Tx, Rx, and PCS configurations */ -qmp_ufs_configure_lane (tx, cfg->regs, cfg->tx_tbl, cfg->tx_tbl_num,1 ); +qmp_ufs_configure_lane (tx, cfg->tx_tbl, cfg->tx_tbl_num,1 ); -if (cfg->lanes >=2 ) { -qmp_ufs_configure_lane (qphy->tx2, cfg->regs, - cfg->tx_tbl, cfg->tx_tbl_num,2 ); - } +if (cfg->lanes >=2 ) +qmp_ufs_configure_lane (qphy->tx2, cfg->tx_tbl, cfg->tx_tbl_num,2 ); -qmp_ufs_configure_lane (rx, cfg->regs, cfg->rx_tbl, cfg->rx_tbl_num,1 ); +qmp_ufs_configure_lane (rx, cfg->rx_tbl, cfg->rx_tbl_num,1 ); -if (cfg->lanes >=2 ) { -qmp_ufs_configure_lane (qphy->rx2, cfg->regs, - cfg->rx_tbl, cfg->rx_tbl_num,2 ); - } +if (cfg->lanes >=2 ) +qmp_ufs_configure_lane (qphy->rx2, cfg->rx_tbl, cfg->rx_tbl_num,2 ); -qmp_ufs_configure (pcs, cfg->regs, cfg->pcs_tbl, cfg->pcs_tbl_num); +qmp_ufs_configure (pcs, cfg->pcs_tbl, cfg->pcs_tbl_num); ret =reset_control_deassert (qmp->ufs_reset);if (ret)
Signature · 1 line
2.35.1
Quoted 5 lines · Johan Hovold
Here's the next batch of QMP cleanups in preparation for adding support for SC8280XP and its four-lane PCIe PHYs.
Note that these apply on top of the following two series that have been reviewed and should be ready to be merged when the PHY tree opens:
I forgot to mention this series:
https://lore.kernel.org/lkml/[email protected]/
which has also been reviewed but did not make it into 6.1.
Quoted 5 lines
https://lore.kernel.org/linux-arm-msm/[email protected]/ https://lore.kernel.org/all/[email protected]/After this I have one more series of related cleanups before posting the SC8280XP support.
Johan
Signature · 3 lines
linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH v2 07/14] phy: qcom-qmp-usb: drop unused in-layout configuration
In reply to Johan HovoldQuoted 6 lines · Johan Hovold
The QMP USB PHY driver does not use the "in-layout" configuration macro to configure registers that are typically accessed using "
regs_layout" arrays (e.g.QPHY_START_CTRL) so drop this unused feature.Signed-off-by Johan Hovold <[email protected]>---
Signature · 8 lines
With best wishes Dmitry -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH v2 09/14] phy: qcom-qmp-pcie: replace power-down delay
In reply to Johan HovoldQuoted 20 lines · Johan Hovold
The power-down delay was included in the first version of the QMP driver as an optional delay after powering on the PHY (using
POWER_DOWN_CONTROL) and just before starting it. Later changes modified this sequence by powering on before initialising the PHY, but the optional delay stayed where it was (i.e. before starting the PHY).The vendor driver does not use a delay before starting the PHY and this is likely not needed on any platform unless there is a corresponding delay in the vendor kernel init sequence tables (i.e. in devicetree).
But as the vendor kernel do have a 1 ms delay *after* starting the PHY and before starting to poll the status it is possible that later contributors have simply not noticed that the mainline power-down delay is not equivalent.
As the current delay before even starting the PHY is pretty much pointless and likely a mistake, move the delay after starting the PHY which avoids a few iterations of polling and speeds up startup by 1 ms (the poll loop otherwise takes about 1.8 ms).
Quoted 8 lines
Note that MSM8998 has never used a power-down delay so add a flag to skip the delay in case starting the PHY is faster on MSM8998. This can be removed after someone takes a measurement.
Signed-off-by Johan Hovold <[email protected]>--- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 33 +++++------------------- 1 file changed, 6 insertions(+), 27 deletions(-)
Signature · 8 lines
With best wishes Dmitry -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH v2 11/14] phy: qcom-qmp-combo: drop sc8280xp power-down delay
In reply to Johan HovoldQuoted 9 lines · Johan Hovold
The SC8280XP combo PHY does not need a delay before starting the USB PHY (which is what the
has_pwrdn_delayconfig option really controls) so drop the unnecessary delay.Signed-off-by Johan Hovold <[email protected]>--- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 4 ---- 1 file changed, 4 deletions(-)
Signature · 8 lines
With best wishes Dmitry -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH v2 13/14] phy: qcom-qmp-usb: drop sc8280xp power-down delay
In reply to Johan HovoldQuoted 8 lines · Johan Hovold
The SC8280XP PHY does not need a delay before starting the PHY (which is what the
has_pwrdn_delayconfig option really controls) so drop the unnecessary delay.Signed-off-by Johan Hovold <[email protected]>--- drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 4 ---- 1 file changed, 4 deletions(-)
Signature · 8 lines
With best wishes Dmitry -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Quoted 2 lines · Johan Hovold
Here's the next batch of QMP cleanups in preparation for adding support for SC8280XP and its four-lane PCIe PHYs.
Applied, thanks
Signature · 6 lines
~Vinod -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy