From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 17/17] of_firmware: Fix handling of firmware-name property
Date: Wed, 23 Jun 2021 07:16:32 +0200 [thread overview]
Message-ID: <20210623051632.30253-18-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20210623051632.30253-1-s.hauer@pengutronix.de>
The fpga-region binding states that the firmware-name property must be
in the same node as the fpga-region compatible, so checking for this
compatible when walking up the parents is wrong. Instead, only test for
it in the target node. Also, when the current node is not a fpga-region
we must return successfully.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/of/of_firmware.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/of/of_firmware.c b/drivers/of/of_firmware.c
index 2d8245a02e..687e675302 100644
--- a/drivers/of/of_firmware.c
+++ b/drivers/of/of_firmware.c
@@ -11,11 +11,9 @@ static struct firmware_mgr *of_node_get_mgr(struct device_node *np)
struct device_node *mgr_node;
do {
- if (of_device_is_compatible(np, "fpga-region")) {
- mgr_node = of_parse_phandle(np, "fpga-mgr", 0);
- if (mgr_node)
- return firmwaremgr_find_by_node(mgr_node);
- }
+ mgr_node = of_parse_phandle(np, "fpga-mgr", 0);
+ if (mgr_node)
+ return firmwaremgr_find_by_node(mgr_node);
} while ((np = of_get_parent(np)) != NULL);
return NULL;
@@ -48,6 +46,9 @@ static int load_firmware(struct device_node *target,
if (!target)
return -EINVAL;
+ if (!of_device_is_compatible(target, "fpga-region"))
+ return 0;
+
mgr = of_node_get_mgr(target);
if (!mgr)
return -EINVAL;
--
2.29.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2021-06-23 5:18 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-23 5:16 [PATCH v2 00/17] Apply device tree overlays to kernel tree Sascha Hauer
2021-06-23 5:16 ` [PATCH 01/17] fdt: Check blob size during unflattening Sascha Hauer
2021-06-23 5:16 ` [PATCH 02/17] firmware: make device_node argument non const Sascha Hauer
2021-06-23 5:16 ` [PATCH 03/17] libbb: Add find_path function Sascha Hauer
2021-06-23 5:16 ` [PATCH 04/17] firmware: consolidate ifdefs Sascha Hauer
2021-06-23 5:16 ` [PATCH 05/17] firmware: Add search path Sascha Hauer
2021-06-23 5:16 ` [PATCH 06/17] firmware: Fix device_node matching Sascha Hauer
2021-06-23 5:16 ` [PATCH 07/17] firmware: recognize by reproducible name Sascha Hauer
2021-06-23 5:16 ` [PATCH 08/17] blspec: Set firmware searchpath Sascha Hauer
2021-06-23 5:16 ` [PATCH 09/17] overlay: only apply compatible trees Sascha Hauer
2021-06-23 5:16 ` [PATCH 10/17] overlay: Add of_overlay_apply_file() Sascha Hauer
2021-06-23 5:16 ` [PATCH 11/17] firmware: Load from global search path Sascha Hauer
2021-06-23 5:16 ` [PATCH 12/17] blspec: Rework firmware load Sascha Hauer
2021-06-23 5:16 ` [PATCH 13/17] of_overlay: apply overlays during booting Sascha Hauer
2021-06-23 5:16 ` [PATCH 14/17] blspec: Apply overlays from rootfs Sascha Hauer
2021-06-23 5:16 ` [PATCH 15/17] doc: devicetree: Refer to internal device tree also as live tree Sascha Hauer
2021-06-23 5:16 ` [PATCH 16/17] Documentation: Add documentation for device tree overlays Sascha Hauer
2021-06-23 6:13 ` Ahmad Fatoum
2021-06-23 19:37 ` Trent Piepho
2021-06-24 8:48 ` Sascha Hauer
2021-06-23 5:16 ` Sascha Hauer [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-03-10 13:28 [PATCH 00/17] Apply device tree overlays to kernel tree Sascha Hauer
2021-03-10 13:28 ` [PATCH 17/17] of_firmware: Fix handling of firmware-name property Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210623051632.30253-18-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox