| Message ID | 20240904024640.809425-1-changhuang.liang@starfivetech.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | [v1] reset: starfive: Fixed access the empty member on JH7110 SoC | expand |
> On 04.09.24 10:47, Changhuang Liang wrote: > data->asserted will be NULL on JH7110 SoC since commit 82327b127d41 > ("reset: starfive: Add StarFive JH7110 reset driver") be added. Add the > judgment conditions to avoid errors. > > Signed-off-by: Changhuang Liang <changhuang.liang@starfivetech.com> > --- > 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); } Looks good. Maybe the commit message can be improved. Acked-by: Hal Feng <hal.feng@starfivetech.com>
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); }
data->asserted will be NULL on JH7110 SoC since commit 82327b127d41 ("reset: starfive: Add StarFive JH7110 reset driver") be added. Add the judgment conditions to avoid errors. Signed-off-by: Changhuang Liang <changhuang.liang@starfivetech.com> --- drivers/reset/starfive/reset-starfive-jh71x0.c | 3 +++ 1 file changed, 3 insertions(+)