2019-08-14 03:10:35

by Bjorn Andersson

Subject: [PATCH] arm64: dts: qcom: qcs404-evb: Mark WCSS clocks protected

'7d0c76bdf227 ("clk: qcom: Add WCSS gcc clock control for QCS404")'
introduces two new clocks to gcc. These are not used before
clk_disable_unused() and as such the clock framework tries to disable
them.

But on the EVB these registers are only accessible through TrustZone, so
these clocks must be marked as "protected" to prevent the clock code
from touching them.

Numerical values are used as the constants are not yet available in a
common tree.

Reported-by: Mark Brown <[email protected]>
Reported-by: Niklas Cassel <[email protected]>
Signed-off-by: Bjorn Andersson <[email protected]>
---
arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
index 2289b01ee9f0..501a7330dbc8 100644
--- a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
@@ -61,7 +61,9 @@
protected-clocks = <GCC_BIMC_CDSP_CLK>,
<GCC_CDSP_CFG_AHB_CLK>,
<GCC_CDSP_BIMC_CLK_SRC>,
- <GCC_CDSP_TBU_CLK>;
+ <GCC_CDSP_TBU_CLK>,
+ <141>, /* GCC_WCSS_Q6_AHB_CLK */
+ <142>; /* GCC_WCSS_Q6_AXIM_CLK */
};

&pms405_spmi_regulators {
--
2.18.0

2019-08-15 14:52:26

by Niklas Cassel

Subject: Re: [PATCH] arm64: dts: qcom: qcs404-evb: Mark WCSS clocks protected

On Tue, Aug 13, 2019 at 08:09:42PM -0700, Bjorn Andersson wrote:
> '7d0c76bdf227 ("clk: qcom: Add WCSS gcc clock control for QCS404")'
> introduces two new clocks to gcc. These are not used before
> clk_disable_unused() and as such the clock framework tries to disable
> them.
>
> But on the EVB these registers are only accessible through TrustZone, so
> these clocks must be marked as "protected" to prevent the clock code
> from touching them.
>
> Numerical values are used as the constants are not yet available in a
> common tree.
>
> Reported-by: Mark Brown <[email protected]>
> Reported-by: Niklas Cassel <[email protected]>
> Signed-off-by: Bjorn Andersson <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
> index 2289b01ee9f0..501a7330dbc8 100644
> --- a/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
> +++ b/arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
> @@ -61,7 +61,9 @@
> protected-clocks = <GCC_BIMC_CDSP_CLK>,
> <GCC_CDSP_CFG_AHB_CLK>,
> <GCC_CDSP_BIMC_CLK_SRC>,
> - <GCC_CDSP_TBU_CLK>;
> + <GCC_CDSP_TBU_CLK>,
> + <141>, /* GCC_WCSS_Q6_AHB_CLK */
> + <142>; /* GCC_WCSS_Q6_AXIM_CLK */
> };
>
> &pms405_spmi_regulators {
> --
> 2.18.0
>

Reviewed-by: Niklas Cassel <[email protected]>