[PATCH] of: base: ignore disabled memory nodes

[PATCH] of: base: ignore disabled memory nodes

[Rouven Czerwinski]

Qemu with the secure extension enabled will insert a secram node into
the device tree:

  secram@e000000 {
          secure-status = "okay";
          status = "disabled";
          reg = <0x0 0xe000000 0x0 0x1000000>;
          device_type = "memory";
  };

Barebox would previously parse this node, add it as a memory bank and
than reinsert an enabled node into the fixed up device tree.
Fix this by skipping disabled memory nodes.

Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
 drivers/of/base.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 0a2632f963..32cb1e78a5 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -2090,6 +2090,9 @@ int of_add_memory(struct device_node *node, bool dump)
 		if (!resource_size(&res))
 			continue;
 
+		if (!of_device_is_available(node))
+			continue;
+
 		of_add_memory_bank(node, dump, mem_bank_num,
 				res.start, resource_size(&res));
 		mem_bank_num++;
-- 
2.28.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH] of: base: ignore disabled memory nodes

[Sascha Hauer]

On Mon, Nov 09, 2020 at 06:51:50AM +0100, Rouven Czerwinski wrote:
> Qemu with the secure extension enabled will insert a secram node into
> the device tree:
> 
>   secram@e000000 {
>           secure-status = "okay";
>           status = "disabled";
>           reg = <0x0 0xe000000 0x0 0x1000000>;
>           device_type = "memory";
>   };
> 
> Barebox would previously parse this node, add it as a memory bank and
> than reinsert an enabled node into the fixed up device tree.
> Fix this by skipping disabled memory nodes.
> 
> Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
> ---
>  drivers/of/base.c | 3 +++
>  1 file changed, 3 insertions(+)

Applied, thanks

Sascha

> 
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index 0a2632f963..32cb1e78a5 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -2090,6 +2090,9 @@ int of_add_memory(struct device_node *node, bool dump)
>  		if (!resource_size(&res))
>  			continue;
>  
> +		if (!of_device_is_available(node))
> +			continue;
> +
>  		of_add_memory_bank(node, dump, mem_bank_num,
>  				res.start, resource_size(&res));
>  		mem_bank_num++;
> -- 
> 2.28.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox