| Message ID | 20231212142509.655094-1-amadeus@jmu.edu.cn |
|---|---|
| State | New |
| Headers | show |
| Series | [1/1] hwspinlock: qcom: fix tcsr data for ipq6018 | expand |
On 12/12/2023 7:55 PM, Chukun Pan wrote: > The tcsr_mutex hwlock register of the ipq6018 SoC is 0x20000[1], which > should not use the max_register configuration of older SoCs. This will > cause smem to be unable to probe, further causing devices that use > smem-part to parse partitions to fail to boot. > > [ 2.118227] qcom-smem: probe of 4aa00000.memory failed with error -110 > [ 22.273120] platform 79b0000.nand-controller: deferred probe pending > > Remove 'qcom,ipq6018-tcsr-mutex' setting from of_match to fix this. Hi Chukun, This patch was already posted [2] and Bjorn applied the same [3]. Hi Bjorn, This patch is missing in linux-next. Could you please help check ? Thanks, Vignesh [2] https://lore.kernel.org/all/20230905095535.1263113-3-quic_viswanat@quicinc.com/ [3] https://lore.kernel.org/all/169522934567.2501390.1112201061322984444.b4-ty@kernel.org/ > > [1] commit 72fc3d58b87b ("arm64: dts: qcom: ipq6018: Fix tcsr_mutex register size") > Fixes: 5d4753f741d8 ("hwspinlock: qcom: add support for MMIO on older SoCs") > Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn> > --- > drivers/hwspinlock/qcom_hwspinlock.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/hwspinlock/qcom_hwspinlock.c b/drivers/hwspinlock/qcom_hwspinlock.c > index a0fd67fd2934..814dfe8697bf 100644 > --- a/drivers/hwspinlock/qcom_hwspinlock.c > +++ b/drivers/hwspinlock/qcom_hwspinlock.c > @@ -115,7 +115,6 @@ static const struct of_device_id qcom_hwspinlock_of_match[] = { > { .compatible = "qcom,sfpb-mutex", .data = &of_sfpb_mutex }, > { .compatible = "qcom,tcsr-mutex", .data = &of_tcsr_mutex }, > { .compatible = "qcom,apq8084-tcsr-mutex", .data = &of_msm8226_tcsr_mutex }, > - { .compatible = "qcom,ipq6018-tcsr-mutex", .data = &of_msm8226_tcsr_mutex }, > { .compatible = "qcom,msm8226-tcsr-mutex", .data = &of_msm8226_tcsr_mutex }, > { .compatible = "qcom,msm8974-tcsr-mutex", .data = &of_msm8226_tcsr_mutex }, > { .compatible = "qcom,msm8994-tcsr-mutex", .data = &of_msm8226_tcsr_mutex },
diff --git a/drivers/hwspinlock/qcom_hwspinlock.c b/drivers/hwspinlock/qcom_hwspinlock.c index a0fd67fd2934..814dfe8697bf 100644 --- a/drivers/hwspinlock/qcom_hwspinlock.c +++ b/drivers/hwspinlock/qcom_hwspinlock.c @@ -115,7 +115,6 @@ static const struct of_device_id qcom_hwspinlock_of_match[] = { { .compatible = "qcom,sfpb-mutex", .data = &of_sfpb_mutex }, { .compatible = "qcom,tcsr-mutex", .data = &of_tcsr_mutex }, { .compatible = "qcom,apq8084-tcsr-mutex", .data = &of_msm8226_tcsr_mutex }, - { .compatible = "qcom,ipq6018-tcsr-mutex", .data = &of_msm8226_tcsr_mutex }, { .compatible = "qcom,msm8226-tcsr-mutex", .data = &of_msm8226_tcsr_mutex }, { .compatible = "qcom,msm8974-tcsr-mutex", .data = &of_msm8226_tcsr_mutex }, { .compatible = "qcom,msm8994-tcsr-mutex", .data = &of_msm8226_tcsr_mutex },
The tcsr_mutex hwlock register of the ipq6018 SoC is 0x20000[1], which should not use the max_register configuration of older SoCs. This will cause smem to be unable to probe, further causing devices that use smem-part to parse partitions to fail to boot. [ 2.118227] qcom-smem: probe of 4aa00000.memory failed with error -110 [ 22.273120] platform 79b0000.nand-controller: deferred probe pending Remove 'qcom,ipq6018-tcsr-mutex' setting from of_match to fix this. [1] commit 72fc3d58b87b ("arm64: dts: qcom: ipq6018: Fix tcsr_mutex register size") Fixes: 5d4753f741d8 ("hwspinlock: qcom: add support for MMIO on older SoCs") Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn> --- drivers/hwspinlock/qcom_hwspinlock.c | 1 - 1 file changed, 1 deletion(-)