[PATCH] clk: qcom: gcc-ipq8074: fix broken freq table for nss_port6_tx_clk_src

[PATCH] clk: qcom: gcc-ipq8074: fix broken freq table for nss_port6_tx_clk_src

[Christian Marangi]

With the conversion done by commit e88f03230dc0 ("clk: qcom: gcc-ipq8074:
rework nss_port5/6 clock to multiple conf") a Copy-Paste error was made
for the nss_port6_tx_clk_src frequency table.

This was caused by the wrong setting of the parent in
ftbl_nss_port6_tx_clk_src that was wrongly set to P_UNIPHY1_RX instead
of P_UNIPHY2_TX.

This cause the UNIPHY2 port to malfunction when it needs to be scaled to
higher clock. The malfunction was observed with the example scenario
with an Aquantia 10G PHY connected and a speed higher than 1G (example
2.5G)

Fix the broken frequency table to restore original functionality.

Cc: stable@vger.kernel.org
Fixes: e88f03230dc0 ("clk: qcom: gcc-ipq8074: rework nss_port5/6 clock to multiple conf")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
 drivers/clk/qcom/gcc-ipq8074.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
index 7258ba5c0900..1329ea28d703 100644
--- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -1895,10 +1895,10 @@ static const struct freq_conf ftbl_nss_port6_tx_clk_src_125[] = {
 static const struct freq_multi_tbl ftbl_nss_port6_tx_clk_src[] = {
 	FMS(19200000, P_XO, 1, 0, 0),
 	FM(25000000, ftbl_nss_port6_tx_clk_src_25),
-	FMS(78125000, P_UNIPHY1_RX, 4, 0, 0),
+	FMS(78125000, P_UNIPHY2_TX, 4, 0, 0),
 	FM(125000000, ftbl_nss_port6_tx_clk_src_125),
-	FMS(156250000, P_UNIPHY1_RX, 2, 0, 0),
-	FMS(312500000, P_UNIPHY1_RX, 1, 0, 0),
+	FMS(156250000, P_UNIPHY2_TX, 2, 0, 0),
+	FMS(312500000, P_UNIPHY2_TX, 1, 0, 0),
 	{ }
 };
 
-- 
2.48.1

Re: [PATCH] clk: qcom: gcc-ipq8074: fix broken freq table for nss_port6_tx_clk_src

[Robert Marko]

On 22. 05. 2025. 22:25, Christian Marangi wrote:
> With the conversion done by commit e88f03230dc0 ("clk: qcom: gcc-ipq8074:
> rework nss_port5/6 clock to multiple conf") a Copy-Paste error was made
> for the nss_port6_tx_clk_src frequency table.
>
> This was caused by the wrong setting of the parent in
> ftbl_nss_port6_tx_clk_src that was wrongly set to P_UNIPHY1_RX instead
> of P_UNIPHY2_TX.
>
> This cause the UNIPHY2 port to malfunction when it needs to be scaled to
> higher clock. The malfunction was observed with the example scenario
> with an Aquantia 10G PHY connected and a speed higher than 1G (example
> 2.5G)
>
> Fix the broken frequency table to restore original functionality.
>
> Cc: stable@vger.kernel.org
> Fixes: e88f03230dc0 ("clk: qcom: gcc-ipq8074: rework nss_port5/6 clock to multiple conf")
> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

Tested-by: Robert Marko <robimarko@gmail.com>

> ---
>   drivers/clk/qcom/gcc-ipq8074.c | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
> index 7258ba5c0900..1329ea28d703 100644
> --- a/drivers/clk/qcom/gcc-ipq8074.c
> +++ b/drivers/clk/qcom/gcc-ipq8074.c
> @@ -1895,10 +1895,10 @@ static const struct freq_conf ftbl_nss_port6_tx_clk_src_125[] = {
>   static const struct freq_multi_tbl ftbl_nss_port6_tx_clk_src[] = {
>   	FMS(19200000, P_XO, 1, 0, 0),
>   	FM(25000000, ftbl_nss_port6_tx_clk_src_25),
> -	FMS(78125000, P_UNIPHY1_RX, 4, 0, 0),
> +	FMS(78125000, P_UNIPHY2_TX, 4, 0, 0),
>   	FM(125000000, ftbl_nss_port6_tx_clk_src_125),
> -	FMS(156250000, P_UNIPHY1_RX, 2, 0, 0),
> -	FMS(312500000, P_UNIPHY1_RX, 1, 0, 0),
> +	FMS(156250000, P_UNIPHY2_TX, 2, 0, 0),
> +	FMS(312500000, P_UNIPHY2_TX, 1, 0, 0),
>   	{ }
>   };
>   

Re: [PATCH] clk: qcom: gcc-ipq8074: fix broken freq table for nss_port6_tx_clk_src

[Bjorn Andersson]

On Thu, 22 May 2025 22:25:55 +0200, Christian Marangi wrote:
> With the conversion done by commit e88f03230dc0 ("clk: qcom: gcc-ipq8074:
> rework nss_port5/6 clock to multiple conf") a Copy-Paste error was made
> for the nss_port6_tx_clk_src frequency table.
> 
> This was caused by the wrong setting of the parent in
> ftbl_nss_port6_tx_clk_src that was wrongly set to P_UNIPHY1_RX instead
> of P_UNIPHY2_TX.
> 
> [...]

Applied, thanks!

[1/1] clk: qcom: gcc-ipq8074: fix broken freq table for nss_port6_tx_clk_src
      commit: 077ec7bcec9a8987d2a133afb7e13011878c7576

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>