FAILED: patch "[PATCH] phy: qcom: qmp-combo: fix VCO div offset on v5_5nm and v6" failed to apply to 6.8-stable tree

PATCH In review [email protected] 2 participants 3 messages Apr 29, 2024 – Apr 30, 2024

Subsystems (3)

Stable branch Arm Qualcomm mailing list Generic PHY framework

lore

Share & tools

lore

[email protected]

author maintainer

2024-04-29 12:02 UTC #0 lore raw

The patch below does not apply to the 6.8-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.8.y
git checkout FETCH_HEAD
git cherry-pick -x 025a6f7448f7bb5f4fceb62498ee33d89ae266bb
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2024042918-jet-harmonica-e767@gregkh' --subject-prefix 'PATCH 6.8.y' HEAD^..

Possible dependencies:

025a6f7448f7 ("phy: qcom: qmp-combo: fix VCO div offset on v5_5nm and v6") ef643d55fdeb ("phy: qcom: qmp: split DP PHY registers to separate headers")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 025a6f7448f7bb5f4fceb62498ee33d89ae266bb Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Mon, 8 Apr 2024 11:30:23 +0200
Subject: [PATCH] phy: qcom: qmp-combo: fix VCO div offset on v5_5nm and v6

Commit 5abed58a8bde ("phy: qcom: qmp-combo: Fix VCO div offset on v3") fixed a regression introduced in 6.5 by making sure that the correct offset is used for the DP_PHY_VCO_DIV register on v3 hardware.

Unfortunately, that fix instead broke DisplayPort on v5_5nm and v6 hardware as it failed to add the corresponding offsets also to those register tables.

Fixes 815891eee668 ("phy: qcom-qmp-combo: Introduce orientation variable")

Fixes 5abed58a8bde ("phy: qcom: qmp-combo: Fix VCO div offset on v3")

Cc [email protected] # 6.5: 5abed58a8bde

Cc Stephen Boyd <[email protected]>

Cc Abhinav Kumar <[email protected]>

Cc Dmitry Baryshkov <[email protected]>

Signed-off-by Johan Hovold <[email protected]>

Reviewed-by Dmitry Baryshkov <[email protected]>

Reviewed-by Stephen Boyd <[email protected]>

Reviewed-by Abhinav Kumar <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Vinod Koul <[email protected]>

drivers/phy/qualcomm/phy-qcom-qmp-combo.c +2 -0

index 2a6f70b3e25f..c21cdb8dbfe7 100644
@@ -153,6 +153,7 @@ static const unsigned int qmp_v5_5nm_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
 	[QPHY_COM_BIAS_EN_CLKBUFLR_EN]	= QSERDES_V5_COM_BIAS_EN_CLKBUFLR_EN,
 
 	[QPHY_DP_PHY_STATUS]		= QSERDES_V5_DP_PHY_STATUS,
+	[QPHY_DP_PHY_VCO_DIV]		= QSERDES_V5_DP_PHY_VCO_DIV,
 
 	[QPHY_TX_TX_POL_INV]		= QSERDES_V5_5NM_TX_TX_POL_INV,
 	[QPHY_TX_TX_DRV_LVL]		= QSERDES_V5_5NM_TX_TX_DRV_LVL,

@@ -177,6 +178,7 @@ static const unsigned int qmp_v6_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
 	[QPHY_COM_BIAS_EN_CLKBUFLR_EN]	= QSERDES_V6_COM_PLL_BIAS_EN_CLK_BUFLR_EN,
 
 	[QPHY_DP_PHY_STATUS]		= QSERDES_V6_DP_PHY_STATUS,
+	[QPHY_DP_PHY_VCO_DIV]		= QSERDES_V6_DP_PHY_VCO_DIV,
 
 	[QPHY_TX_TX_POL_INV]		= QSERDES_V6_TX_TX_POL_INV,
 	[QPHY_TX_TX_DRV_LVL]		= QSERDES_V6_TX_TX_DRV_LVL,

drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v5.h +1 -0

index f5cfacf9be96..181057421c11 100644
@@ -7,6 +7,7 @@
 #define QCOM_PHY_QMP_DP_PHY_V5_H_
 
 /* Only for QMP V5 PHY - DP PHY registers */
+#define QSERDES_V5_DP_PHY_VCO_DIV			0x070
 #define QSERDES_V5_DP_PHY_AUX_INTERRUPT_STATUS		0x0d8
 #define QSERDES_V5_DP_PHY_STATUS			0x0dc

drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v6.h +1 -0

index 01a20d3be4b8..fa967a1af058 100644
@@ -7,6 +7,7 @@
 #define QCOM_PHY_QMP_DP_PHY_V6_H_
 
 /* Only for QMP V6 PHY - DP PHY registers */
+#define QSERDES_V6_DP_PHY_VCO_DIV			0x070
 #define QSERDES_V6_DP_PHY_AUX_INTERRUPT_STATUS		0x0e0
 #define QSERDES_V6_DP_PHY_STATUS			0x0e4

Stephen Boyd

2024-04-29 19:46 UTC #1 lore raw

PATCH 1/1 phy: qcom: qmp-combo: fix VCO div offset on v5_5nm and v6

From: Johan Hovold <[email protected]>

Unfortunately, that fix instead broke DisplayPort on v5_5nm and v6 hardware as it failed to add the corresponding offsets also to those register tables.

Fixes 815891eee668 ("phy: qcom-qmp-combo: Introduce orientation variable")

Fixes 5abed58a8bde ("phy: qcom: qmp-combo: Fix VCO div offset on v3")

Cc [email protected] # 6.5: 5abed58a8bde

Cc Stephen Boyd <[email protected]>

Cc Abhinav Kumar <[email protected]>

Cc Dmitry Baryshkov <[email protected]>

Signed-off-by Johan Hovold <[email protected]>

Reviewed-by Dmitry Baryshkov <[email protected]>

Reviewed-by Stephen Boyd <[email protected]>

Reviewed-by Abhinav Kumar <[email protected]>

Link https://lore.kernel.org/r/[email protected] open here

Signed-off-by Vinod Koul <[email protected]>

(cherry picked from commit 025a6f7448f7bb5f4fceb62498ee33d89ae266bb)

Signed-off-by Stephen Boyd <[email protected]>

---
 drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 2 ++
 drivers/phy/qualcomm/phy-qcom-qmp.h       | 2 ++
 2 files changed, 4 insertions(+)

drivers/phy/qualcomm/phy-qcom-qmp-combo.c +2 -0

index d83859e955a8..dee666f8e29e 100644
@@ -188,6 +188,7 @@ static const unsigned int qmp_v5_5nm_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
 	[QPHY_COM_BIAS_EN_CLKBUFLR_EN]	= QSERDES_V5_COM_BIAS_EN_CLKBUFLR_EN,
 
 	[QPHY_DP_PHY_STATUS]		= QSERDES_V5_DP_PHY_STATUS,
+	[QPHY_DP_PHY_VCO_DIV]		= QSERDES_V5_DP_PHY_VCO_DIV,
 
 	[QPHY_TX_TX_POL_INV]		= QSERDES_V5_5NM_TX_TX_POL_INV,
 	[QPHY_TX_TX_DRV_LVL]		= QSERDES_V5_5NM_TX_TX_DRV_LVL,

@@ -212,6 +213,7 @@ static const unsigned int qmp_v6_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
 	[QPHY_COM_BIAS_EN_CLKBUFLR_EN]	= QSERDES_V6_COM_PLL_BIAS_EN_CLK_BUFLR_EN,
 
 	[QPHY_DP_PHY_STATUS]		= QSERDES_V6_DP_PHY_STATUS,
+	[QPHY_DP_PHY_VCO_DIV]		= QSERDES_V6_DP_PHY_VCO_DIV,
 
 	[QPHY_TX_TX_POL_INV]		= QSERDES_V6_TX_TX_POL_INV,
 	[QPHY_TX_TX_DRV_LVL]		= QSERDES_V6_TX_TX_DRV_LVL,

drivers/phy/qualcomm/phy-qcom-qmp.h +2 -0

index 6923496cbfee..49ceded9b3cb 100644
@@ -132,9 +132,11 @@
 #define QSERDES_V4_DP_PHY_AUX_INTERRUPT_STATUS		0x0d8
 #define QSERDES_V4_DP_PHY_STATUS			0x0dc
 
+#define QSERDES_V5_DP_PHY_VCO_DIV			0x070
 #define QSERDES_V5_DP_PHY_STATUS			0x0dc
 
 /* Only for QMP V6 PHY - DP PHY registers */
+#define QSERDES_V6_DP_PHY_VCO_DIV			0x070
 #define QSERDES_V6_DP_PHY_AUX_INTERRUPT_STATUS		0x0e0
 #define QSERDES_V6_DP_PHY_STATUS			0x0e4

Signature · 1 line

https://chromeos.dev

Greg KH

author maintainer

2024-04-30 07:49 UTC #2 lore raw

Re: [PATCH 6.8.y] phy: qcom: qmp-combo: fix VCO div offset on v5_5nm and v6

Quoted 10 lines · Stephen Boyd

From: Johan Hovold <[email protected]>
Commit 5abed58a8bde ("phy: qcom: qmp-combo: Fix VCO div offset on v3") fixed a regression introduced in 6.5 by making sure that the correct offset is used for the DP_PHY_VCO_DIV register on v3 hardware.
Unfortunately, that fix instead broke DisplayPort on v5_5nm and v6 hardware as it failed to add the corresponding offsets also to those register tables.

Quoted 14 lines

Fixes 815891eee668 ("phy: qcom-qmp-combo: Introduce orientation variable")
Fixes 5abed58a8bde ("phy: qcom: qmp-combo: Fix VCO div offset on v3")
Cc [email protected] # 6.5: 5abed58a8bde
Cc Stephen Boyd <[email protected]>
Cc Abhinav Kumar <[email protected]>
Cc Dmitry Baryshkov <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
Reviewed-by Dmitry Baryshkov <[email protected]>
Reviewed-by Stephen Boyd <[email protected]>
Reviewed-by Abhinav Kumar <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Vinod Koul <[email protected]>
(cherry picked from commit 025a6f7448f7bb5f4fceb62498ee33d89ae266bb)
Signed-off-by Stephen Boyd <[email protected]>

Both now queued up, thanks.

greg k-h