MSM8976 PLL,RPMPD and DTS changes
Subsystems (5)
v2 cover MSM8976 PLL,RPMPD and DTS changes
This patch series fixes introduce support for msm8976 pll, also brings some adjustments and fixes domains setup and few dts nitpicks.
Changes since v1
================
1. Fixed few styling issues
2. Changed compatibles for plls
3. Added fixes: tag to first patch
Adam Skladowski (7):
drivers: soc: qcom: rpmpd: Fix MSM8976 power domains setup
clk: qcom: clk-hfpll: Configure l_val in init when required
clk: qcom: hfpll: Allow matching pdata
dt-bindings: clock: qcom,hfpll: Document MSM8976 compatibles
clk: qcom: hfpll: Add MSM8976 PLL data
arm64: dts: qcom: msm8976: Split lpass region
arm64: dts: qcom: msm8976: Fix smsm ipc bit shifts
.../devicetree/bindings/clock/qcom,hfpll.txt | 3 + arch/arm64/boot/dts/qcom/msm8976.dtsi | 11 +++- drivers/clk/qcom/clk-hfpll.c | 4 ++ drivers/clk/qcom/clk-hfpll.h | 1 + drivers/clk/qcom/hfpll.c | 59 ++++++++++++++++++- drivers/soc/qcom/rpmpd.c | 27 ++++----- 6 files changed, 83 insertions(+), 22 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/7 drivers: soc: qcom: rpmpd: Fix MSM8976 power domains setup
Downstream kernel parses resource names based on pm8950-rpm-regulator.dtsi in such file qcom,resource-name takes three values: smpa,ldoa and clk0. First appearance of RWSC/RWSM point to msm-4.4 kernel
which is way newer than what this platform was shipped with (msm-3.10). For the max_state downstream code limit value to TURBO inside dts with only one turbo_high being placed in msm-thermal bindings. One of effects of requesting TURBO_HIGH vote is rebooting of device which happens during voting inside WCNSS/IRIS,
this behavior was observed on LeEco S2 smartphone.
Fix regulator setup and drop unused resources.
--- drivers/soc/qcom/rpmpd.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-)
drivers/soc/qcom/rpmpd.c +10 -17
@@ -166,13 +166,6 @@ static struct rpmpd cx_rwcx0_vfl = { .key = KEY_FLOOR_LEVEL, }; -static struct rpmpd cx_rwsc2_vfl = { - .pd = { .name ="cx_vfl" , }, - .res_type =RPMPD_RWSC , - .res_id =2 , - .key =KEY_FLOOR_LEVEL , -}; -static struct rpmpd cx_s1a_vfc = { .pd = { .name ="cx_vfc" , }, .res_type =RPMPD_SMPA ,
@@ -329,6 +322,13 @@ static struct rpmpd mx_s6a_lvl_ao = { .key = KEY_LEVEL, }; +static struct rpmpd mx_s6a_vfl = { + .pd = { .name ="mx_vfl" , }, + .res_type =RPMPD_SMPA , + .res_id =6 , + .key =KEY_FLOOR_LEVEL , +}; +static struct rpmpd mx_s7a_lvl_ao;static struct rpmpd mx_s7a_lvl = { .pd = { .name ="mx" , },
@@ -361,13 +361,6 @@ static struct rpmpd mx_rwmx0_vfl = { .key = KEY_FLOOR_LEVEL, }; -static struct rpmpd mx_rwsm6_vfl = { - .pd = { .name ="mx_vfl" , }, - .res_type =RPMPD_RWSM , - .res_id =6 , - .key =KEY_FLOOR_LEVEL , -}; -/* MD */ static struct rpmpd md_s1a_corner_ao;static struct rpmpd md_s1a_corner = {
@@ -591,16 +584,16 @@ static const struct rpmpd_desc msm8953_desc = {static struct rpmpd *msm8976_rpmpds[] = { [MSM8976_VDDCX ] = &cx_s2a_lvl, [MSM8976_VDDCX_AO ] = &cx_s2a_lvl_ao, - [MSM8976_VDDCX_VFL ] = &cx_rwsc2_vfl, + [MSM8976_VDDCX_VFL ] = &cx_s2a_vfl, [MSM8976_VDDMX ] = &mx_s6a_lvl, [MSM8976_VDDMX_AO ] = &mx_s6a_lvl_ao, - [MSM8976_VDDMX_VFL ] = &mx_rwsm6_vfl, + [MSM8976_VDDMX_VFL ] = &mx_s6a_vfl, };static const struct rpmpd_desc msm8976_desc = { .rpmpds = msm8976_rpmpds, .num_pds =ARRAY_SIZE (msm8976_rpmpds), - .max_state =RPM_SMD_LEVEL_TURBO_HIGH , + .max_state =RPM_SMD_LEVEL_TURBO , };static struct rpmpd *msm8994_rpmpds[] = {
Signature · 1 line
2.25.1
Re: [PATCH v2 1/7] drivers: soc: qcom: rpmpd: Fix MSM8976 power domains setup
Quoted 11 lines · Adam Skladowski
Downstream kernel parses resource names based on
pm8950-rpm-regulator.dtsiin such file qcom,resource-name takes three values: smpa,ldoa and clk0. First appearance of RWSC/RWSM point to msm-4.4 kernel
which is way newer than what this platform was shipped with (msm-3.10). For themax_statedownstream code limit value to TURBO inside dts with only oneturbo_highbeing placed in msm-thermal bindings. One of effects of requestingTURBO_HIGHvote is rebooting of device which happens during voting inside WCNSS/IRIS,
this behavior was observed on LeEco S2 smartphone.
Fix regulator setup and drop unused resources.
Quoted 2 lines
Fixes b1d522443b4b ("soc: qcom: rpmpd: Add rpm power domains for msm8976")Signed-off-by Adam Skladowski <[email protected]>
Signature · 2 lines
With best wishes Dmitry
PATCH v2 2/7 clk: qcom: clk-hfpll: Configure l_val in init when required
In reply to Adam SkladowskiAdd support for pre-configuring default frequency multiplier, this appears to be required on some platforms like MSM8976. Without configuring L_VAL device reboots when trying to bring PLL up.
--- drivers/clk/qcom/clk-hfpll.c | 4 ++++ drivers/clk/qcom/clk-hfpll.h | 1 + 2 files changed, 5 insertions(+)
drivers/clk/qcom/clk-hfpll.c +4 -0
@@ -44,6 +44,10 @@ static void __clk_hfpll_init_once(struct clk_hw *hw)regmap_write (regmap, hd->user_reg, regval); } +/* Write L_VAL from conf if it exist */ +if (hd->l_val) +regmap_write (regmap, hd->l_reg, hd->l_val); +if (hd->droop_reg)regmap_write (regmap, hd->droop_reg, hd->droop_val);
drivers/clk/qcom/clk-hfpll.h +1 -0
@@ -18,6 +18,7 @@ struct hfpll_data {u32 status_reg;u8 lock_bit; +u32 l_val;u32 droop_val;u32 config_val;u32 user_val;
Signature · 1 line
2.25.1
Re: [PATCH v2 2/7] clk: qcom: clk-hfpll: Configure l_val in init when required
Quoted 6 lines · Adam Skladowski
Add support for pre-configuring default frequency multiplier, this appears to be required on some platforms like MSM8976. Without configuring
L_VALdevice reboots when trying to bring PLL up.Signed-off-by Adam Skladowski <[email protected]>---
Konrad
PATCH v2 3/7 clk: qcom: hfpll: Allow matching pdata
In reply to Adam SkladowskiHFPLL driver can be used to drive PLLs also on different SoCs like MSM8976 On MSM8976 each PLL gets it own different configuration,
add matching pdata to driver to support multiple configurations.
--- drivers/clk/qcom/hfpll.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/clk/qcom/hfpll.c +3 -2
@@ -6,6 +6,7 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/of.h> +#include <linux/of_device.h> #include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/regmap.h>
@@ -32,7 +33,7 @@ static const struct hfpll_data hdata = { };static const struct of_device_id qcom_hfpll_match_table[] = { - { .compatible ="qcom,hfpll" }, + { .compatible ="qcom,hfpll" , &hdata }, { } };MODULE_DEVICE_TABLE (of, qcom_hfpll_match_table);
@@ -83,7 +84,7 @@ static int qcom_hfpll_probe(struct platform_device *pdev) init.parent_data = &pdata; - h->d = &hdata; + h->d =of_device_get_match_data (&pdev->dev); h->clkr.hw.init = &init;spin_lock_init (&h->lock);
Signature · 1 line
2.25.1
Re: [PATCH v2 3/7] clk: qcom: hfpll: Allow matching pdata
Quoted 22 lines · Adam Skladowski
HFPLL driver can be used to drive PLLs also on different SoCs like MSM8976 On MSM8976 each PLL gets it own different configuration,
add matching pdata to driver to support multiple configurations.Signed-off-by Adam Skladowski <[email protected]>--- drivers/clk/qcom/hfpll.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/clk/qcom/hfpll.c +1
-0@@ -6,6 +6,7 @@#include <linux/module.h> #include <linux/platform_device.h> #include <linux/of.h> +#include <linux/of_device.h> #include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/regmap.h>
drivers/clk/qcom/hfpll.c static const struct hfpll_data hdata = { · line 36
Quoted 5 lines
drivers/clk/qcom/hfpll.c +1
-1@@ -32,7 +33,7 @@ static const struct hfpll_data hdata = { };static const struct of_device_id qcom_hfpll_match_table[] = { - { .compatible ="qcom,hfpll" }, + { .compatible ="qcom,hfpll" , &hdata },
As Angelo pointed out the last time around, ".data = " is missing
Konrad
PATCH v2 4/7 dt-bindings: clock: qcom,hfpll: Document MSM8976 compatibles
In reply to Adam SkladowskiDocument MSM8976 HFPLL compatibles.
--- Documentation/devicetree/bindings/clock/qcom,hfpll.txt | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/clock/qcom,hfpll.txt +3 -0
@@ -12,6 +12,9 @@ PROPERTIES "qcom,hfpll-apq8064", "qcom,hfpll" "qcom,hfpll-msm8974", "qcom,hfpll" "qcom,hfpll-msm8960", "qcom,hfpll" + "qcom,msm8976-hfpll-a53", "qcom,hfpll" + "qcom,msm8976-hfpll-a72", "qcom,hfpll" + "qcom,msm8976-hfpll-cci", "qcom,hfpll" - reg: Usage: required
Signature · 1 line
2.25.1
Re: [PATCH v2 4/7] dt-bindings: clock: qcom,hfpll: Document MSM8976 compatibles
Quoted 6 lines · Adam Skladowski
Document MSM8976 HFPLL compatibles.
Signed-off-by Adam Skladowski <[email protected]>--- Documentation/devicetree/bindings/clock/qcom,hfpll.txt | 3 +++ 1 file changed, 3 insertions(+)
Best regards,
Krzysztof
PATCH v2 5/7 clk: qcom: hfpll: Add MSM8976 PLL data
In reply to Adam SkladowskiAdd PLL configuration for MSM8976 SoC, this SoC offers 3 HFPLL. Small cluster offers two presets for 652-902Mhz range and 902Mhz-1.47Ghz. For simplicity only add second range as smaller frequencies can be obtained via apcs divider or safe parent this also saves us
a hassle of reconfiguring VCO bit and config_val.
A72 and CCI cluster only use single frequency range with their outputs/post_dividers/vco_bits being static.
--- drivers/clk/qcom/hfpll.c | 54 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+)
drivers/clk/qcom/hfpll.c +54 -0
@@ -32,8 +32,62 @@ static const struct hfpll_data hdata = { .max_rate = 2900000000UL, }; +static const struct hfpll_data msm8976_a53 = { + .mode_reg =0x00 , + .l_reg =0x04 , + .m_reg =0x08 , + .n_reg =0x0c , + .user_reg =0x10 , + .config_reg =0x14 , + .config_val =0x341600 , + .status_reg =0x1c , + .lock_bit =16 , + + .l_val =0x35 , + .user_val =0x109 , + .min_rate =902400000UL , + .max_rate =1478400000UL , +}; + +static const struct hfpll_data msm8976_a72 = { + .mode_reg =0x00 , + .l_reg =0x04 , + .m_reg =0x08 , + .n_reg =0x0c , + .user_reg =0x10 , + .config_reg =0x14 , + .config_val =0x4e0405d , + .status_reg =0x1c , + .lock_bit =16 , + + .l_val =0x3e , + .user_val =0x100109 , + .min_rate =940800000UL , + .max_rate =1843200000UL , +}; + +static const struct hfpll_data msm8976_cci = { + .mode_reg =0x00 , + .l_reg =0x04 , + .m_reg =0x08 , + .n_reg =0x0c , + .user_reg =0x10 , + .config_reg =0x14 , + .config_val =0x141400 , + .status_reg =0x1c , + .lock_bit =16 , + + .l_val =0x20 , + .user_val =0x100109 , + .min_rate =556800000UL , + .max_rate =902400000UL , +}; +static const struct of_device_id qcom_hfpll_match_table[] = { { .compatible ="qcom,hfpll" , &hdata }, + { .compatible ="qcom,msm8976-hfpll-a53" , &msm8976_a53 }, + { .compatible ="qcom,msm8976-hfpll-a72" , &msm8976_a72 }, + { .compatible ="qcom,msm8976-hfpll-cci" , &msm8976_cci }, { } };MODULE_DEVICE_TABLE (of, qcom_hfpll_match_table);
Signature · 1 line
2.25.1
Re: [PATCH v2 5/7] clk: qcom: hfpll: Add MSM8976 PLL data
Quoted 10 lines · Adam Skladowski
Add PLL configuration for MSM8976 SoC, this SoC offers 3 HFPLL. Small cluster offers two presets for 652-902Mhz range and 902Mhz-1.47Ghz. For simplicity only add second range as smaller frequencies can be obtained via apcs divider or safe parent this also saves us
a hassle of reconfiguring VCO bit andconfig_val.
A72 and CCI cluster only use single frequency range with their outputs/post_dividers/vco_bits being static.Signed-off-by Adam Skladowski <[email protected]>---
[...]
Quoted 5 lines
drivers/clk/qcom/hfpll.c +5
-0+static const struct hfpll_data msm8976_a72 = { + .mode_reg =0x00 , + .l_reg =0x04 , + .m_reg =0x08 , + .n_reg =0x0c ,
drivers/clk/qcom/hfpll.c static const struct hfpll_data hdata = { · line 66
Quoted 10 lines
drivers/clk/qcom/hfpll.c +10
-0+ .user_reg = 0x10, + .config_reg = 0x14, + .config_val = 0x4e0405d, + .status_reg = 0x1c, + .lock_bit = 16, + + .l_val = 0x3e, + .user_val = 0x100109, + .min_rate = 940800000UL, + .max_rate = 1843200000UL,
2016000000?
[...]
drivers/clk/qcom/hfpll.c static const struct hfpll_data hdata = { · line 90
Quoted 5 lines
static const struct
of_device_idqcom_hfpll_match_table[] = {drivers/clk/qcom/hfpll.c +3
-0{ .compatible = "qcom,hfpll", &hdata }, + { .compatible = "qcom,msm8976-hfpll-a53", &msm8976_a53 }, + { .compatible = "qcom,msm8976-hfpll-a72", &msm8976_a72 }, + { .compatible = "qcom,msm8976-hfpll-cci", &msm8976_cci },
.data = is missing
Konrad
Re: [PATCH v2 5/7] clk: qcom: hfpll: Add MSM8976 PLL data
Quoted 13 lines · Konrad Dybcio
Quoted 10 lines · Adam Skladowski
Add PLL configuration for MSM8976 SoC, this SoC offers 3 HFPLL. Small cluster offers two presets for 652-902Mhz range and 902Mhz-1.47Ghz. For simplicity only add second range as smaller frequencies can be obtained via apcs divider or safe parent this also saves us
a hassle of reconfiguring VCO bit andconfig_val.
A72 and CCI cluster only use single frequency range with their outputs/post_dividers/vco_bits being static.Signed-off-by Adam Skladowski <[email protected]>---
[...]
Quoted 16 lines
Quoted 5 lines
drivers/clk/qcom/hfpll.c +5
-0+static const struct hfpll_data msm8976_a72 = { + .mode_reg =0x00 , + .l_reg =0x04 , + .m_reg =0x08 , + .n_reg =0x0c ,drivers/clk/qcom/hfpll.c static const struct hfpll_data hdata = { · line 66
Quoted 10 lines
drivers/clk/qcom/hfpll.c +10
-0+ .user_reg = 0x10, + .config_reg = 0x14, + .config_val = 0x4e0405d, + .status_reg = 0x1c, + .lock_bit = 16, + + .l_val = 0x3e, + .user_val = 0x100109, + .min_rate = 940800000UL, + .max_rate = 1843200000UL,2016000000?
We are using msm kernel as base not SODP ports.
https://android.googlesource.com/kernel/msm/+/android-lego-6.0.1_r0.2/drivers/clk/qcom/clock-cpu-8976.c
https://android.googlesource.com/kernel/msm.git/+/android-msm-lego-3.10-marshmallow-dr/arch/arm/boot/dts/qcom/msm8976.dtsi#349
Quoted 9 lines
[...]
drivers/clk/qcom/hfpll.c static const struct hfpll_data hdata = { · line 90
Quoted 5 lines
static const struct
of_device_idqcom_hfpll_match_table[] = {drivers/clk/qcom/hfpll.c +3
-0{ .compatible = "qcom,hfpll", &hdata }, + { .compatible = "qcom,msm8976-hfpll-a53", &msm8976_a53 }, + { .compatible = "qcom,msm8976-hfpll-a72", &msm8976_a72 }, + { .compatible = "qcom,msm8976-hfpll-cci", &msm8976_cci },.data = is missing
Konrad
Seems like i took "inspiration" from also not great code, albeit it does work somehow when printing inside init, will fix in v3
Thanks Angelo/Konrad
PATCH v2 6/7 arm64: dts: qcom: msm8976: Split lpass region
In reply to Adam SkladowskiSome devices like Sony Loire uses Broadcom module over sdc3 however others utilize qcom WCNSS, split shared region based on downstream pil-tz loader.
--- arch/arm64/boot/dts/qcom/msm8976.dtsi | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8976.dtsi +6 -1
@@ -338,7 +338,12 @@ mpss_mem: mpss@86c00000 { }; lpass_mem: lpass@8c200000 { - reg = <0x0 0x8c200000 0x0 0x1800000>; + reg = <0x0 0x8c200000 0x0 0x1000000>; + no-map; + }; + + wcnss_fw_mem: wcnss@8d200000 { + reg = <0x0 0x8d200000 0x0 0x800000>; no-map; };
Signature · 1 line
2.25.1
Re: [PATCH v2 6/7] arm64: dts: qcom: msm8976: Split lpass region
Quoted 5 lines · Adam Skladowski
Some devices like Sony Loire uses Broadcom module over sdc3 however others utilize qcom WCNSS, split shared region based on downstream pil-tz loader.
Signed-off-by Adam Skladowski <[email protected]>---
Looks like 0x1800000 is the generic configuration:
Konrad
Re: [PATCH v2 6/7] arm64: dts: qcom: msm8976: Split lpass region
Quoted 11 lines · Konrad Dybcio
Quoted 5 lines · Adam Skladowski
Some devices like Sony Loire uses Broadcom module over sdc3 however others utilize qcom WCNSS, split shared region based on downstream pil-tz loader.
Signed-off-by Adam Skladowski <[email protected]>---
Looks like
0x1800000is the generic configuration:Konrad
Yes, indeed however as you probably noticed this region isn't called lpass rather reloc.
Downstream sometimes tends to define pools of memory where loader will do its own job.
If you read later wcnss/lpass both point to same shared memory which im not sure without reworks will work with mainline.
On top it's not really that it will even hurt Loire at the end, if you browse around internet you can easily find gists from Pavel which have logs of pil-tz loading of lpass:
https://gist.github.com/bartcubbins/c2ff215f39fe2b3ed5d3f8444bcec83b#file-gistfile1-txt-L1289
As you can see even on loire where region is bigger it only loads first 0x1000000.
Do we really need to complicate things just for everyone else for sake of not ending with one platform having to adjust or even not(it probably wouldn't even make a difference for loader as it will fit anyway)
On the ending note i apologize if this msg gets broken formatting first time using thunderbird and after redesign im unable to find most options mentioned in guide.
.
PATCH v2 7/7 arm64: dts: qcom: msm8976: Fix smsm ipc bit shifts
In reply to Adam SkladowskiUpdate bits to match downstream irq-bitmask values.
--- arch/arm64/boot/dts/qcom/msm8976.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/msm8976.dtsi +2 -2
@@ -433,9 +433,9 @@ smsm { #address-cells = <1>; #size-cells = <0>; - qcom,ipc-1 = <&apcs 8 12>; + qcom,ipc-1 = <&apcs 8 13>; qcom,ipc-2 = <&apcs 8 9>; - qcom,ipc-3 = <&apcs 8 18>; + qcom,ipc-3 = <&apcs 8 19>; apps_smsm: apps@0 { reg = <0>;
Signature · 1 line
2.25.1
Quoted 2 lines · Adam Skladowski
This patch series fixes introduce support for msm8976 pll, also brings some adjustments and fixes domains setup and few dts nitpicks.
Could you please extend the series with the DT patches utilizing the HFPLL? You can keep them disabled via the status property if they are not expected to be used yet.
Quoted 24 lines
Changes since v1
================
1. Fixed few styling issues
2. Changed compatibles for plls
3. Added fixes: tag to first patchAdam Skladowski (7):
drivers: soc: qcom: rpmpd: Fix MSM8976 power domains setup
clk: qcom: clk-hfpll: Configurel_valin init when required
clk: qcom: hfpll: Allow matching pdata
dt-bindings: clock: qcom,hfpll: Document MSM8976 compatibles
clk: qcom: hfpll: Add MSM8976 PLL data
arm64: dts: qcom: msm8976: Split lpass region
arm64: dts: qcom: msm8976: Fix smsm ipc bit shifts.../devicetree/bindings/clock/qcom,hfpll.txt | 3 + arch/arm64/boot/dts/qcom/msm8976.dtsi | 11 +++- drivers/clk/qcom/clk-hfpll.c | 4 ++ drivers/clk/qcom/clk-hfpll.h | 1 + drivers/clk/qcom/hfpll.c | 59 ++++++++++++++++++- drivers/soc/qcom/rpmpd.c | 27 ++++----- 6 files changed, 83 insertions(+), 22 deletions(-)
Signature · 2 lines
With best wishes Dmitry