* [RESEND PATCH 1/2] clk: rockchip: rk3399: expose PCLK_COREDBG_{B,L}
@ 2021-09-07 16:46 ` Brian Norris
0 siblings, 0 replies; 24+ messages in thread
From: Brian Norris @ 2021-09-07 16:46 UTC (permalink / raw)
To: Heiko Stuebner, Michael Turquette, Stephen Boyd
Cc: linux-clk, Chen-Yu Tsai, Douglas Anderson, linux-kernel,
linux-rockchip, linux-arm-kernel, Brian Norris
We have DT IDs for PCLK_COREDBG_L and PCLK_COREDBG_B, but we don't
actually expose them.
In exposing these clocks (and attaching them to the coresight debug
driver), the AMBA bus may start to disable them. Because no CPU driver
owns these clocks (e.g., cpufreq-dt doesn't enable() them -- and even if
it did, it's not early enough -- nor does arch/arm64/kernel/smp.c), the
common clock framework then feels the need to disable the parents
(including the CPU PLLs) -- which is no fun for anyone.
Thus, mark the CPU clocks as critical as well.
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
Resending, because I missed the mailing lists on the first version.
drivers/clk/rockchip/clk-rk3399.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
index 62a4f2543960..53ed5cca335b 100644
--- a/drivers/clk/rockchip/clk-rk3399.c
+++ b/drivers/clk/rockchip/clk-rk3399.c
@@ -481,7 +481,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
COMPOSITE_NOMUX(0, "atclk_core_l", "armclkl", CLK_IGNORE_UNUSED,
RK3399_CLKSEL_CON(1), 0, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
RK3399_CLKGATE_CON(0), 5, GFLAGS),
- COMPOSITE_NOMUX(0, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
+ COMPOSITE_NOMUX(PCLK_COREDBG_L, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
RK3399_CLKSEL_CON(1), 8, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
RK3399_CLKGATE_CON(0), 6, GFLAGS),
@@ -531,7 +531,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
GATE(ACLK_GIC_ADB400_CORE_B_2_GIC, "aclk_core_adb400_core_b_2_gic", "armclkb", CLK_IGNORE_UNUSED,
RK3399_CLKGATE_CON(14), 4, GFLAGS),
- DIV(0, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
+ DIV(PCLK_COREDBG_B, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
RK3399_CLKSEL_CON(3), 13, 2, DFLAGS | CLK_DIVIDER_READ_ONLY),
GATE(0, "pclk_dbg_cxcs_pd_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
@@ -1514,7 +1514,10 @@ static const char *const rk3399_cru_critical_clocks[] __initconst = {
"aclk_vio_noc",
/* ddrc */
- "sclk_ddrc"
+ "sclk_ddrc",
+
+ "armclkl",
+ "armclkb",
};
static const char *const rk3399_pmucru_critical_clocks[] __initconst = {
@@ -1549,9 +1552,6 @@ static void __init rk3399_clk_init(struct device_node *np)
rockchip_clk_register_branches(ctx, rk3399_clk_branches,
ARRAY_SIZE(rk3399_clk_branches));
- rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
- ARRAY_SIZE(rk3399_cru_critical_clocks));
-
rockchip_clk_register_armclk(ctx, ARMCLKL, "armclkl",
mux_armclkl_p, ARRAY_SIZE(mux_armclkl_p),
&rk3399_cpuclkl_data, rk3399_cpuclkl_rates,
@@ -1562,6 +1562,9 @@ static void __init rk3399_clk_init(struct device_node *np)
&rk3399_cpuclkb_data, rk3399_cpuclkb_rates,
ARRAY_SIZE(rk3399_cpuclkb_rates));
+ rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
+ ARRAY_SIZE(rk3399_cru_critical_clocks));
+
rockchip_register_softrst(np, 21, reg_base + RK3399_SOFTRST_CON(0),
ROCKCHIP_SOFTRST_HIWORD_MASK);
--
2.33.0.153.gba50c8fa24-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RESEND PATCH 1/2] clk: rockchip: rk3399: expose PCLK_COREDBG_{B,L}
@ 2021-09-07 16:46 ` Brian Norris
0 siblings, 0 replies; 24+ messages in thread
From: Brian Norris @ 2021-09-07 16:46 UTC (permalink / raw)
To: Heiko Stuebner, Michael Turquette, Stephen Boyd
Cc: linux-clk, Chen-Yu Tsai, Douglas Anderson, linux-kernel,
linux-rockchip, linux-arm-kernel, Brian Norris
We have DT IDs for PCLK_COREDBG_L and PCLK_COREDBG_B, but we don't
actually expose them.
In exposing these clocks (and attaching them to the coresight debug
driver), the AMBA bus may start to disable them. Because no CPU driver
owns these clocks (e.g., cpufreq-dt doesn't enable() them -- and even if
it did, it's not early enough -- nor does arch/arm64/kernel/smp.c), the
common clock framework then feels the need to disable the parents
(including the CPU PLLs) -- which is no fun for anyone.
Thus, mark the CPU clocks as critical as well.
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
Resending, because I missed the mailing lists on the first version.
drivers/clk/rockchip/clk-rk3399.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
index 62a4f2543960..53ed5cca335b 100644
--- a/drivers/clk/rockchip/clk-rk3399.c
+++ b/drivers/clk/rockchip/clk-rk3399.c
@@ -481,7 +481,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
COMPOSITE_NOMUX(0, "atclk_core_l", "armclkl", CLK_IGNORE_UNUSED,
RK3399_CLKSEL_CON(1), 0, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
RK3399_CLKGATE_CON(0), 5, GFLAGS),
- COMPOSITE_NOMUX(0, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
+ COMPOSITE_NOMUX(PCLK_COREDBG_L, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
RK3399_CLKSEL_CON(1), 8, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
RK3399_CLKGATE_CON(0), 6, GFLAGS),
@@ -531,7 +531,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
GATE(ACLK_GIC_ADB400_CORE_B_2_GIC, "aclk_core_adb400_core_b_2_gic", "armclkb", CLK_IGNORE_UNUSED,
RK3399_CLKGATE_CON(14), 4, GFLAGS),
- DIV(0, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
+ DIV(PCLK_COREDBG_B, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
RK3399_CLKSEL_CON(3), 13, 2, DFLAGS | CLK_DIVIDER_READ_ONLY),
GATE(0, "pclk_dbg_cxcs_pd_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
@@ -1514,7 +1514,10 @@ static const char *const rk3399_cru_critical_clocks[] __initconst = {
"aclk_vio_noc",
/* ddrc */
- "sclk_ddrc"
+ "sclk_ddrc",
+
+ "armclkl",
+ "armclkb",
};
static const char *const rk3399_pmucru_critical_clocks[] __initconst = {
@@ -1549,9 +1552,6 @@ static void __init rk3399_clk_init(struct device_node *np)
rockchip_clk_register_branches(ctx, rk3399_clk_branches,
ARRAY_SIZE(rk3399_clk_branches));
- rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
- ARRAY_SIZE(rk3399_cru_critical_clocks));
-
rockchip_clk_register_armclk(ctx, ARMCLKL, "armclkl",
mux_armclkl_p, ARRAY_SIZE(mux_armclkl_p),
&rk3399_cpuclkl_data, rk3399_cpuclkl_rates,
@@ -1562,6 +1562,9 @@ static void __init rk3399_clk_init(struct device_node *np)
&rk3399_cpuclkb_data, rk3399_cpuclkb_rates,
ARRAY_SIZE(rk3399_cpuclkb_rates));
+ rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
+ ARRAY_SIZE(rk3399_cru_critical_clocks));
+
rockchip_register_softrst(np, 21, reg_base + RK3399_SOFTRST_CON(0),
ROCKCHIP_SOFTRST_HIWORD_MASK);
--
2.33.0.153.gba50c8fa24-goog
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
2021-09-07 16:46 ` Brian Norris
(?)
@ 2021-09-07 16:46 ` Brian Norris
-1 siblings, 0 replies; 24+ messages in thread
From: Brian Norris @ 2021-09-07 16:46 UTC (permalink / raw)
To: Heiko Stuebner, Michael Turquette, Stephen Boyd
Cc: linux-clk, Chen-Yu Tsai, Douglas Anderson, linux-kernel,
linux-rockchip, linux-arm-kernel, Brian Norris
Per Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt.
This IP block can be used for sampling the PC of any given CPU, which is
useful in certain panic scenarios where you can't get the CPU to stop
cleanly (e.g., hard lockup).
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 48 ++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 3871c7fd83b0..c8c62637b600 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -433,6 +433,54 @@ usbdrd_dwc3_1: usb@fe900000 {
};
};
+ debug@fe430000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe430000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_L>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_l0>;
+ };
+
+ debug@fe432000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe432000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_L>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_l1>;
+ };
+
+ debug@fe434000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe434000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_L>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_l2>;
+ };
+
+ debug@fe436000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe436000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_L>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_l3>;
+ };
+
+ debug@fe610000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe610000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_B>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_b0>;
+ };
+
+ debug@fe710000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe710000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_B>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_b1>;
+ };
+
cdn_dp: dp@fec00000 {
compatible = "rockchip,rk3399-cdn-dp";
reg = <0x0 0xfec00000 0x0 0x100000>;
--
2.33.0.153.gba50c8fa24-goog
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
@ 2021-09-07 16:46 ` Brian Norris
0 siblings, 0 replies; 24+ messages in thread
From: Brian Norris @ 2021-09-07 16:46 UTC (permalink / raw)
To: Heiko Stuebner, Michael Turquette, Stephen Boyd
Cc: linux-clk, Chen-Yu Tsai, Douglas Anderson, linux-kernel,
linux-rockchip, linux-arm-kernel, Brian Norris
Per Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt.
This IP block can be used for sampling the PC of any given CPU, which is
useful in certain panic scenarios where you can't get the CPU to stop
cleanly (e.g., hard lockup).
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 48 ++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 3871c7fd83b0..c8c62637b600 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -433,6 +433,54 @@ usbdrd_dwc3_1: usb@fe900000 {
};
};
+ debug@fe430000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe430000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_L>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_l0>;
+ };
+
+ debug@fe432000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe432000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_L>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_l1>;
+ };
+
+ debug@fe434000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe434000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_L>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_l2>;
+ };
+
+ debug@fe436000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe436000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_L>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_l3>;
+ };
+
+ debug@fe610000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe610000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_B>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_b0>;
+ };
+
+ debug@fe710000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe710000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_B>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_b1>;
+ };
+
cdn_dp: dp@fec00000 {
compatible = "rockchip,rk3399-cdn-dp";
reg = <0x0 0xfec00000 0x0 0x100000>;
--
2.33.0.153.gba50c8fa24-goog
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 24+ messages in thread* [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
@ 2021-09-07 16:46 ` Brian Norris
0 siblings, 0 replies; 24+ messages in thread
From: Brian Norris @ 2021-09-07 16:46 UTC (permalink / raw)
To: Heiko Stuebner, Michael Turquette, Stephen Boyd
Cc: linux-clk, Chen-Yu Tsai, Douglas Anderson, linux-kernel,
linux-rockchip, linux-arm-kernel, Brian Norris
Per Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt.
This IP block can be used for sampling the PC of any given CPU, which is
useful in certain panic scenarios where you can't get the CPU to stop
cleanly (e.g., hard lockup).
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
arch/arm64/boot/dts/rockchip/rk3399.dtsi | 48 ++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
index 3871c7fd83b0..c8c62637b600 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -433,6 +433,54 @@ usbdrd_dwc3_1: usb@fe900000 {
};
};
+ debug@fe430000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe430000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_L>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_l0>;
+ };
+
+ debug@fe432000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe432000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_L>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_l1>;
+ };
+
+ debug@fe434000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe434000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_L>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_l2>;
+ };
+
+ debug@fe436000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe436000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_L>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_l3>;
+ };
+
+ debug@fe610000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe610000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_B>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_b0>;
+ };
+
+ debug@fe710000 {
+ compatible = "arm,coresight-cpu-debug", "arm,primecell";
+ reg = <0 0xfe710000 0 0x1000>;
+ clocks = <&cru PCLK_COREDBG_B>;
+ clock-names = "apb_pclk";
+ cpu = <&cpu_b1>;
+ };
+
cdn_dp: dp@fec00000 {
compatible = "rockchip,rk3399-cdn-dp";
reg = <0x0 0xfec00000 0x0 0x100000>;
--
2.33.0.153.gba50c8fa24-goog
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 24+ messages in thread* Re: [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
2021-09-07 16:46 ` Brian Norris
(?)
@ 2021-09-08 2:09 ` Leo Yan
-1 siblings, 0 replies; 24+ messages in thread
From: Leo Yan @ 2021-09-08 2:09 UTC (permalink / raw)
To: Brian Norris
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Chen-Yu Tsai, Douglas Anderson, linux-kernel, linux-rockchip,
linux-arm-kernel
On Tue, Sep 07, 2021 at 09:46:37AM -0700, Brian Norris wrote:
> Per Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt.
>
> This IP block can be used for sampling the PC of any given CPU, which is
> useful in certain panic scenarios where you can't get the CPU to stop
> cleanly (e.g., hard lockup).
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
Looks good to me, FWIW:
Reviewed-by: Leo Yan <leo.yan@linaro.org>
> ---
>
> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 48 ++++++++++++++++++++++++
> 1 file changed, 48 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> index 3871c7fd83b0..c8c62637b600 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -433,6 +433,54 @@ usbdrd_dwc3_1: usb@fe900000 {
> };
> };
>
> + debug@fe430000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe430000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_L>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_l0>;
> + };
> +
> + debug@fe432000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe432000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_L>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_l1>;
> + };
> +
> + debug@fe434000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe434000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_L>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_l2>;
> + };
> +
> + debug@fe436000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe436000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_L>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_l3>;
> + };
> +
> + debug@fe610000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe610000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_B>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_b0>;
> + };
> +
> + debug@fe710000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe710000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_B>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_b1>;
> + };
> +
> cdn_dp: dp@fec00000 {
> compatible = "rockchip,rk3399-cdn-dp";
> reg = <0x0 0xfec00000 0x0 0x100000>;
> --
> 2.33.0.153.gba50c8fa24-goog
>
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
@ 2021-09-08 2:09 ` Leo Yan
0 siblings, 0 replies; 24+ messages in thread
From: Leo Yan @ 2021-09-08 2:09 UTC (permalink / raw)
To: Brian Norris
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Chen-Yu Tsai, Douglas Anderson, linux-kernel, linux-rockchip,
linux-arm-kernel
On Tue, Sep 07, 2021 at 09:46:37AM -0700, Brian Norris wrote:
> Per Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt.
>
> This IP block can be used for sampling the PC of any given CPU, which is
> useful in certain panic scenarios where you can't get the CPU to stop
> cleanly (e.g., hard lockup).
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
Looks good to me, FWIW:
Reviewed-by: Leo Yan <leo.yan@linaro.org>
> ---
>
> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 48 ++++++++++++++++++++++++
> 1 file changed, 48 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> index 3871c7fd83b0..c8c62637b600 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -433,6 +433,54 @@ usbdrd_dwc3_1: usb@fe900000 {
> };
> };
>
> + debug@fe430000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe430000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_L>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_l0>;
> + };
> +
> + debug@fe432000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe432000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_L>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_l1>;
> + };
> +
> + debug@fe434000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe434000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_L>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_l2>;
> + };
> +
> + debug@fe436000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe436000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_L>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_l3>;
> + };
> +
> + debug@fe610000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe610000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_B>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_b0>;
> + };
> +
> + debug@fe710000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe710000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_B>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_b1>;
> + };
> +
> cdn_dp: dp@fec00000 {
> compatible = "rockchip,rk3399-cdn-dp";
> reg = <0x0 0xfec00000 0x0 0x100000>;
> --
> 2.33.0.153.gba50c8fa24-goog
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
@ 2021-09-08 2:09 ` Leo Yan
0 siblings, 0 replies; 24+ messages in thread
From: Leo Yan @ 2021-09-08 2:09 UTC (permalink / raw)
To: Brian Norris
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Chen-Yu Tsai, Douglas Anderson, linux-kernel, linux-rockchip,
linux-arm-kernel
On Tue, Sep 07, 2021 at 09:46:37AM -0700, Brian Norris wrote:
> Per Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt.
>
> This IP block can be used for sampling the PC of any given CPU, which is
> useful in certain panic scenarios where you can't get the CPU to stop
> cleanly (e.g., hard lockup).
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
Looks good to me, FWIW:
Reviewed-by: Leo Yan <leo.yan@linaro.org>
> ---
>
> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 48 ++++++++++++++++++++++++
> 1 file changed, 48 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> index 3871c7fd83b0..c8c62637b600 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -433,6 +433,54 @@ usbdrd_dwc3_1: usb@fe900000 {
> };
> };
>
> + debug@fe430000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe430000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_L>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_l0>;
> + };
> +
> + debug@fe432000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe432000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_L>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_l1>;
> + };
> +
> + debug@fe434000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe434000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_L>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_l2>;
> + };
> +
> + debug@fe436000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe436000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_L>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_l3>;
> + };
> +
> + debug@fe610000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe610000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_B>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_b0>;
> + };
> +
> + debug@fe710000 {
> + compatible = "arm,coresight-cpu-debug", "arm,primecell";
> + reg = <0 0xfe710000 0 0x1000>;
> + clocks = <&cru PCLK_COREDBG_B>;
> + clock-names = "apb_pclk";
> + cpu = <&cpu_b1>;
> + };
> +
> cdn_dp: dp@fec00000 {
> compatible = "rockchip,rk3399-cdn-dp";
> reg = <0x0 0xfec00000 0x0 0x100000>;
> --
> 2.33.0.153.gba50c8fa24-goog
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
2021-09-07 16:46 ` Brian Norris
(?)
@ 2021-09-08 5:12 ` Chen-Yu Tsai
-1 siblings, 0 replies; 24+ messages in thread
From: Chen-Yu Tsai @ 2021-09-08 5:12 UTC (permalink / raw)
To: Brian Norris
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Douglas Anderson, LKML, linux-rockchip,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
On Wed, Sep 8, 2021 at 12:46 AM Brian Norris <briannorris@chromium.org> wrote:
>
> Per Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt.
>
> This IP block can be used for sampling the PC of any given CPU, which is
> useful in certain panic scenarios where you can't get the CPU to stop
> cleanly (e.g., hard lockup).
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
The datasheet isn't clear on whether the debug subsystem has a separate
power domain or not, so that may bug us later. Otherwise,
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
@ 2021-09-08 5:12 ` Chen-Yu Tsai
0 siblings, 0 replies; 24+ messages in thread
From: Chen-Yu Tsai @ 2021-09-08 5:12 UTC (permalink / raw)
To: Brian Norris
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Douglas Anderson, LKML, linux-rockchip,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
On Wed, Sep 8, 2021 at 12:46 AM Brian Norris <briannorris@chromium.org> wrote:
>
> Per Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt.
>
> This IP block can be used for sampling the PC of any given CPU, which is
> useful in certain panic scenarios where you can't get the CPU to stop
> cleanly (e.g., hard lockup).
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
The datasheet isn't clear on whether the debug subsystem has a separate
power domain or not, so that may bug us later. Otherwise,
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
@ 2021-09-08 5:12 ` Chen-Yu Tsai
0 siblings, 0 replies; 24+ messages in thread
From: Chen-Yu Tsai @ 2021-09-08 5:12 UTC (permalink / raw)
To: Brian Norris
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Douglas Anderson, LKML, linux-rockchip,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
On Wed, Sep 8, 2021 at 12:46 AM Brian Norris <briannorris@chromium.org> wrote:
>
> Per Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt.
>
> This IP block can be used for sampling the PC of any given CPU, which is
> useful in certain panic scenarios where you can't get the CPU to stop
> cleanly (e.g., hard lockup).
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
The datasheet isn't clear on whether the debug subsystem has a separate
power domain or not, so that may bug us later. Otherwise,
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
2021-09-07 16:46 ` Brian Norris
(?)
@ 2021-09-08 15:09 ` Doug Anderson
-1 siblings, 0 replies; 24+ messages in thread
From: Doug Anderson @ 2021-09-08 15:09 UTC (permalink / raw)
To: Brian Norris
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Chen-Yu Tsai, LKML, open list:ARM/Rockchip SoC...,
Linux ARM
Hi,
On Tue, Sep 7, 2021 at 9:46 AM Brian Norris <briannorris@chromium.org> wrote:
>
> Per Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt.
>
> This IP block can be used for sampling the PC of any given CPU, which is
> useful in certain panic scenarios where you can't get the CPU to stop
> cleanly (e.g., hard lockup).
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
> ---
>
> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 48 ++++++++++++++++++++++++
> 1 file changed, 48 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> index 3871c7fd83b0..c8c62637b600 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -433,6 +433,54 @@ usbdrd_dwc3_1: usb@fe900000 {
> };
> };
>
> + debug@fe430000 {
I think your sort order is wrong? 0xfe430000 comes before 0xfe900000?
Other than that this looks good to me.
Reviewed-by: Douglas Anderson <dianders@chromium.org>
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
@ 2021-09-08 15:09 ` Doug Anderson
0 siblings, 0 replies; 24+ messages in thread
From: Doug Anderson @ 2021-09-08 15:09 UTC (permalink / raw)
To: Brian Norris
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Chen-Yu Tsai, LKML, open list:ARM/Rockchip SoC...,
Linux ARM
Hi,
On Tue, Sep 7, 2021 at 9:46 AM Brian Norris <briannorris@chromium.org> wrote:
>
> Per Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt.
>
> This IP block can be used for sampling the PC of any given CPU, which is
> useful in certain panic scenarios where you can't get the CPU to stop
> cleanly (e.g., hard lockup).
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
> ---
>
> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 48 ++++++++++++++++++++++++
> 1 file changed, 48 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> index 3871c7fd83b0..c8c62637b600 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -433,6 +433,54 @@ usbdrd_dwc3_1: usb@fe900000 {
> };
> };
>
> + debug@fe430000 {
I think your sort order is wrong? 0xfe430000 comes before 0xfe900000?
Other than that this looks good to me.
Reviewed-by: Douglas Anderson <dianders@chromium.org>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
@ 2021-09-08 15:09 ` Doug Anderson
0 siblings, 0 replies; 24+ messages in thread
From: Doug Anderson @ 2021-09-08 15:09 UTC (permalink / raw)
To: Brian Norris
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Chen-Yu Tsai, LKML, open list:ARM/Rockchip SoC...,
Linux ARM
Hi,
On Tue, Sep 7, 2021 at 9:46 AM Brian Norris <briannorris@chromium.org> wrote:
>
> Per Documentation/devicetree/bindings/arm/coresight-cpu-debug.txt.
>
> This IP block can be used for sampling the PC of any given CPU, which is
> useful in certain panic scenarios where you can't get the CPU to stop
> cleanly (e.g., hard lockup).
>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
> ---
>
> arch/arm64/boot/dts/rockchip/rk3399.dtsi | 48 ++++++++++++++++++++++++
> 1 file changed, 48 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> index 3871c7fd83b0..c8c62637b600 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> @@ -433,6 +433,54 @@ usbdrd_dwc3_1: usb@fe900000 {
> };
> };
>
> + debug@fe430000 {
I think your sort order is wrong? 0xfe430000 comes before 0xfe900000?
Other than that this looks good to me.
Reviewed-by: Douglas Anderson <dianders@chromium.org>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
2021-09-08 15:09 ` Doug Anderson
(?)
@ 2021-09-08 18:09 ` Brian Norris
-1 siblings, 0 replies; 24+ messages in thread
From: Brian Norris @ 2021-09-08 18:09 UTC (permalink / raw)
To: Doug Anderson
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Chen-Yu Tsai, LKML, open list:ARM/Rockchip SoC...,
Linux ARM
On Wed, Sep 8, 2021 at 8:10 AM Doug Anderson <dianders@chromium.org> wrote:
> On Tue, Sep 7, 2021 at 9:46 AM Brian Norris <briannorris@chromium.org> wrote:
> > --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> > +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> > @@ -433,6 +433,54 @@ usbdrd_dwc3_1: usb@fe900000 {
> > };
> > };
> >
> > + debug@fe430000 {
>
> I think your sort order is wrong? 0xfe430000 comes before 0xfe900000?
Yep... In attempt to explain my own brain: perhaps I assumed the
USB-related nodes must be uninterrupted, which caused my sorting eyes
to skip over.
v2 is coming.
Thanks,
Brian
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
@ 2021-09-08 18:09 ` Brian Norris
0 siblings, 0 replies; 24+ messages in thread
From: Brian Norris @ 2021-09-08 18:09 UTC (permalink / raw)
To: Doug Anderson
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Chen-Yu Tsai, LKML, open list:ARM/Rockchip SoC...,
Linux ARM
On Wed, Sep 8, 2021 at 8:10 AM Doug Anderson <dianders@chromium.org> wrote:
> On Tue, Sep 7, 2021 at 9:46 AM Brian Norris <briannorris@chromium.org> wrote:
> > --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> > +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> > @@ -433,6 +433,54 @@ usbdrd_dwc3_1: usb@fe900000 {
> > };
> > };
> >
> > + debug@fe430000 {
>
> I think your sort order is wrong? 0xfe430000 comes before 0xfe900000?
Yep... In attempt to explain my own brain: perhaps I assumed the
USB-related nodes must be uninterrupted, which caused my sorting eyes
to skip over.
v2 is coming.
Thanks,
Brian
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RESEND PATCH 2/2] arm64: dts: rockchip: add Coresight debug range for RK3399
@ 2021-09-08 18:09 ` Brian Norris
0 siblings, 0 replies; 24+ messages in thread
From: Brian Norris @ 2021-09-08 18:09 UTC (permalink / raw)
To: Doug Anderson
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Chen-Yu Tsai, LKML, open list:ARM/Rockchip SoC...,
Linux ARM
On Wed, Sep 8, 2021 at 8:10 AM Doug Anderson <dianders@chromium.org> wrote:
> On Tue, Sep 7, 2021 at 9:46 AM Brian Norris <briannorris@chromium.org> wrote:
> > --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> > +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
> > @@ -433,6 +433,54 @@ usbdrd_dwc3_1: usb@fe900000 {
> > };
> > };
> >
> > + debug@fe430000 {
>
> I think your sort order is wrong? 0xfe430000 comes before 0xfe900000?
Yep... In attempt to explain my own brain: perhaps I assumed the
USB-related nodes must be uninterrupted, which caused my sorting eyes
to skip over.
v2 is coming.
Thanks,
Brian
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 24+ messages in thread
* Re: [RESEND PATCH 1/2] clk: rockchip: rk3399: expose PCLK_COREDBG_{B,L}
2021-09-07 16:46 ` Brian Norris
(?)
@ 2021-09-08 5:00 ` Chen-Yu Tsai
-1 siblings, 0 replies; 24+ messages in thread
From: Chen-Yu Tsai @ 2021-09-08 5:00 UTC (permalink / raw)
To: Brian Norris
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Douglas Anderson, LKML, linux-rockchip,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
On Wed, Sep 8, 2021 at 12:46 AM Brian Norris <briannorris@chromium.org> wrote:
>
> We have DT IDs for PCLK_COREDBG_L and PCLK_COREDBG_B, but we don't
> actually expose them.
>
> In exposing these clocks (and attaching them to the coresight debug
> driver), the AMBA bus may start to disable them. Because no CPU driver
> owns these clocks (e.g., cpufreq-dt doesn't enable() them -- and even if
> it did, it's not early enough -- nor does arch/arm64/kernel/smp.c), the
> common clock framework then feels the need to disable the parents
> (including the CPU PLLs) -- which is no fun for anyone.
>
> Thus, mark the CPU clocks as critical as well.
I think this part should be done regardless, and could be a separate patch
added before exposing the COREDBG clks.
Either way,
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
> ---
> Resending, because I missed the mailing lists on the first version.
>
> drivers/clk/rockchip/clk-rk3399.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
> index 62a4f2543960..53ed5cca335b 100644
> --- a/drivers/clk/rockchip/clk-rk3399.c
> +++ b/drivers/clk/rockchip/clk-rk3399.c
> @@ -481,7 +481,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
> COMPOSITE_NOMUX(0, "atclk_core_l", "armclkl", CLK_IGNORE_UNUSED,
> RK3399_CLKSEL_CON(1), 0, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
> RK3399_CLKGATE_CON(0), 5, GFLAGS),
> - COMPOSITE_NOMUX(0, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
> + COMPOSITE_NOMUX(PCLK_COREDBG_L, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
> RK3399_CLKSEL_CON(1), 8, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
> RK3399_CLKGATE_CON(0), 6, GFLAGS),
>
> @@ -531,7 +531,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
> GATE(ACLK_GIC_ADB400_CORE_B_2_GIC, "aclk_core_adb400_core_b_2_gic", "armclkb", CLK_IGNORE_UNUSED,
> RK3399_CLKGATE_CON(14), 4, GFLAGS),
>
> - DIV(0, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> + DIV(PCLK_COREDBG_B, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> RK3399_CLKSEL_CON(3), 13, 2, DFLAGS | CLK_DIVIDER_READ_ONLY),
>
> GATE(0, "pclk_dbg_cxcs_pd_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> @@ -1514,7 +1514,10 @@ static const char *const rk3399_cru_critical_clocks[] __initconst = {
> "aclk_vio_noc",
>
> /* ddrc */
> - "sclk_ddrc"
> + "sclk_ddrc",
> +
> + "armclkl",
> + "armclkb",
> };
>
> static const char *const rk3399_pmucru_critical_clocks[] __initconst = {
> @@ -1549,9 +1552,6 @@ static void __init rk3399_clk_init(struct device_node *np)
> rockchip_clk_register_branches(ctx, rk3399_clk_branches,
> ARRAY_SIZE(rk3399_clk_branches));
>
> - rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
> - ARRAY_SIZE(rk3399_cru_critical_clocks));
> -
> rockchip_clk_register_armclk(ctx, ARMCLKL, "armclkl",
> mux_armclkl_p, ARRAY_SIZE(mux_armclkl_p),
> &rk3399_cpuclkl_data, rk3399_cpuclkl_rates,
> @@ -1562,6 +1562,9 @@ static void __init rk3399_clk_init(struct device_node *np)
> &rk3399_cpuclkb_data, rk3399_cpuclkb_rates,
> ARRAY_SIZE(rk3399_cpuclkb_rates));
>
> + rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
> + ARRAY_SIZE(rk3399_cru_critical_clocks));
> +
Looking at the bigger picture, maybe it's time to convert CLK_IGNORE_UNUSED
and rockchip_clk_protect_critical() to CLK_IS_CRITICAL?
ChenYu
> rockchip_register_softrst(np, 21, reg_base + RK3399_SOFTRST_CON(0),
> ROCKCHIP_SOFTRST_HIWORD_MASK);
>
> --
> 2.33.0.153.gba50c8fa24-goog
>
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RESEND PATCH 1/2] clk: rockchip: rk3399: expose PCLK_COREDBG_{B, L}
@ 2021-09-08 5:00 ` Chen-Yu Tsai
0 siblings, 0 replies; 24+ messages in thread
From: Chen-Yu Tsai @ 2021-09-08 5:00 UTC (permalink / raw)
To: Brian Norris
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Douglas Anderson, LKML, linux-rockchip,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
On Wed, Sep 8, 2021 at 12:46 AM Brian Norris <briannorris@chromium.org> wrote:
>
> We have DT IDs for PCLK_COREDBG_L and PCLK_COREDBG_B, but we don't
> actually expose them.
>
> In exposing these clocks (and attaching them to the coresight debug
> driver), the AMBA bus may start to disable them. Because no CPU driver
> owns these clocks (e.g., cpufreq-dt doesn't enable() them -- and even if
> it did, it's not early enough -- nor does arch/arm64/kernel/smp.c), the
> common clock framework then feels the need to disable the parents
> (including the CPU PLLs) -- which is no fun for anyone.
>
> Thus, mark the CPU clocks as critical as well.
I think this part should be done regardless, and could be a separate patch
added before exposing the COREDBG clks.
Either way,
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
> ---
> Resending, because I missed the mailing lists on the first version.
>
> drivers/clk/rockchip/clk-rk3399.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
> index 62a4f2543960..53ed5cca335b 100644
> --- a/drivers/clk/rockchip/clk-rk3399.c
> +++ b/drivers/clk/rockchip/clk-rk3399.c
> @@ -481,7 +481,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
> COMPOSITE_NOMUX(0, "atclk_core_l", "armclkl", CLK_IGNORE_UNUSED,
> RK3399_CLKSEL_CON(1), 0, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
> RK3399_CLKGATE_CON(0), 5, GFLAGS),
> - COMPOSITE_NOMUX(0, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
> + COMPOSITE_NOMUX(PCLK_COREDBG_L, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
> RK3399_CLKSEL_CON(1), 8, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
> RK3399_CLKGATE_CON(0), 6, GFLAGS),
>
> @@ -531,7 +531,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
> GATE(ACLK_GIC_ADB400_CORE_B_2_GIC, "aclk_core_adb400_core_b_2_gic", "armclkb", CLK_IGNORE_UNUSED,
> RK3399_CLKGATE_CON(14), 4, GFLAGS),
>
> - DIV(0, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> + DIV(PCLK_COREDBG_B, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> RK3399_CLKSEL_CON(3), 13, 2, DFLAGS | CLK_DIVIDER_READ_ONLY),
>
> GATE(0, "pclk_dbg_cxcs_pd_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> @@ -1514,7 +1514,10 @@ static const char *const rk3399_cru_critical_clocks[] __initconst = {
> "aclk_vio_noc",
>
> /* ddrc */
> - "sclk_ddrc"
> + "sclk_ddrc",
> +
> + "armclkl",
> + "armclkb",
> };
>
> static const char *const rk3399_pmucru_critical_clocks[] __initconst = {
> @@ -1549,9 +1552,6 @@ static void __init rk3399_clk_init(struct device_node *np)
> rockchip_clk_register_branches(ctx, rk3399_clk_branches,
> ARRAY_SIZE(rk3399_clk_branches));
>
> - rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
> - ARRAY_SIZE(rk3399_cru_critical_clocks));
> -
> rockchip_clk_register_armclk(ctx, ARMCLKL, "armclkl",
> mux_armclkl_p, ARRAY_SIZE(mux_armclkl_p),
> &rk3399_cpuclkl_data, rk3399_cpuclkl_rates,
> @@ -1562,6 +1562,9 @@ static void __init rk3399_clk_init(struct device_node *np)
> &rk3399_cpuclkb_data, rk3399_cpuclkb_rates,
> ARRAY_SIZE(rk3399_cpuclkb_rates));
>
> + rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
> + ARRAY_SIZE(rk3399_cru_critical_clocks));
> +
Looking at the bigger picture, maybe it's time to convert CLK_IGNORE_UNUSED
and rockchip_clk_protect_critical() to CLK_IS_CRITICAL?
ChenYu
> rockchip_register_softrst(np, 21, reg_base + RK3399_SOFTRST_CON(0),
> ROCKCHIP_SOFTRST_HIWORD_MASK);
>
> --
> 2.33.0.153.gba50c8fa24-goog
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RESEND PATCH 1/2] clk: rockchip: rk3399: expose PCLK_COREDBG_{B, L}
@ 2021-09-08 5:00 ` Chen-Yu Tsai
0 siblings, 0 replies; 24+ messages in thread
From: Chen-Yu Tsai @ 2021-09-08 5:00 UTC (permalink / raw)
To: Brian Norris
Cc: Heiko Stuebner, Michael Turquette, Stephen Boyd, linux-clk,
Douglas Anderson, LKML, linux-rockchip,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
On Wed, Sep 8, 2021 at 12:46 AM Brian Norris <briannorris@chromium.org> wrote:
>
> We have DT IDs for PCLK_COREDBG_L and PCLK_COREDBG_B, but we don't
> actually expose them.
>
> In exposing these clocks (and attaching them to the coresight debug
> driver), the AMBA bus may start to disable them. Because no CPU driver
> owns these clocks (e.g., cpufreq-dt doesn't enable() them -- and even if
> it did, it's not early enough -- nor does arch/arm64/kernel/smp.c), the
> common clock framework then feels the need to disable the parents
> (including the CPU PLLs) -- which is no fun for anyone.
>
> Thus, mark the CPU clocks as critical as well.
I think this part should be done regardless, and could be a separate patch
added before exposing the COREDBG clks.
Either way,
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
> Signed-off-by: Brian Norris <briannorris@chromium.org>
> ---
> Resending, because I missed the mailing lists on the first version.
>
> drivers/clk/rockchip/clk-rk3399.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
> index 62a4f2543960..53ed5cca335b 100644
> --- a/drivers/clk/rockchip/clk-rk3399.c
> +++ b/drivers/clk/rockchip/clk-rk3399.c
> @@ -481,7 +481,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
> COMPOSITE_NOMUX(0, "atclk_core_l", "armclkl", CLK_IGNORE_UNUSED,
> RK3399_CLKSEL_CON(1), 0, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
> RK3399_CLKGATE_CON(0), 5, GFLAGS),
> - COMPOSITE_NOMUX(0, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
> + COMPOSITE_NOMUX(PCLK_COREDBG_L, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
> RK3399_CLKSEL_CON(1), 8, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
> RK3399_CLKGATE_CON(0), 6, GFLAGS),
>
> @@ -531,7 +531,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
> GATE(ACLK_GIC_ADB400_CORE_B_2_GIC, "aclk_core_adb400_core_b_2_gic", "armclkb", CLK_IGNORE_UNUSED,
> RK3399_CLKGATE_CON(14), 4, GFLAGS),
>
> - DIV(0, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> + DIV(PCLK_COREDBG_B, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> RK3399_CLKSEL_CON(3), 13, 2, DFLAGS | CLK_DIVIDER_READ_ONLY),
>
> GATE(0, "pclk_dbg_cxcs_pd_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> @@ -1514,7 +1514,10 @@ static const char *const rk3399_cru_critical_clocks[] __initconst = {
> "aclk_vio_noc",
>
> /* ddrc */
> - "sclk_ddrc"
> + "sclk_ddrc",
> +
> + "armclkl",
> + "armclkb",
> };
>
> static const char *const rk3399_pmucru_critical_clocks[] __initconst = {
> @@ -1549,9 +1552,6 @@ static void __init rk3399_clk_init(struct device_node *np)
> rockchip_clk_register_branches(ctx, rk3399_clk_branches,
> ARRAY_SIZE(rk3399_clk_branches));
>
> - rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
> - ARRAY_SIZE(rk3399_cru_critical_clocks));
> -
> rockchip_clk_register_armclk(ctx, ARMCLKL, "armclkl",
> mux_armclkl_p, ARRAY_SIZE(mux_armclkl_p),
> &rk3399_cpuclkl_data, rk3399_cpuclkl_rates,
> @@ -1562,6 +1562,9 @@ static void __init rk3399_clk_init(struct device_node *np)
> &rk3399_cpuclkb_data, rk3399_cpuclkb_rates,
> ARRAY_SIZE(rk3399_cpuclkb_rates));
>
> + rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
> + ARRAY_SIZE(rk3399_cru_critical_clocks));
> +
Looking at the bigger picture, maybe it's time to convert CLK_IGNORE_UNUSED
and rockchip_clk_protect_critical() to CLK_IS_CRITICAL?
ChenYu
> rockchip_register_softrst(np, 21, reg_base + RK3399_SOFTRST_CON(0),
> ROCKCHIP_SOFTRST_HIWORD_MASK);
>
> --
> 2.33.0.153.gba50c8fa24-goog
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RESEND PATCH 1/2] clk: rockchip: rk3399: expose PCLK_COREDBG_{B,L}
2021-09-08 5:00 ` Chen-Yu Tsai
(?)
@ 2021-09-08 7:32 ` Heiko Stübner
-1 siblings, 0 replies; 24+ messages in thread
From: Heiko Stübner @ 2021-09-08 7:32 UTC (permalink / raw)
To: Brian Norris, Chen-Yu Tsai
Cc: Michael Turquette, Stephen Boyd, linux-clk, Douglas Anderson,
LKML, linux-rockchip,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
Am Mittwoch, 8. September 2021, 07:00:52 CEST schrieb Chen-Yu Tsai:
> On Wed, Sep 8, 2021 at 12:46 AM Brian Norris <briannorris@chromium.org> wrote:
> >
> > We have DT IDs for PCLK_COREDBG_L and PCLK_COREDBG_B, but we don't
> > actually expose them.
> >
> > In exposing these clocks (and attaching them to the coresight debug
> > driver), the AMBA bus may start to disable them. Because no CPU driver
> > owns these clocks (e.g., cpufreq-dt doesn't enable() them -- and even if
> > it did, it's not early enough -- nor does arch/arm64/kernel/smp.c), the
> > common clock framework then feels the need to disable the parents
> > (including the CPU PLLs) -- which is no fun for anyone.
> >
> > Thus, mark the CPU clocks as critical as well.
>
> I think this part should be done regardless, and could be a separate patch
> added before exposing the COREDBG clks.
yep ... especially as this is sort of hidden right now, with it not
being part of the patch subject but only appearing as the last
line of the patch message ;-)
So I'd also vote for a separate patch.
Heiko
>
> Either way,
>
> Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
>
> > Signed-off-by: Brian Norris <briannorris@chromium.org>
> > ---
> > Resending, because I missed the mailing lists on the first version.
> >
> > drivers/clk/rockchip/clk-rk3399.c | 15 +++++++++------
> > 1 file changed, 9 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
> > index 62a4f2543960..53ed5cca335b 100644
> > --- a/drivers/clk/rockchip/clk-rk3399.c
> > +++ b/drivers/clk/rockchip/clk-rk3399.c
> > @@ -481,7 +481,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
> > COMPOSITE_NOMUX(0, "atclk_core_l", "armclkl", CLK_IGNORE_UNUSED,
> > RK3399_CLKSEL_CON(1), 0, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
> > RK3399_CLKGATE_CON(0), 5, GFLAGS),
> > - COMPOSITE_NOMUX(0, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
> > + COMPOSITE_NOMUX(PCLK_COREDBG_L, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
> > RK3399_CLKSEL_CON(1), 8, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
> > RK3399_CLKGATE_CON(0), 6, GFLAGS),
> >
> > @@ -531,7 +531,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
> > GATE(ACLK_GIC_ADB400_CORE_B_2_GIC, "aclk_core_adb400_core_b_2_gic", "armclkb", CLK_IGNORE_UNUSED,
> > RK3399_CLKGATE_CON(14), 4, GFLAGS),
> >
> > - DIV(0, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> > + DIV(PCLK_COREDBG_B, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> > RK3399_CLKSEL_CON(3), 13, 2, DFLAGS | CLK_DIVIDER_READ_ONLY),
> >
> > GATE(0, "pclk_dbg_cxcs_pd_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> > @@ -1514,7 +1514,10 @@ static const char *const rk3399_cru_critical_clocks[] __initconst = {
> > "aclk_vio_noc",
> >
> > /* ddrc */
> > - "sclk_ddrc"
> > + "sclk_ddrc",
> > +
> > + "armclkl",
> > + "armclkb",
> > };
> >
> > static const char *const rk3399_pmucru_critical_clocks[] __initconst = {
> > @@ -1549,9 +1552,6 @@ static void __init rk3399_clk_init(struct device_node *np)
> > rockchip_clk_register_branches(ctx, rk3399_clk_branches,
> > ARRAY_SIZE(rk3399_clk_branches));
> >
> > - rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
> > - ARRAY_SIZE(rk3399_cru_critical_clocks));
> > -
> > rockchip_clk_register_armclk(ctx, ARMCLKL, "armclkl",
> > mux_armclkl_p, ARRAY_SIZE(mux_armclkl_p),
> > &rk3399_cpuclkl_data, rk3399_cpuclkl_rates,
> > @@ -1562,6 +1562,9 @@ static void __init rk3399_clk_init(struct device_node *np)
> > &rk3399_cpuclkb_data, rk3399_cpuclkb_rates,
> > ARRAY_SIZE(rk3399_cpuclkb_rates));
> >
> > + rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
> > + ARRAY_SIZE(rk3399_cru_critical_clocks));
> > +
>
> Looking at the bigger picture, maybe it's time to convert CLK_IGNORE_UNUSED
> and rockchip_clk_protect_critical() to CLK_IS_CRITICAL?
>
> ChenYu
>
> > rockchip_register_softrst(np, 21, reg_base + RK3399_SOFTRST_CON(0),
> > ROCKCHIP_SOFTRST_HIWORD_MASK);
> >
> > --
> > 2.33.0.153.gba50c8fa24-goog
> >
>
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RESEND PATCH 1/2] clk: rockchip: rk3399: expose PCLK_COREDBG_{B, L}
@ 2021-09-08 7:32 ` Heiko Stübner
0 siblings, 0 replies; 24+ messages in thread
From: Heiko Stübner @ 2021-09-08 7:32 UTC (permalink / raw)
To: Brian Norris, Chen-Yu Tsai
Cc: Michael Turquette, Stephen Boyd, linux-clk, Douglas Anderson,
LKML, linux-rockchip,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
Am Mittwoch, 8. September 2021, 07:00:52 CEST schrieb Chen-Yu Tsai:
> On Wed, Sep 8, 2021 at 12:46 AM Brian Norris <briannorris@chromium.org> wrote:
> >
> > We have DT IDs for PCLK_COREDBG_L and PCLK_COREDBG_B, but we don't
> > actually expose them.
> >
> > In exposing these clocks (and attaching them to the coresight debug
> > driver), the AMBA bus may start to disable them. Because no CPU driver
> > owns these clocks (e.g., cpufreq-dt doesn't enable() them -- and even if
> > it did, it's not early enough -- nor does arch/arm64/kernel/smp.c), the
> > common clock framework then feels the need to disable the parents
> > (including the CPU PLLs) -- which is no fun for anyone.
> >
> > Thus, mark the CPU clocks as critical as well.
>
> I think this part should be done regardless, and could be a separate patch
> added before exposing the COREDBG clks.
yep ... especially as this is sort of hidden right now, with it not
being part of the patch subject but only appearing as the last
line of the patch message ;-)
So I'd also vote for a separate patch.
Heiko
>
> Either way,
>
> Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
>
> > Signed-off-by: Brian Norris <briannorris@chromium.org>
> > ---
> > Resending, because I missed the mailing lists on the first version.
> >
> > drivers/clk/rockchip/clk-rk3399.c | 15 +++++++++------
> > 1 file changed, 9 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
> > index 62a4f2543960..53ed5cca335b 100644
> > --- a/drivers/clk/rockchip/clk-rk3399.c
> > +++ b/drivers/clk/rockchip/clk-rk3399.c
> > @@ -481,7 +481,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
> > COMPOSITE_NOMUX(0, "atclk_core_l", "armclkl", CLK_IGNORE_UNUSED,
> > RK3399_CLKSEL_CON(1), 0, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
> > RK3399_CLKGATE_CON(0), 5, GFLAGS),
> > - COMPOSITE_NOMUX(0, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
> > + COMPOSITE_NOMUX(PCLK_COREDBG_L, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
> > RK3399_CLKSEL_CON(1), 8, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
> > RK3399_CLKGATE_CON(0), 6, GFLAGS),
> >
> > @@ -531,7 +531,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
> > GATE(ACLK_GIC_ADB400_CORE_B_2_GIC, "aclk_core_adb400_core_b_2_gic", "armclkb", CLK_IGNORE_UNUSED,
> > RK3399_CLKGATE_CON(14), 4, GFLAGS),
> >
> > - DIV(0, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> > + DIV(PCLK_COREDBG_B, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> > RK3399_CLKSEL_CON(3), 13, 2, DFLAGS | CLK_DIVIDER_READ_ONLY),
> >
> > GATE(0, "pclk_dbg_cxcs_pd_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> > @@ -1514,7 +1514,10 @@ static const char *const rk3399_cru_critical_clocks[] __initconst = {
> > "aclk_vio_noc",
> >
> > /* ddrc */
> > - "sclk_ddrc"
> > + "sclk_ddrc",
> > +
> > + "armclkl",
> > + "armclkb",
> > };
> >
> > static const char *const rk3399_pmucru_critical_clocks[] __initconst = {
> > @@ -1549,9 +1552,6 @@ static void __init rk3399_clk_init(struct device_node *np)
> > rockchip_clk_register_branches(ctx, rk3399_clk_branches,
> > ARRAY_SIZE(rk3399_clk_branches));
> >
> > - rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
> > - ARRAY_SIZE(rk3399_cru_critical_clocks));
> > -
> > rockchip_clk_register_armclk(ctx, ARMCLKL, "armclkl",
> > mux_armclkl_p, ARRAY_SIZE(mux_armclkl_p),
> > &rk3399_cpuclkl_data, rk3399_cpuclkl_rates,
> > @@ -1562,6 +1562,9 @@ static void __init rk3399_clk_init(struct device_node *np)
> > &rk3399_cpuclkb_data, rk3399_cpuclkb_rates,
> > ARRAY_SIZE(rk3399_cpuclkb_rates));
> >
> > + rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
> > + ARRAY_SIZE(rk3399_cru_critical_clocks));
> > +
>
> Looking at the bigger picture, maybe it's time to convert CLK_IGNORE_UNUSED
> and rockchip_clk_protect_critical() to CLK_IS_CRITICAL?
>
> ChenYu
>
> > rockchip_register_softrst(np, 21, reg_base + RK3399_SOFTRST_CON(0),
> > ROCKCHIP_SOFTRST_HIWORD_MASK);
> >
> > --
> > 2.33.0.153.gba50c8fa24-goog
> >
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 24+ messages in thread* Re: [RESEND PATCH 1/2] clk: rockchip: rk3399: expose PCLK_COREDBG_{B, L}
@ 2021-09-08 7:32 ` Heiko Stübner
0 siblings, 0 replies; 24+ messages in thread
From: Heiko Stübner @ 2021-09-08 7:32 UTC (permalink / raw)
To: Brian Norris, Chen-Yu Tsai
Cc: Michael Turquette, Stephen Boyd, linux-clk, Douglas Anderson,
LKML, linux-rockchip,
moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
Am Mittwoch, 8. September 2021, 07:00:52 CEST schrieb Chen-Yu Tsai:
> On Wed, Sep 8, 2021 at 12:46 AM Brian Norris <briannorris@chromium.org> wrote:
> >
> > We have DT IDs for PCLK_COREDBG_L and PCLK_COREDBG_B, but we don't
> > actually expose them.
> >
> > In exposing these clocks (and attaching them to the coresight debug
> > driver), the AMBA bus may start to disable them. Because no CPU driver
> > owns these clocks (e.g., cpufreq-dt doesn't enable() them -- and even if
> > it did, it's not early enough -- nor does arch/arm64/kernel/smp.c), the
> > common clock framework then feels the need to disable the parents
> > (including the CPU PLLs) -- which is no fun for anyone.
> >
> > Thus, mark the CPU clocks as critical as well.
>
> I think this part should be done regardless, and could be a separate patch
> added before exposing the COREDBG clks.
yep ... especially as this is sort of hidden right now, with it not
being part of the patch subject but only appearing as the last
line of the patch message ;-)
So I'd also vote for a separate patch.
Heiko
>
> Either way,
>
> Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
>
> > Signed-off-by: Brian Norris <briannorris@chromium.org>
> > ---
> > Resending, because I missed the mailing lists on the first version.
> >
> > drivers/clk/rockchip/clk-rk3399.c | 15 +++++++++------
> > 1 file changed, 9 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/clk/rockchip/clk-rk3399.c b/drivers/clk/rockchip/clk-rk3399.c
> > index 62a4f2543960..53ed5cca335b 100644
> > --- a/drivers/clk/rockchip/clk-rk3399.c
> > +++ b/drivers/clk/rockchip/clk-rk3399.c
> > @@ -481,7 +481,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
> > COMPOSITE_NOMUX(0, "atclk_core_l", "armclkl", CLK_IGNORE_UNUSED,
> > RK3399_CLKSEL_CON(1), 0, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
> > RK3399_CLKGATE_CON(0), 5, GFLAGS),
> > - COMPOSITE_NOMUX(0, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
> > + COMPOSITE_NOMUX(PCLK_COREDBG_L, "pclk_dbg_core_l", "armclkl", CLK_IGNORE_UNUSED,
> > RK3399_CLKSEL_CON(1), 8, 5, DFLAGS | CLK_DIVIDER_READ_ONLY,
> > RK3399_CLKGATE_CON(0), 6, GFLAGS),
> >
> > @@ -531,7 +531,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = {
> > GATE(ACLK_GIC_ADB400_CORE_B_2_GIC, "aclk_core_adb400_core_b_2_gic", "armclkb", CLK_IGNORE_UNUSED,
> > RK3399_CLKGATE_CON(14), 4, GFLAGS),
> >
> > - DIV(0, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> > + DIV(PCLK_COREDBG_B, "pclken_dbg_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> > RK3399_CLKSEL_CON(3), 13, 2, DFLAGS | CLK_DIVIDER_READ_ONLY),
> >
> > GATE(0, "pclk_dbg_cxcs_pd_core_b", "pclk_dbg_core_b", CLK_IGNORE_UNUSED,
> > @@ -1514,7 +1514,10 @@ static const char *const rk3399_cru_critical_clocks[] __initconst = {
> > "aclk_vio_noc",
> >
> > /* ddrc */
> > - "sclk_ddrc"
> > + "sclk_ddrc",
> > +
> > + "armclkl",
> > + "armclkb",
> > };
> >
> > static const char *const rk3399_pmucru_critical_clocks[] __initconst = {
> > @@ -1549,9 +1552,6 @@ static void __init rk3399_clk_init(struct device_node *np)
> > rockchip_clk_register_branches(ctx, rk3399_clk_branches,
> > ARRAY_SIZE(rk3399_clk_branches));
> >
> > - rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
> > - ARRAY_SIZE(rk3399_cru_critical_clocks));
> > -
> > rockchip_clk_register_armclk(ctx, ARMCLKL, "armclkl",
> > mux_armclkl_p, ARRAY_SIZE(mux_armclkl_p),
> > &rk3399_cpuclkl_data, rk3399_cpuclkl_rates,
> > @@ -1562,6 +1562,9 @@ static void __init rk3399_clk_init(struct device_node *np)
> > &rk3399_cpuclkb_data, rk3399_cpuclkb_rates,
> > ARRAY_SIZE(rk3399_cpuclkb_rates));
> >
> > + rockchip_clk_protect_critical(rk3399_cru_critical_clocks,
> > + ARRAY_SIZE(rk3399_cru_critical_clocks));
> > +
>
> Looking at the bigger picture, maybe it's time to convert CLK_IGNORE_UNUSED
> and rockchip_clk_protect_critical() to CLK_IS_CRITICAL?
>
> ChenYu
>
> > rockchip_register_softrst(np, 21, reg_base + RK3399_SOFTRST_CON(0),
> > ROCKCHIP_SOFTRST_HIWORD_MASK);
> >
> > --
> > 2.33.0.153.gba50c8fa24-goog
> >
>
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 24+ messages in thread