This is a note to let you know that I've just added the patch titled
arm64: dts: qcom: ipq5332: Fix hwlock index for SMEM
to the 6.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm64-dts-qcom-ipq5332-fix-hwlock-index-for-smem.patch
and it can be found in the queue-6.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From d08afd80158399a081b478a19902364e3dd0f84c Mon Sep 17 00:00:00 2001
From: Vignesh Viswanathan <quic_viswanat@xxxxxxxxxxx>
Date: Mon, 4 Sep 2023 22:55:12 +0530
Subject: arm64: dts: qcom: ipq5332: Fix hwlock index for SMEM
From: Vignesh Viswanathan <quic_viswanat@xxxxxxxxxxx>
commit d08afd80158399a081b478a19902364e3dd0f84c upstream.
SMEM uses lock index 3 of the TCSR Mutex hwlock for allocations
in SMEM region shared by the Host and FW.
Fix the SMEM hwlock index to 3 for IPQ5332.
Cc: stable@xxxxxxxxxxxxxxx
Fixes: d56dd7f935e1 ("arm64: dts: qcom: ipq5332: add SMEM support")
Signed-off-by: Vignesh Viswanathan <quic_viswanat@xxxxxxxxxxx>
Acked-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230904172516.479866-2-quic_viswanat@xxxxxxxxxxx
Signed-off-by: Bjorn Andersson <andersson@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm64/boot/dts/qcom/ipq5332.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/ipq5332.dtsi b/arch/arm64/boot/dts/qcom/ipq5332.dtsi
index 991b23027805..d3fef2f80a81 100644
--- a/arch/arm64/boot/dts/qcom/ipq5332.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq5332.dtsi
@@ -135,7 +135,7 @@ smem@4a800000 {
reg = <0x0 0x4a800000 0x0 0x100000>;
no-map;
- hwlocks = <&tcsr_mutex 0>;
+ hwlocks = <&tcsr_mutex 3>;
};
};
--
2.43.0
Patches currently in stable-queue which might be from quic_viswanat@xxxxxxxxxxx are
queue-6.5/arm64-dts-qcom-ipq6018-fix-hwlock-index-for-smem.patch
queue-6.5/arm64-dts-qcom-ipq9574-fix-hwlock-index-for-smem.patch
queue-6.5/arm64-dts-qcom-ipq5332-fix-hwlock-index-for-smem.patch
queue-6.5/arm64-dts-qcom-ipq6018-fix-tcsr_mutex-register-size.patch
queue-6.5/arm64-dts-qcom-ipq8074-fix-hwlock-index-for-smem.patch
