diff mbox series

arm64: dts: qcom: sdm845-mtp: Mark protected gcc clocks

Message ID 20181106055013.11271-1-bjorn.andersson@linaro.org
State Accepted
Commit d206e6b7ea3fdc8ec8f6be9a2ecfe58142b49e37
Headers show
Series arm64: dts: qcom: sdm845-mtp: Mark protected gcc clocks | expand

Commit Message

Bjorn Andersson Nov. 6, 2018, 5:50 a.m. UTC
As of v4.20-rc1 probing the GCC driver on a SDM845 device with the
standard security implementation causes an access violation and an
immediate system restart. Use the protected-clocks property to mark the
offending clocks protected for the MTP, in order to allow it to boot.

Cc: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

---

This depends on the acceptance of
https://lore.kernel.org/lkml/20181105194011.43770-1-swboyd@chromium.org/

 arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 6 ++++++
 1 file changed, 6 insertions(+)

-- 
2.18.0

Comments

Andy Gross Nov. 9, 2018, 11:21 p.m. UTC | #1
On Mon, Nov 05, 2018 at 09:50:13PM -0800, Bjorn Andersson wrote:
> As of v4.20-rc1 probing the GCC driver on a SDM845 device with the

> standard security implementation causes an access violation and an

> immediate system restart. Use the protected-clocks property to mark the

> offending clocks protected for the MTP, in order to allow it to boot.

> 

> Cc: Stephen Boyd <sboyd@kernel.org>

> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>


This looks fine to me.

Acked-by: Andy Gross <andy.gross@linaro.org>
Stephen Boyd Nov. 21, 2018, 9:01 a.m. UTC | #2
Quoting Bjorn Andersson (2018-11-05 21:50:13)
> As of v4.20-rc1 probing the GCC driver on a SDM845 device with the

> standard security implementation causes an access violation and an

> immediate system restart. Use the protected-clocks property to mark the

> offending clocks protected for the MTP, in order to allow it to boot.

> 

> Cc: Stephen Boyd <sboyd@kernel.org>

> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> ---

> 

> This depends on the acceptance of

> https://lore.kernel.org/lkml/20181105194011.43770-1-swboyd@chromium.org/


Do you need me to merge this into clk-fixes so that Andy can send this
up for v4.20 final? I thought you may have other boot blocking issues so
this wouldn't be a critical fix.
Stephen Boyd Nov. 21, 2018, 9:07 a.m. UTC | #3
Quoting Bjorn Andersson (2018-11-05 21:50:13)
> As of v4.20-rc1 probing the GCC driver on a SDM845 device with the

> standard security implementation causes an access violation and an

> immediate system restart. Use the protected-clocks property to mark the

> offending clocks protected for the MTP, in order to allow it to boot.

> 

> Cc: Stephen Boyd <sboyd@kernel.org>

> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> ---

> 


Sorry, I meant to say do you want me to send in the protected clk
patches into clk-fixes so it can be merged for v4.20 final. I expected
Andy to pick up these dts patches.
Bjorn Andersson Nov. 22, 2018, 7:30 a.m. UTC | #4
On Wed 21 Nov 01:01 PST 2018, Stephen Boyd wrote:

> Quoting Bjorn Andersson (2018-11-05 21:50:13)

> > As of v4.20-rc1 probing the GCC driver on a SDM845 device with the

> > standard security implementation causes an access violation and an

> > immediate system restart. Use the protected-clocks property to mark the

> > offending clocks protected for the MTP, in order to allow it to boot.

> > 

> > Cc: Stephen Boyd <sboyd@kernel.org>

> > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

> > ---

> > 

> > This depends on the acceptance of

> > https://lore.kernel.org/lkml/20181105194011.43770-1-swboyd@chromium.org/

> 

> Do you need me to merge this into clk-fixes so that Andy can send this

> up for v4.20 final? I thought you may have other boot blocking issues so

> this wouldn't be a critical fix.

> 


We resolved the gpio-related issues, so iirc this is the only other item
preventing the MTP from booting. So yes please.

Unless you enable USB support, because configuring the first USB
controller in host currently crashes the device - I've not yet found the
cause for this though.

Regards,
Bjorn
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
index d667eee4e6d0..b3def0358177 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-mtp.dts
@@ -343,6 +343,12 @@ 
 	};
 };
 
+&gcc {
+	protected-clocks = <GCC_QSPI_CORE_CLK>,
+			   <GCC_QSPI_CORE_CLK_SRC>,
+			   <GCC_QSPI_CNOC_PERIPH_AHB_CLK>;
+};
+
 &i2c10 {
 	status = "okay";
 	clock-frequency = <400000>;