clk: qcom: clk-rcg2: introduce support for multiple conf for same freq
Subsystems (3)
v2 cover clk: qcom: clk-rcg2: introduce support for multiple conf for same freq
This small series fix a current problem with ipq8074 where the 2 uniphy port doesn't work in some corner case with some clk configuration. The port to correctly work require a specific frequency, using the wrong one results in the port not transmitting data.
With the current code with a requested freq of 125MHz, the frequency is set to 105MHz. This is caused by the fact that there are 2 different configuration to set 125MHz and it's always selected the first one that results in 105MHz.
In the original QSDK code, the frequency configuration selection is different and the CEIL FLOOR logic is not present. Instead it's used a BEST approach where the frequency table is checked and then it's checked if there are duplicate entry.
This proposed implementation is more specific and keep the CEIL FLOOR logic while maitaining the possibility to provide multiple configuration.
The first 2 patch drop redundant F entry redefinition.
The 3rd one implement the change with also some macro description on how this new implementation works
The 4th one migrate the gcc-ipq8074 driver to this new implementation.
Changes v2:
- Out of RFC
- Fix compile warning from buildbot related to F redefinition
Christian Marangi (4):
clk: qcom: gcc-ipq6018: drop redundant F define
clk: qcom: gcc-sdm660: drop redundant F define
clk: qcom: clk-rcg2: introduce support for multiple conf for same freq
clk: qcom: gcc-ipq8074: rework nss_port5/6 clock to multiple conf
drivers/clk/qcom/clk-rcg.h | 14 +++++- drivers/clk/qcom/clk-rcg2.c | 84 ++++++++++++++++++++++++++++++---- drivers/clk/qcom/gcc-ipq6018.c | 2 - drivers/clk/qcom/gcc-ipq8074.c | 64 +++++++++++++++++++------- drivers/clk/qcom/gcc-sdm660.c | 2 - 5 files changed, 136 insertions(+), 30 deletions(-)
Signature · 1 line
2.37.2
PATCH v2 1/4 clk: qcom: gcc-ipq6018: drop redundant F define
The same exact F frequency table entry is defined in clk-rcg.h Drop the redundant define to cleanup code.
--- drivers/clk/qcom/gcc-ipq6018.c | 2 -- 1 file changed, 2 deletions(-)
drivers/clk/qcom/gcc-ipq6018.c +0 -2
@@ -26,8 +26,6 @@#include "clk-regmap-mux.h" #include "reset.h" -#define F (f, s, h, m, n) { (f), (s), (2 * (h) - 1), (m), (n) } -enum {P_XO ,P_BIAS_PLL ,
Signature · 1 line
2.37.2
PATCH v2 2/4 clk: qcom: gcc-sdm660: drop redundant F define
In reply to Christian MarangiThe same exact F frequency table entry is defined in clk-rcg.h Drop the redundant define to cleanup code.
--- drivers/clk/qcom/gcc-sdm660.c | 2 -- 1 file changed, 2 deletions(-)
drivers/clk/qcom/gcc-sdm660.c +0 -2
@@ -25,8 +25,6 @@#include "reset.h" #include "gdsc.h" -#define F (f, s, h, m, n) { (f), (s), (2 * (h) - 1), (m), (n) } -enum {P_XO ,P_SLEEP_CLK ,
Signature · 1 line
2.37.2
PATCH v2 3/4 clk: qcom: clk-rcg2: introduce support for multiple conf for same freq
In reply to Christian MarangiSome RCG frequency can be reached by multiple configuration.
We currently declare multiple configuration for the same frequency but that is not supported and always the first configuration will be taken.
These multiple configuration are needed as based on the current parent configuration, it may be needed to use a different configuration to reach the same frequency.
To handle this introduce 2 new macro, FM and C.
- FM is used to declare an empty freq_tbl with just the frequency and an array of confs to insert all the config for the provided frequency.
- C is used to declare a fre_conf where src, pre_div, m and n are provided.
The driver is changed to handle this special freq_tbl and select the correct config by calculating the final rate and deciding based on the one that is less different than the requested one.
--- drivers/clk/qcom/clk-rcg.h | 14 ++++++- drivers/clk/qcom/clk-rcg2.c | 84 +++++++++++++++++++++++++++++++++---- 2 files changed, 88 insertions(+), 10 deletions(-)
drivers/clk/qcom/clk-rcg.h +13 -1
@@ -7,7 +7,17 @@#include <linux/clk-provider.h> #include "clk-regmap.h" -#define F (f, s, h, m, n) { (f), (s), (2 * (h) - 1), (m), (n) } +#define F (f, s, h, m, n) { (f), (s), (2 * (h) - 1), (m), (n), 0, NULL } + +#define FM (_f, _confs) { .freq = (_f), .confs_num = ARRAY_SIZE(_confs), .confs = (_confs) } +#define C (s, h, m, n) { (s), (2 * (h) - 1), (m), (n) } + +struct freq_conf { +u8 src; +u8 pre_div; +u16 m; +u16 n; +};struct freq_tbl {unsigned long freq;
@@ -15,6 +25,8 @@ struct freq_tbl {u8 pre_div;u16 m;u16 n; +int confs_num; +const struct freq_conf *confs; };/**
drivers/clk/qcom/clk-rcg2.c +75 -9
131 lines not on this page · raw message
Signature · 1 line
2.37.2
PATCH v2 4/4 clk: qcom: gcc-ipq8074: rework nss_port5/6 clock to multiple conf
In reply to Christian MarangiRework nss_port5/6 to use the new multiple configuration implementation and correctly fix the clocks for these port under some corner case.
This is particularly relevant for device that have 2.5G or 10G port connected to port5 or port 6 on ipq8074. As the parent are shared across multiple port it may be required to select the correct configuration to accomplish the desired clock. Without this patch such port doesn't work in some specific ethernet speed as the clock will be set to the wrong frequency as we just select the first configuration for the related frequency instead of selecting the best one.
--- drivers/clk/qcom/gcc-ipq8074.c | 64 +++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 16 deletions(-)
drivers/clk/qcom/gcc-ipq8074.c +48 -16
@@ -1787,13 +1787,21 @@ static struct clk_regmap_div nss_port4_tx_div_clk_src = { }, }; +static const struct freq_conf ftbl_nss_port5_rx_clk_src_25[] = { +C (P_UNIPHY1_RX ,12.5 ,0 ,0 ), +C (P_UNIPHY0_RX ,5 ,0 ,0 ), +}; + +static const struct freq_conf ftbl_nss_port5_rx_clk_src_125[] = { +C (P_UNIPHY1_RX ,2.5 ,0 ,0 ), +C (P_UNIPHY0_RX ,1 ,0 ,0 ), +}; +static const struct freq_tbl ftbl_nss_port5_rx_clk_src[] = {F (19200000 ,P_XO ,1 ,0 ,0 ), -F (25000000 ,P_UNIPHY1_RX ,12.5 ,0 ,0 ), -F (25000000 ,P_UNIPHY0_RX ,5 ,0 ,0 ), +FM (25000000 , ftbl_nss_port5_rx_clk_src_25),F (78125000 ,P_UNIPHY1_RX ,4 ,0 ,0 ), -F (125000000 ,P_UNIPHY1_RX ,2.5 ,0 ,0 ), -F (125000000 ,P_UNIPHY0_RX ,1 ,0 ,0 ), +FM (125000000 , ftbl_nss_port5_rx_clk_src_125),F (156250000 ,P_UNIPHY1_RX ,2 ,0 ,0 ),F (312500000 ,P_UNIPHY1_RX ,1 ,0 ,0 ), { }
@@ -1829,13 +1837,21 @@ static struct clk_regmap_div nss_port5_rx_div_clk_src = { }, }; +static struct freq_conf ftbl_nss_port5_tx_clk_src_25[] = { +C (P_UNIPHY1_TX ,12.5 ,0 ,0 ), +C (P_UNIPHY0_TX ,5 ,0 ,0 ), +}; + +static struct freq_conf ftbl_nss_port5_tx_clk_src_125[] = { +C (P_UNIPHY1_TX ,2.5 ,0 ,0 ), +C (P_UNIPHY0_TX ,1 ,0 ,0 ), +}; +static const struct freq_tbl ftbl_nss_port5_tx_clk_src[] = {F (19200000 ,P_XO ,1 ,0 ,0 ), -F (25000000 ,P_UNIPHY1_TX ,12.5 ,0 ,0 ), -F (25000000 ,P_UNIPHY0_TX ,5 ,0 ,0 ), +FM (25000000 , ftbl_nss_port5_tx_clk_src_25),F (78125000 ,P_UNIPHY1_TX ,4 ,0 ,0 ), -F (125000000 ,P_UNIPHY1_TX ,2.5 ,0 ,0 ), -F (125000000 ,P_UNIPHY0_TX ,1 ,0 ,0 ), +FM (125000000 , ftbl_nss_port5_tx_clk_src_125),F (156250000 ,P_UNIPHY1_TX ,2 ,0 ,0 ),F (312500000 ,P_UNIPHY1_TX ,1 ,0 ,0 ), { }
@@ -1871,13 +1887,21 @@ static struct clk_regmap_div nss_port5_tx_div_clk_src = { }, }; +static struct freq_conf ftbl_nss_port6_rx_clk_src_25[] = { +C (P_UNIPHY2_RX ,5 ,0 ,0 ), +C (P_UNIPHY2_RX ,12.5 ,0 ,0 ), +}; + +static struct freq_conf ftbl_nss_port6_rx_clk_src_125[] = { +C (P_UNIPHY2_RX ,1 ,0 ,0 ), +C (P_UNIPHY2_RX ,2.5 ,0 ,0 ), +}; +static const struct freq_tbl ftbl_nss_port6_rx_clk_src[] = {F (19200000 ,P_XO ,1 ,0 ,0 ), -F (25000000 ,P_UNIPHY2_RX ,5 ,0 ,0 ), -F (25000000 ,P_UNIPHY2_RX ,12.5 ,0 ,0 ), +FM (25000000 , ftbl_nss_port6_rx_clk_src_25),F (78125000 ,P_UNIPHY2_RX ,4 ,0 ,0 ), -F (125000000 ,P_UNIPHY2_RX ,1 ,0 ,0 ), -F (125000000 ,P_UNIPHY2_RX ,2.5 ,0 ,0 ), +FM (125000000 , ftbl_nss_port6_rx_clk_src_125),F (156250000 ,P_UNIPHY2_RX ,2 ,0 ,0 ),F (312500000 ,P_UNIPHY2_RX ,1 ,0 ,0 ), { }
@@ -1913,13 +1937,21 @@ static struct clk_regmap_div nss_port6_rx_div_clk_src = { }, }; +static struct freq_conf ftbl_nss_port6_tx_clk_src_25[] = { +C (P_UNIPHY2_TX ,5 ,0 ,0 ), +C (P_UNIPHY2_TX ,12.5 ,0 ,0 ), +}; + +static struct freq_conf ftbl_nss_port6_tx_clk_src_125[] = { +C (P_UNIPHY2_TX ,1 ,0 ,0 ), +C (P_UNIPHY2_TX ,2.5 ,0 ,0 ), +}; +static const struct freq_tbl ftbl_nss_port6_tx_clk_src[] = {F (19200000 ,P_XO ,1 ,0 ,0 ), -F (25000000 ,P_UNIPHY2_TX ,5 ,0 ,0 ), -F (25000000 ,P_UNIPHY2_TX ,12.5 ,0 ,0 ), +FM (25000000 , ftbl_nss_port6_tx_clk_src_25),F (78125000 ,P_UNIPHY2_TX ,4 ,0 ,0 ), -F (125000000 ,P_UNIPHY2_TX ,1 ,0 ,0 ), -F (125000000 ,P_UNIPHY2_TX ,2.5 ,0 ,0 ), +FM (125000000 , ftbl_nss_port6_tx_clk_src_125),F (156250000 ,P_UNIPHY2_TX ,2 ,0 ,0 ),F (312500000 ,P_UNIPHY2_TX ,1 ,0 ,0 ), { }
Signature · 1 line
2.37.2