2022-12-08 17:38:54

by Dario Binacchi

Subject: [PATCH v2 1/1] ARM: imx: add missing of_node_put()

Calling of_find_compatible_node() returns a node pointer with refcount
incremented. Use of_node_put() on it when done.
The patch fixes the same problem on different i.MX platforms.

Fixes: 8b88f7ef31dde ("ARM: mx25: Retrieve IIM base from dt")
Fixes: 94b2bec1b0e05 ("ARM: imx27: Retrieve the SYSCTRL base address from devicetree")
Fixes: 3172225d45bd9 ("ARM: imx31: Retrieve the IIM base address from devicetree")
Fixes: f68ea682d1da7 ("ARM: imx35: Retrieve the IIM base address from devicetree")
Fixes: ee18a7154ee08 ("ARM: imx5: retrieve iim base from device tree")
Signed-off-by: Dario Binacchi <[email protected]>

---

Changes in v2:
- Combine the 5 patches (one for each platform) into one patch as
suggested by Arnd Bergmann.

arch/arm/mach-imx/cpu-imx25.c | 1 +
arch/arm/mach-imx/cpu-imx27.c | 1 +
arch/arm/mach-imx/cpu-imx31.c | 1 +
arch/arm/mach-imx/cpu-imx35.c | 1 +
arch/arm/mach-imx/cpu-imx5.c | 1 +
5 files changed, 5 insertions(+)

diff --git a/arch/arm/mach-imx/cpu-imx25.c b/arch/arm/mach-imx/cpu-imx25.c
index 3e63445cde06..cc86977d0a34 100644
--- a/arch/arm/mach-imx/cpu-imx25.c
+++ b/arch/arm/mach-imx/cpu-imx25.c
@@ -23,6 +23,7 @@ static int mx25_read_cpu_rev(void)

np = of_find_compatible_node(NULL, NULL, "fsl,imx25-iim");
iim_base = of_iomap(np, 0);
+ of_node_put(np);
BUG_ON(!iim_base);
rev = readl(iim_base + MXC_IIMSREV);
iounmap(iim_base);
diff --git a/arch/arm/mach-imx/cpu-imx27.c b/arch/arm/mach-imx/cpu-imx27.c
index bf70e13bbe9e..1d2893908368 100644
--- a/arch/arm/mach-imx/cpu-imx27.c
+++ b/arch/arm/mach-imx/cpu-imx27.c
@@ -28,6 +28,7 @@ static int mx27_read_cpu_rev(void)

np = of_find_compatible_node(NULL, NULL, "fsl,imx27-ccm");
ccm_base = of_iomap(np, 0);
+ of_node_put(np);
BUG_ON(!ccm_base);
/*
* now we have access to the IO registers. As we need
diff --git a/arch/arm/mach-imx/cpu-imx31.c b/arch/arm/mach-imx/cpu-imx31.c
index b9c24b851d1a..35c544924e50 100644
--- a/arch/arm/mach-imx/cpu-imx31.c
+++ b/arch/arm/mach-imx/cpu-imx31.c
@@ -39,6 +39,7 @@ static int mx31_read_cpu_rev(void)

np = of_find_compatible_node(NULL, NULL, "fsl,imx31-iim");
iim_base = of_iomap(np, 0);
+ of_node_put(np);
BUG_ON(!iim_base);

/* read SREV register from IIM module */
diff --git a/arch/arm/mach-imx/cpu-imx35.c b/arch/arm/mach-imx/cpu-imx35.c
index 80e7d8ab9f1b..1fe75b39c2d9 100644
--- a/arch/arm/mach-imx/cpu-imx35.c
+++ b/arch/arm/mach-imx/cpu-imx35.c
@@ -21,6 +21,7 @@ static int mx35_read_cpu_rev(void)

np = of_find_compatible_node(NULL, NULL, "fsl,imx35-iim");
iim_base = of_iomap(np, 0);
+ of_node_put(np);
BUG_ON(!iim_base);

rev = imx_readl(iim_base + MXC_IIMSREV);
diff --git a/arch/arm/mach-imx/cpu-imx5.c b/arch/arm/mach-imx/cpu-imx5.c
index ad56263778f9..a67c89bf155d 100644
--- a/arch/arm/mach-imx/cpu-imx5.c
+++ b/arch/arm/mach-imx/cpu-imx5.c
@@ -28,6 +28,7 @@ static u32 imx5_read_srev_reg(const char *compat)

np = of_find_compatible_node(NULL, NULL, compat);
iim_base = of_iomap(np, 0);
+ of_node_put(np);
WARN_ON(!iim_base);

srev = readl(iim_base + IIM_SREV) & 0xff;
--
2.32.0

2022-12-08 18:05:10

by Fabio Estevam

Subject: Re: [PATCH v2 1/1] ARM: imx: add missing of_node_put()

On Thu, Dec 8, 2022 at 1:54 PM Dario Binacchi
<[email protected]> wrote:
>
> Calling of_find_compatible_node() returns a node pointer with refcount
> incremented. Use of_node_put() on it when done.
> The patch fixes the same problem on different i.MX platforms.
>
> Fixes: 8b88f7ef31dde ("ARM: mx25: Retrieve IIM base from dt")
> Fixes: 94b2bec1b0e05 ("ARM: imx27: Retrieve the SYSCTRL base address from devicetree")
> Fixes: 3172225d45bd9 ("ARM: imx31: Retrieve the IIM base address from devicetree")
> Fixes: f68ea682d1da7 ("ARM: imx35: Retrieve the IIM base address from devicetree")
> Fixes: ee18a7154ee08 ("ARM: imx5: retrieve iim base from device tree")
> Signed-off-by: Dario Binacchi <[email protected]>

Reviewed-by: Fabio Estevam <[email protected]>

2022-12-09 17:50:22

by Martin Kaiser

Subject: Re: [PATCH v2 1/1] ARM: imx: add missing of_node_put()

Thus wrote Dario Binacchi ([email protected]):

> Calling of_find_compatible_node() returns a node pointer with refcount
> incremented. Use of_node_put() on it when done.
> The patch fixes the same problem on different i.MX platforms.

> Fixes: 8b88f7ef31dde ("ARM: mx25: Retrieve IIM base from dt")
> Fixes: 94b2bec1b0e05 ("ARM: imx27: Retrieve the SYSCTRL base address from devicetree")
> Fixes: 3172225d45bd9 ("ARM: imx31: Retrieve the IIM base address from devicetree")
> Fixes: f68ea682d1da7 ("ARM: imx35: Retrieve the IIM base address from devicetree")
> Fixes: ee18a7154ee08 ("ARM: imx5: retrieve iim base from device tree")
> Signed-off-by: Dario Binacchi <[email protected]>

Reviewed-by: Martin Kaiser <[email protected]>

Thanks,

Martin

2022-12-31 13:42:27

by Shawn Guo

Subject: Re: [PATCH v2 1/1] ARM: imx: add missing of_node_put()

On Thu, Dec 08, 2022 at 05:54:03PM +0100, Dario Binacchi wrote:
> Calling of_find_compatible_node() returns a node pointer with refcount
> incremented. Use of_node_put() on it when done.
> The patch fixes the same problem on different i.MX platforms.
>
> Fixes: 8b88f7ef31dde ("ARM: mx25: Retrieve IIM base from dt")
> Fixes: 94b2bec1b0e05 ("ARM: imx27: Retrieve the SYSCTRL base address from devicetree")
> Fixes: 3172225d45bd9 ("ARM: imx31: Retrieve the IIM base address from devicetree")
> Fixes: f68ea682d1da7 ("ARM: imx35: Retrieve the IIM base address from devicetree")
> Fixes: ee18a7154ee08 ("ARM: imx5: retrieve iim base from device tree")
> Signed-off-by: Dario Binacchi <[email protected]>

Applied, thanks!