Make sure we return error in case devm_ioremap_resource() fails for dirmap
resource.
Fixes: ca7d8b980b67 ("memory: add Renesas RPC-IF driver")
Signed-off-by: Lad Prabhakar <[email protected]>
Reviewed-by: Biju Das <[email protected]>
Reviewed-by: Wolfram Sang <[email protected]>
---
v1->v2:
* New patch (split from patch 5 of v1)
* Included RB tags
---
drivers/memory/renesas-rpc-if.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/memory/renesas-rpc-if.c b/drivers/memory/renesas-rpc-if.c
index 7435baad0007..ff8bcbccac63 100644
--- a/drivers/memory/renesas-rpc-if.c
+++ b/drivers/memory/renesas-rpc-if.c
@@ -243,7 +243,7 @@ int rpcif_sw_init(struct rpcif *rpc, struct device *dev)
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dirmap");
rpc->dirmap = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(rpc->dirmap))
- rpc->dirmap = NULL;
+ return PTR_ERR(rpc->dirmap);
rpc->size = resource_size(res);
rpc->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
--
2.17.1
Hi Prabhakar,
CC seebe
On Mon, Oct 25, 2021 at 10:57 PM Lad Prabhakar
<[email protected]> wrote:
> Make sure we return error in case devm_ioremap_resource() fails for dirmap
> resource.
>
> Fixes: ca7d8b980b67 ("memory: add Renesas RPC-IF driver")
> Signed-off-by: Lad Prabhakar <[email protected]>
> Reviewed-by: Biju Das <[email protected]>
> Reviewed-by: Wolfram Sang <[email protected]>
Thanks for your patch!
> --- a/drivers/memory/renesas-rpc-if.c
> +++ b/drivers/memory/renesas-rpc-if.c
> @@ -243,7 +243,7 @@ int rpcif_sw_init(struct rpcif *rpc, struct device *dev)
> res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dirmap");
> rpc->dirmap = devm_ioremap_resource(&pdev->dev, res);
> if (IS_ERR(rpc->dirmap))
> - rpc->dirmap = NULL;
> + return PTR_ERR(rpc->dirmap);
IIRC, it was intentional to make the dirmap optional (because the
device can be used without and/or because some variants on other SoCs
lack it?). Unfortunately this is not reflected in the DT bindings
(yet?). All code using the dirmap does check if rpc->dirmap is
valid first.
> rpc->size = resource_size(res);
>
> rpc->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Wed, Oct 27, 2021 at 9:17 AM Geert Uytterhoeven <[email protected]> wrote:
> On Mon, Oct 25, 2021 at 10:57 PM Lad Prabhakar
> <[email protected]> wrote:
> > Make sure we return error in case devm_ioremap_resource() fails for dirmap
> > resource.
> >
> > Fixes: ca7d8b980b67 ("memory: add Renesas RPC-IF driver")
> > Signed-off-by: Lad Prabhakar <[email protected]>
> > Reviewed-by: Biju Das <[email protected]>
> > Reviewed-by: Wolfram Sang <[email protected]>
>
> Thanks for your patch!
>
> > --- a/drivers/memory/renesas-rpc-if.c
> > +++ b/drivers/memory/renesas-rpc-if.c
> > @@ -243,7 +243,7 @@ int rpcif_sw_init(struct rpcif *rpc, struct device *dev)
> > res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dirmap");
> > rpc->dirmap = devm_ioremap_resource(&pdev->dev, res);
> > if (IS_ERR(rpc->dirmap))
> > - rpc->dirmap = NULL;
> > + return PTR_ERR(rpc->dirmap);
>
> IIRC, it was intentional to make the dirmap optional (because the
> device can be used without and/or because some variants on other SoCs
> lack it?). Unfortunately this is not reflected in the DT bindings
> (yet?). All code using the dirmap does check if rpc->dirmap is
> valid first.
>
> > rpc->size = resource_size(res);
Of course this will crash if the dirmap is not present, so for now it's better
to just bail out.
Reviewed-by: Geert Uytterhoeven <[email protected]>
> >
> > rpc->rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Mon, 25 Oct 2021 21:56:29 +0100, Lad Prabhakar wrote:
> Make sure we return error in case devm_ioremap_resource() fails for dirmap
> resource.
>
>
Applied, thanks!
[5/7] memory: renesas-rpc-if: Return error in case devm_ioremap_resource() fails
commit: 818fdfa89baac77a8df5a2c30f4fb798cc937aa0
Best regards,
--
Krzysztof Kozlowski <[email protected]>