mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Cc: Marco Felsch <m.felsch@pengutronix.de>
Subject: [PATCH 03/19] of: platform: Keep track of populated platform devices
Date: Fri, 25 Jun 2021 09:25:24 +0200	[thread overview]
Message-ID: <20210625072540.32717-4-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20210625072540.32717-1-s.hauer@pengutronix.de>

From: Marco Felsch <m.felsch@pengutronix.de>

Linux does not allow to populate the same of device more than once.
Linux uses the OF_POPULATED flag for that purpose. Align the logic with
the current linux state with the exception that we are returning the
already created device. This is needed for the later added deep-probe
mechanism.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
Link: https://lore.pengutronix.de/20201021115813.31645-4-m.felsch@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/of/platform.c | 20 +++++++++++++++++++-
 include/of.h          |  1 +
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index 51781798c6..01de6f98af 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -106,6 +106,13 @@ struct device_d *of_platform_device_create(struct device_node *np,
 	if (!of_device_is_available(np))
 		return NULL;
 
+	/*
+	 * Linux uses the OF_POPULATED flag to skip already populated/created
+	 * devices.
+	 */
+	if (np->dev)
+		return np->dev;
+
 	/* count the io resources */
 	if (of_can_translate_address(np))
 		while (of_address_to_resource(np, num_reg, &temp_res) == 0)
@@ -141,8 +148,10 @@ struct device_d *of_platform_device_create(struct device_node *np,
 		(num_reg) ? &dev->resource[0].start : &resinval);
 
 	ret = platform_device_register(dev);
-	if (!ret)
+	if (!ret) {
+		np->dev = dev;
 		return dev;
+	}
 
 	free(dev);
 	if (num_reg)
@@ -223,6 +232,13 @@ static struct device_d *of_amba_device_create(struct device_node *np)
 	if (!of_device_is_available(np))
 		return NULL;
 
+	/*
+	 * Linux uses the OF_POPULATED flag to skip already populated/created
+	 * devices.
+	 */
+	if (np->dev)
+		return np->dev;
+
 	dev = xzalloc(sizeof(*dev));
 
 	/* setup generic device info */
@@ -246,6 +262,8 @@ static struct device_d *of_amba_device_create(struct device_node *np)
 	if (ret)
 		goto amba_err_free;
 
+	np->dev = &dev->dev;
+
 	return &dev->dev;
 
 amba_err_free:
diff --git a/include/of.h b/include/of.h
index d67a40bd19..84d6e9b682 100644
--- a/include/of.h
+++ b/include/of.h
@@ -35,6 +35,7 @@ struct device_node {
 	struct list_head parent_list;
 	struct list_head list;
 	phandle phandle;
+	struct device_d *dev;
 };
 
 struct of_device_id {
-- 
2.29.2


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


  parent reply	other threads:[~2021-06-25  7:45 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-25  7:25 [PATCH v6 00/19] barebox deep probe support Sascha Hauer
2021-06-25  7:25 ` [PATCH 01/19] imx53: remove unused imx53_add_nand Sascha Hauer
2021-06-25  7:25 ` [PATCH 02/19] of: platform: remove check of already added devices Sascha Hauer
2021-06-25  7:25 ` Sascha Hauer [this message]
2021-06-25  7:25 ` [PATCH 04/19] of: base: move memory init from DT to initcall Sascha Hauer
2021-06-25  7:25 ` [PATCH 05/19] of: base: move clock init from of_probe() to barebox_register_of() Sascha Hauer
2021-06-25  7:25 ` [PATCH 06/19] of: Set of_chosen and of_model earlier Sascha Hauer
2021-06-25  7:25 ` [PATCH 07/19] of: implement of_get_stdoutpath() Sascha Hauer
2021-06-25  7:25 ` [PATCH 08/19] initcall: add of_populate_initcall Sascha Hauer
2021-06-25  7:25 ` [PATCH 09/19] common: add initial barebox deep-probe support Sascha Hauer
2021-06-25  7:25 ` [PATCH 10/19] pinctrl: Find controller node first Sascha Hauer
2021-06-25  7:25 ` [PATCH 11/19] common: Explicitly probe consoles earlier with deep probe Sascha Hauer
2021-06-25  7:25 ` [PATCH 12/19] pinctrl: Add deep probe support Sascha Hauer
2021-06-25  7:25 ` [PATCH 13/19] phy: " Sascha Hauer
2021-06-25  7:25 ` [PATCH 14/19] ARM: i.MX: esdctl: add deep-probe support Sascha Hauer
2021-06-25  7:25 ` [PATCH 15/19] ARM: stm32mp: ddrctrl: " Sascha Hauer
2021-06-25  7:25 ` [PATCH 16/19] ARM: boards: mx6-sabrelite: " Sascha Hauer
2021-06-25  7:25 ` [PATCH 17/19] ARM: i.MX Phytec physom: convert to board driver Sascha Hauer
2021-06-25  7:25 ` [PATCH 18/19] ARM: i.MX Phytec physom: Add deep-probe support Sascha Hauer
2021-06-25  7:25 ` [PATCH 19/19] of: Add dummy driver 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=20210625072540.32717-4-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=m.felsch@pengutronix.de \
    /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