| Message ID | 20230904172516.479866-2-quic_viswanat@quicinc.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | af1ab212fafe70b6cccaedec12b273227bcdec39 |
| Headers | show |
| Series | Fix SMEM hwlock index for IPQ platforms | expand |
On 4.09.2023 19:25, Vignesh Viswanathan wrote: > 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@vger.kernel.org > Fixes: d56dd7f935e1 ("arm64: dts: qcom: ipq5332: add SMEM support") > Signed-off-by: Vignesh Viswanathan <quic_viswanat@quicinc.com> > --- Your downstream says otherwise [1]. Perhaps you need to fix it there as well? Konrad [1] https://git.codelinaro.org/clo/qsdk/oss/kernel/linux-ipq-5.4/-/blob/NHSS.QSDK.12.4.r1/arch/arm64/boot/dts/qcom/ipq5332.dtsi
On 9/6/2023 3:22 PM, Konrad Dybcio wrote: > On 4.09.2023 19:25, Vignesh Viswanathan wrote: >> 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@vger.kernel.org >> Fixes: d56dd7f935e1 ("arm64: dts: qcom: ipq5332: add SMEM support") >> Signed-off-by: Vignesh Viswanathan <quic_viswanat@quicinc.com> >> --- > Your downstream says otherwise [1]. Perhaps you need to fix it there > as well? > Yes, the fix is already merged in the downstream branch but CLO is not updated date yet. Thanks, Vignesh > Konrad > > [1] https://git.codelinaro.org/clo/qsdk/oss/kernel/linux-ipq-5.4/-/blob/NHSS.QSDK.12.4.r1/arch/arm64/boot/dts/qcom/ipq5332.dtsi >
On 6.09.2023 13:23, Vignesh Viswanathan wrote: > > > On 9/6/2023 3:22 PM, Konrad Dybcio wrote: >> On 4.09.2023 19:25, Vignesh Viswanathan wrote: >>> 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@vger.kernel.org >>> Fixes: d56dd7f935e1 ("arm64: dts: qcom: ipq5332: add SMEM support") >>> Signed-off-by: Vignesh Viswanathan <quic_viswanat@quicinc.com> >>> --- >> Your downstream says otherwise [1]. Perhaps you need to fix it there >> as well? >> > > Yes, the fix is already merged in the downstream branch but CLO is not > updated date yet. Ok Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad
diff --git a/arch/arm64/boot/dts/qcom/ipq5332.dtsi b/arch/arm64/boot/dts/qcom/ipq5332.dtsi index 1abc992ede31..a47c79c3d5f0 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>; }; q6_region: wcnss@4a900000 {
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@vger.kernel.org Fixes: d56dd7f935e1 ("arm64: dts: qcom: ipq5332: add SMEM support") Signed-off-by: Vignesh Viswanathan <quic_viswanat@quicinc.com> --- arch/arm64/boot/dts/qcom/ipq5332.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)