* [PATCH AUTOSEL 5.10 45/88] arm64: dts: qcom: msm8996: Make CPUCC actually probe (and work)
[not found] <20210714194303.54028-1-sashal@kernel.org>
@ 2021-07-14 19:42 ` Sasha Levin
2021-07-14 19:42 ` [PATCH AUTOSEL 5.10 46/88] arm64: dts: qcom: sc7180: Move rmtfs memory region Sasha Levin
1 sibling, 0 replies; 2+ messages in thread
From: Sasha Levin @ 2021-07-14 19:42 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Konrad Dybcio, Bjorn Andersson, Sasha Levin, linux-arm-msm, devicetree
From: Konrad Dybcio <konrad.dybcio@somainline.org>
[ Upstream commit 0a275a35ceab07cb622ff212c54d6866e246ac53 ]
Fix the compatible to make the driver probe and tell the
driver where to look for the "xo" clock to make sure everything
works.
Then we get a happy (eh, happier) 8996:
somainline-sdcard:/home/konrad# cat /sys/kernel/debug/clk/pwrcl_pll/clk_rate
1152000000
Don't backport without "arm64: dts: qcom: msm8996: Add CPU opps", as
the system fails to boot without consumers for these clocks.
Signed-off-by: Konrad Dybcio <konrad.dybcio@somainline.org>
Link: https://lore.kernel.org/r/20210527192958.775434-1-konrad.dybcio@somainline.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm64/boot/dts/qcom/msm8996.dtsi | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index fd6ae5464dea..b774d5457328 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -1741,9 +1741,14 @@ apss_merge_funnel_out: endpoint {
};
};
};
+
kryocc: clock-controller@6400000 {
- compatible = "qcom,apcc-msm8996";
+ compatible = "qcom,msm8996-apcc";
reg = <0x06400000 0x90000>;
+
+ clock-names = "xo";
+ clocks = <&xo_board>;
+
#clock-cells = <1>;
};
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH AUTOSEL 5.10 46/88] arm64: dts: qcom: sc7180: Move rmtfs memory region
[not found] <20210714194303.54028-1-sashal@kernel.org>
2021-07-14 19:42 ` [PATCH AUTOSEL 5.10 45/88] arm64: dts: qcom: msm8996: Make CPUCC actually probe (and work) Sasha Levin
@ 2021-07-14 19:42 ` Sasha Levin
1 sibling, 0 replies; 2+ messages in thread
From: Sasha Levin @ 2021-07-14 19:42 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Sujit Kautkar, Sibi Sankar, Bjorn Andersson, Sasha Levin,
linux-arm-msm, devicetree
From: Sujit Kautkar <sujitka@chromium.org>
[ Upstream commit d4282fb4f8f9683711ae6c076da16aa8e675fdbd ]
Move rmtfs memory region so that it does not overlap with system
RAM (kernel data) when KAsan is enabled. This puts rmtfs right
after mba_mem which is not supposed to increase beyond 0x94600000
Reviewed-by: Sibi Sankar <sibis@codeaurora.org>
Signed-off-by: Sujit Kautkar <sujitka@chromium.org>
Link: https://lore.kernel.org/r/20210514113430.1.Ic2d032cd80424af229bb95e2c67dd4de1a70cb0c@changeid
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm64/boot/dts/qcom/sc7180-idp.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
index e77a7926034a..afe0f9c25816 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
@@ -45,7 +45,7 @@ chosen {
/* Increase the size from 2MB to 8MB */
&rmtfs_mem {
- reg = <0x0 0x84400000 0x0 0x800000>;
+ reg = <0x0 0x94600000 0x0 0x800000>;
};
/ {
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread