From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 06/17] firmware: Fix device_node matching
Date: Wed, 23 Jun 2021 07:16:21 +0200 [thread overview]
Message-ID: <20210623051632.30253-7-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20210623051632.30253-1-s.hauer@pengutronix.de>
firmwaremgr_find_by_node() matches against the device node of the parent
of the device associated to the handler. This is correct for the socfpga
and zyncmp driver, but not for the altera_serial driver. Add a
device_node argument to the handler which is set by the drivers to the
correct device node and match against that.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/firmware.c | 2 +-
drivers/firmware/altera_serial.c | 1 +
drivers/firmware/socfpga.c | 2 ++
drivers/firmware/zynqmp-fpga.c | 2 ++
include/firmware.h | 1 +
5 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/common/firmware.c b/common/firmware.c
index 477dc1f13a..bb76a16050 100644
--- a/common/firmware.c
+++ b/common/firmware.c
@@ -70,7 +70,7 @@ struct firmware_mgr *firmwaremgr_find_by_node(struct device_node *np)
struct firmware_mgr *mgr;
list_for_each_entry(mgr, &firmwaremgr_list, list)
- if (mgr->handler->dev->parent->device_node == np)
+ if (mgr->handler->device_node == np)
return mgr;
return NULL;
diff --git a/drivers/firmware/altera_serial.c b/drivers/firmware/altera_serial.c
index 3a0175dd07..49460c6a70 100644
--- a/drivers/firmware/altera_serial.c
+++ b/drivers/firmware/altera_serial.c
@@ -371,6 +371,7 @@ static int altera_spi_probe(struct device_d *dev)
if (model)
fh->model = xstrdup(model);
fh->dev = dev;
+ fh->device_node = dev->device_node;
this->spi = (struct spi_device *)dev->type_data;
this->data = data;
diff --git a/drivers/firmware/socfpga.c b/drivers/firmware/socfpga.c
index 04fdfdb3af..b17dacf683 100644
--- a/drivers/firmware/socfpga.c
+++ b/drivers/firmware/socfpga.c
@@ -435,6 +435,8 @@ static int socfpga_fpgamgr_probe(struct device_d *dev)
}
fh->dev = &mgr->dev;
+ fh->device_node = dev->device_node;
+
ret = firmwaremgr_register(fh);
if (ret != 0) {
free(mgr);
diff --git a/drivers/firmware/zynqmp-fpga.c b/drivers/firmware/zynqmp-fpga.c
index ab70d99933..0fc229bfd3 100644
--- a/drivers/firmware/zynqmp-fpga.c
+++ b/drivers/firmware/zynqmp-fpga.c
@@ -383,6 +383,8 @@ static int zynqmp_fpga_probe(struct device_d *dev)
}
fh->dev = &mgr->dev;
+ fh->device_node = dev->device_node;
+
ret = firmwaremgr_register(fh);
if (ret != 0) {
free(mgr);
diff --git a/include/firmware.h b/include/firmware.h
index 515bdcaf40..0ffea52840 100644
--- a/include/firmware.h
+++ b/include/firmware.h
@@ -14,6 +14,7 @@ struct firmware_handler {
char *model; /* description for this device */
struct device_d *dev;
void *priv;
+ struct device_node *device_node;
/* called once to prepare the firmware's programming cycle */
int (*open)(struct firmware_handler*);
/* called multiple times to program the firmware with the given data */
--
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 ` Sascha Hauer [this message]
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 ` [PATCH 17/17] of_firmware: Fix handling of firmware-name property Sascha Hauer
-- 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 06/17] firmware: Fix device_node matching 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-7-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