| Message ID | 20230904063344.4144086-1-quic_viswanat@quicinc.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64: dts: qcom: Fix hwlock index for SMEM for IPQ platforms | expand |
On 9/4/2023 12:03 PM, 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, IPQ6018, IPQ8074 and IPQ9574. Fixes tag please? > > Signed-off-by: Vignesh Viswanathan <quic_viswanat@quicinc.com> > --- > arch/arm64/boot/dts/qcom/ipq5332.dtsi | 2 +- > arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- > arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +- > arch/arm64/boot/dts/qcom/ipq9574.dtsi | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > 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 { > diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi > index 56537cf8243f..9577341592c3 100644 > --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi > +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi > @@ -211,7 +211,7 @@ q6_region: memory@4ab00000 { > smem { > compatible = "qcom,smem"; > memory-region = <&smem_region>; > - hwlocks = <&tcsr_mutex 0>; > + hwlocks = <&tcsr_mutex 3>; > }; > > soc: soc@0 { > diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi > index 00ed71936b47..92fd924bbdbe 100644 > --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi > +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi > @@ -101,7 +101,7 @@ smem@4ab00000 { > reg = <0x0 0x4ab00000 0x0 0x100000>; > no-map; > > - hwlocks = <&tcsr_mutex 0>; > + hwlocks = <&tcsr_mutex 3>; > }; > > memory@4ac00000 { > diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi > index f22f7e78850d..cc0e4a2b67d2 100644 > --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi > +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi > @@ -195,7 +195,7 @@ tz_region: tz@4a600000 { > smem@4aa00000 { > compatible = "qcom,smem"; > reg = <0x0 0x4aa00000 0x0 0x100000>; > - hwlocks = <&tcsr_mutex 0>; > + hwlocks = <&tcsr_mutex 3>; > no-map; > }; >
On 4.09.2023 08:33, 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, IPQ6018, IPQ8074 and IPQ9574. > > Signed-off-by: Vignesh Viswanathan <quic_viswanat@quicinc.com> > --- Please make it a separate patch for each one. Somebody trying to revert this in the future will have to potentially resolve 4 conflicts in this current form. Konrad
On 9/4/2023 9:27 PM, Konrad Dybcio wrote: > On 4.09.2023 08:33, 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, IPQ6018, IPQ8074 and IPQ9574. >> >> Signed-off-by: Vignesh Viswanathan <quic_viswanat@quicinc.com> >> --- > Please make it a separate patch for each one. Somebody trying to revert > this in the future will have to potentially resolve 4 conflicts in this > current form. > Ack, will split with Fixes tag in V2. Thanks, Vignesh > 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 { diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi index 56537cf8243f..9577341592c3 100644 --- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi @@ -211,7 +211,7 @@ q6_region: memory@4ab00000 { smem { compatible = "qcom,smem"; memory-region = <&smem_region>; - hwlocks = <&tcsr_mutex 0>; + hwlocks = <&tcsr_mutex 3>; }; soc: soc@0 { diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi index 00ed71936b47..92fd924bbdbe 100644 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi @@ -101,7 +101,7 @@ smem@4ab00000 { reg = <0x0 0x4ab00000 0x0 0x100000>; no-map; - hwlocks = <&tcsr_mutex 0>; + hwlocks = <&tcsr_mutex 3>; }; memory@4ac00000 { diff --git a/arch/arm64/boot/dts/qcom/ipq9574.dtsi b/arch/arm64/boot/dts/qcom/ipq9574.dtsi index f22f7e78850d..cc0e4a2b67d2 100644 --- a/arch/arm64/boot/dts/qcom/ipq9574.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq9574.dtsi @@ -195,7 +195,7 @@ tz_region: tz@4a600000 { smem@4aa00000 { compatible = "qcom,smem"; reg = <0x0 0x4aa00000 0x0 0x100000>; - hwlocks = <&tcsr_mutex 0>; + hwlocks = <&tcsr_mutex 3>; no-map; };
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, IPQ6018, IPQ8074 and IPQ9574. Signed-off-by: Vignesh Viswanathan <quic_viswanat@quicinc.com> --- arch/arm64/boot/dts/qcom/ipq5332.dtsi | 2 +- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +- arch/arm64/boot/dts/qcom/ipq9574.dtsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)