[PATCH 6.6.y] reset: starfive: jh71x0: Fix accessing the empty member on JH7110 SoC - Linux-stable-mirror

28 Mar 2025

From: Changhuang Liang changhuang.liang@starfivetech.com
[ Upstream commit 2cf59663660799ce16f4dfbed97cdceac7a7fa11 ]
data->asserted will be NULL on JH7110 SoC since commit 82327b127d41
("reset: starfive: Add StarFive JH7110 reset driver") was added. Add
the judgment condition to avoid errors when calling reset_control_status
on JH7110 SoC.
Fixes: 82327b127d41 ("reset: starfive: Add StarFive JH7110 reset driver")
Signed-off-by: Changhuang Liang changhuang.liang@starfivetech.com
Acked-by: Hal Feng hal.feng@starfivetech.com
Reviewed-by: Philipp Zabel p.zabel@pengutronix.de
Link: https://lore.kernel.org/r/20240925112442.1732416-1-changhuang.liang@starfive...
Signed-off-by: Philipp Zabel p.zabel@pengutronix.de
Signed-off-by: Jianqi Ren jianqi.ren.cn@windriver.com
Signed-off-by: He Zhe zhe.he@windriver.com
---
Verified the build test
---
 drivers/reset/starfive/reset-starfive-jh71x0.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/reset/starfive/reset-starfive-jh71x0.c b/drivers/reset/starfive/reset-starfive-jh71x0.c
index 55bbbd2de52c..29ce3486752f 100644
--- a/drivers/reset/starfive/reset-starfive-jh71x0.c
+++ b/drivers/reset/starfive/reset-starfive-jh71x0.c
@@ -94,6 +94,9 @@ static int jh71x0_reset_status(struct reset_controller_dev *rcdev,
    void __iomem *reg_status = data->status + offset * sizeof(u32);
    u32 value = readl(reg_status);
+	if (!data->asserted)
+		return !(value & mask);
+
    return !((value ^ data->asserted[offset]) & mask);
 }
-- 
2.25.1



    