phy: qcom-qmp-pcie: split pcs_misc init cfg for ipq8074 pcs table
Subsystems (4)
PATCH 1/2 phy: qcom-qmp-pcie: split pcs_misc init cfg for ipq8074 pcs table
Commit af6643242d3a ("phy: qcom-qmp-pcie: split pcs_misc region for ipq6018 pcie gen3") reworked the pcs regs values and removed the 0x400 offset for each pcs_misc regs.
This change caused the malfunction of ipq8074 downstream since it still has the legacy pcs table where pcs_misc are not placed on a different table and instead put together assuming the offset of 0x400 for the related pcs_misc regs.
Split pcs_misc init cfg from the ipq8074 pcs init table to be handled correctly to prepare for actual support for gen3 pcie for ipq8074.
--- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +9 -4
@@ -485,6 +485,13 @@ static const struct qmp_phy_init_tbl ipq8074_pcie_gen3_pcs_tbl[] = {QMP_PHY_INIT_CFG (QPHY_V4_PCS_FLL_CNTRL1 ,0x01 ),QMP_PHY_INIT_CFG (QPHY_V4_PCS_P2U3_WAKEUP_DLY_TIME_AUXCLK_H ,0x0 ),QMP_PHY_INIT_CFG (QPHY_V4_PCS_P2U3_WAKEUP_DLY_TIME_AUXCLK_L ,0x1 ), +QMP_PHY_INIT_CFG (QPHY_V4_PCS_G12S1_TXDEEMPH_M3P5DB ,0x10 ), +QMP_PHY_INIT_CFG (QPHY_V4_PCS_RX_DCC_CAL_CONFIG ,0x01 ), +QMP_PHY_INIT_CFG (QPHY_V4_PCS_RX_SIGDET_LVL ,0xaa ), + QMP_PHY_INIT_CFG(QPHY_V4_PCS_REFGEN_REQ_CONFIG1, 0x0d), +}; + +static const struct qmp_phy_init_tbl ipq8074_pcie_gen3_pcs_misc_tbl[] = {QMP_PHY_INIT_CFG (QPHY_V4_PCS_PCIE_OSC_DTCT_ACTIONS ,0x0 ),QMP_PHY_INIT_CFG (QPHY_V4_PCS_PCIE_L1P1_WAKEUP_DLY_TIME_AUXCLK_H ,0x00 ), QMP_PHY_INIT_CFG(QPHY_V4_PCS_PCIE_L1P1_WAKEUP_DLY_TIME_AUXCLK_L, 0x01),
@@ -497,11 +504,7 @@ static const struct qmp_phy_init_tbl ipq8074_pcie_gen3_pcs_tbl[] = {QMP_PHY_INIT_CFG (QPHY_V4_PCS_PCIE_OSC_DTCT_MODE2_CONFIG2 ,0x50 ),QMP_PHY_INIT_CFG (QPHY_V4_PCS_PCIE_OSC_DTCT_MODE2_CONFIG4 ,0x1a ),QMP_PHY_INIT_CFG (QPHY_V4_PCS_PCIE_OSC_DTCT_MODE2_CONFIG5 ,0x6 ), -QMP_PHY_INIT_CFG (QPHY_V4_PCS_G12S1_TXDEEMPH_M3P5DB ,0x10 ), QMP_PHY_INIT_CFG(QPHY_V4_PCS_PCIE_ENDPOINT_REFCLK_DRIVE, 0xc1), -QMP_PHY_INIT_CFG (QPHY_V4_PCS_RX_DCC_CAL_CONFIG ,0x01 ), -QMP_PHY_INIT_CFG (QPHY_V4_PCS_RX_SIGDET_LVL ,0xaa ), - QMP_PHY_INIT_CFG(QPHY_V4_PCS_REFGEN_REQ_CONFIG1, 0x0d), }; static const struct qmp_phy_init_tbl sdm845_qmp_pcie_serdes_tbl[] = {
@@ -1506,6 +1509,8 @@ static const struct qmp_phy_cfg ipq8074_pciephy_gen3_cfg = { .rx_num = ARRAY_SIZE(ipq8074_pcie_gen3_rx_tbl), .pcs = ipq8074_pcie_gen3_pcs_tbl, .pcs_num = ARRAY_SIZE(ipq8074_pcie_gen3_pcs_tbl), + .pcs_misc = ipq8074_pcie_gen3_pcs_misc_tbl, + .pcs_misc_num = ARRAY_SIZE(ipq8074_pcie_gen3_pcs_misc_tbl), }, .clk_list = ipq8074_pciephy_clk_l, .num_clks = ARRAY_SIZE(ipq8074_pciephy_clk_l),
Signature · 7 lines
2.37.2 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
PATCH 2/2 arm64: dts: qcom: ipq6018: improve pcie phy pcs reg table
This is not a fix on its own but more a cleanup. Phy qmp pcie driver currently have a workaround to handle pcs_misc not declared and add 0x400 offset to the pcs reg if pcs_misc is not declared.
Correctly declare pcs_misc reg and reduce PCS size to the common value of 0x1f0 as done for every other qmp based pcie phy device.
--- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/ipq6018.dtsi +2 -1
@@ -406,7 +406,8 @@ pcie_phy: phy@84000 { pcie_phy0: phy@84200 { reg = <0x0 0x84200 0x0 0x16c>, /* Serdes Tx */ <0x0 0x84400 0x0 0x200>, /* Serdes Rx */ - <0x0 0x84800 0x0 0x4f4>; /* PCS: Lane0, COM, PCIE */ + <0x0 0x84800 0x0 0x1f0>; /* PCS: Lane0, COM, PCIE */ + <0x0 0x84c00 0x0 0xf4>; /* pcs_misc */ #phy-cells = <0>; clocks = <&gcc GCC_PCIE0_PIPE_CLK>;
Signature · 7 lines
2.37.2 -- linux-phy mailing list [email protected] https://lists.infradead.org/mailman/listinfo/linux-phy
Re: [PATCH 2/2] arm64: dts: qcom: ipq6018: improve pcie phy pcs reg table
Quoted 6 lines · Christian Marangi
This is not a fix on its own but more a cleanup. Phy qmp pcie driver currently have a workaround to handle
pcs_miscnot declared and add0x400offset to the pcs reg ifpcs_miscis not declared.Correctly declare
pcs_miscreg and reduce PCS size to the common value of0x1f0as done for every other qmp based pcie phy device.
Signature · 1 line
~Vinod
Quoted 11 lines · Christian Marangi
Commit
af6643242d3a("phy: qcom-qmp-pcie: splitpcs_miscregion for ipq6018 pcie gen3") reworked the pcs regs values and removed the0x400offset for eachpcs_miscregs.This change caused the malfunction of ipq8074 downstream since it still has the legacy pcs table where
pcs_miscare not placed on a different table and instead put together assuming the offset of0x400for the relatedpcs_miscregs.Split
pcs_miscinit cfg from the ipq8074 pcs init table to be handled correctly to prepare for actual support for gen3 pcie for ipq8074.
Applied, thanks
Signature · 1 line
~Vinod
Re: (subset) [PATCH 1/2] phy: qcom-qmp-pcie: split pcs_misc init cfg for ipq8074 pcs table
In reply to Christian MarangiQuoted 10 lines · Christian Marangi
Commit
af6643242d3a("phy: qcom-qmp-pcie: splitpcs_miscregion for ipq6018 pcie gen3") reworked the pcs regs values and removed the0x400offset for eachpcs_miscregs.This change caused the malfunction of ipq8074 downstream since it still has the legacy pcs table where
pcs_miscare not placed on a different table and instead put together assuming the offset of0x400for the relatedpcs_miscregs.[...]
Applied, thanks!
[2/2] arm64: dts: qcom: ipq6018: improve pcie phy pcs reg table
commit: 08f399a818b0eff552b1f23c3171950a58aea78f
Best regards,
Signature · 1 line
Bjorn Andersson <[email protected]>