mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v2 08/10] power: reset: reboot-mode: support multi-word magic
Date: Mon, 28 Sep 2020 16:45:12 +0200	[thread overview]
Message-ID: <20200928144514.14398-9-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20200928144514.14398-1-a.fatoum@pengutronix.de>

The upstream binding and driver implementation only supports
reboot modes of 32-bit length. This is insufficient for cases where
multiple registers need to be written for the reboot mode to become
active. The i.MX6 is an example for this, the BootROM expects a second
32-bit register to indicate whether the reboot mode in the first is
valid. In preparation for adding support for this to the
syscon-reboot-mode driver. Migrate the reboot-mode core to support this.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/power/reset/reboot-mode.c        | 37 ++++++++++++++----------
 drivers/power/reset/syscon-reboot-mode.c | 11 +++++--
 include/linux/reboot-mode.h              |  7 +++--
 3 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/drivers/power/reset/reboot-mode.c b/drivers/power/reset/reboot-mode.c
index bf51c00aee75..313ba6dc3af7 100644
--- a/drivers/power/reset/reboot-mode.c
+++ b/drivers/power/reset/reboot-mode.c
@@ -20,11 +20,9 @@ static struct reboot_mode_driver *__boot_mode;
 static int reboot_mode_param_set(struct param_d *p, void *priv)
 {
 	struct reboot_mode_driver *reboot = priv;
-	u32 magic;
+	size_t i = reboot->reboot_mode_next * reboot->nelems;
 
-	magic = reboot->magics[reboot->reboot_mode_next];
-
-	return reboot->write(reboot, magic);
+	return reboot->write(reboot, &reboot->magics[i]);
 }
 
 static int reboot_mode_add_param(struct device_d *dev,
@@ -108,9 +106,13 @@ late_initcall(reboot_mode_add_globalvar);
 
 
 static void reboot_mode_print(struct reboot_mode_driver *reboot,
-			      const char *prefix, u32 magic)
+			      const char *prefix, const u32 *arr)
 {
-	dev_dbg(reboot->dev, "%s: %08x\n", prefix, magic);
+	size_t i;
+	dev_dbg(reboot->dev, "%s: ", prefix);
+	for (i = 0; i < reboot->nelems; i++)
+		__pr_printk(7, "%08x ", arr[i]);
+	__pr_printk(7, "\n");
 }
 
 /**
@@ -120,7 +122,8 @@ static void reboot_mode_print(struct reboot_mode_driver *reboot,
  *
  * Returns: 0 on success or a negative error code on failure.
  */
-int reboot_mode_register(struct reboot_mode_driver *reboot, u32 reboot_mode)
+int reboot_mode_register(struct reboot_mode_driver *reboot,
+			 const u32 *reboot_mode, size_t nelems)
 {
 	struct property *prop;
 	struct device_node *np = reboot->dev->device_node;
@@ -142,7 +145,8 @@ int reboot_mode_register(struct reboot_mode_driver *reboot, u32 reboot_mode)
 	}
 
 	reboot->nmodes = nmodes;
-	reboot->magics = xzalloc(nmodes * sizeof(u32));
+	reboot->nelems = nelems;
+	reboot->magics = xzalloc(nmodes * nelems * sizeof(u32));
 	reboot->modes = xzalloc(nmodes * sizeof(const char *));
 
 	reboot_mode_print(reboot, "registering magic", reboot_mode);
@@ -151,13 +155,13 @@ int reboot_mode_register(struct reboot_mode_driver *reboot, u32 reboot_mode)
 		const char **mode;
 		u32 *magic;
 
-		magic = &reboot->magics[i];
+		magic = &reboot->magics[i * nelems];
 		mode = &reboot->modes[i];
 
 		if (strncmp(prop->name, PREFIX, len))
 			continue;
 
-		if (of_property_read_u32(np, prop->name, magic)) {
+		if (of_property_read_u32_array(np, prop->name, magic, nelems)) {
 			dev_err(reboot->dev, "reboot mode %s without magic number\n",
 				*mode);
 			continue;
@@ -171,22 +175,23 @@ int reboot_mode_register(struct reboot_mode_driver *reboot, u32 reboot_mode)
 			goto error;
 		}
 
-		reboot_mode_print(reboot, *mode, *magic);
+		reboot_mode_print(reboot, *mode, magic);
 
 		i++;
 	}
 
 	for (i = 0; i < reboot->nmodes; i++) {
-		if (reboot->magics[i] == reboot_mode) {
-			reboot->reboot_mode_prev = i;
-			break;
-		}
+		if (memcmp(&reboot->magics[i * nelems], reboot_mode, nelems * sizeof(u32)))
+			continue;
+
+		reboot->reboot_mode_prev = i;
+		break;
 	}
 
 	reboot_mode_add_param(reboot->dev, "", reboot);
 
 	/* clear mode for next reboot */
-	reboot->write(reboot, 0);
+	reboot->write(reboot, &(u32) { 0 });
 
 	if (!reboot->priority)
 		reboot->priority = REBOOT_MODE_DEFAULT_PRIORITY;
diff --git a/drivers/power/reset/syscon-reboot-mode.c b/drivers/power/reset/syscon-reboot-mode.c
index 5e4aed943d5c..bd4f1a3d04b0 100644
--- a/drivers/power/reset/syscon-reboot-mode.c
+++ b/drivers/power/reset/syscon-reboot-mode.c
@@ -19,7 +19,7 @@ struct syscon_reboot_mode {
 };
 
 static int syscon_reboot_mode_write(struct reboot_mode_driver *reboot,
-				    unsigned int magic)
+				    const u32 *magic)
 {
 	struct syscon_reboot_mode *syscon_rbm;
 	int ret;
@@ -27,7 +27,7 @@ static int syscon_reboot_mode_write(struct reboot_mode_driver *reboot,
 	syscon_rbm = container_of(reboot, struct syscon_reboot_mode, reboot);
 
 	ret = regmap_update_bits(syscon_rbm->map, syscon_rbm->offset,
-				 syscon_rbm->mask, magic);
+				 syscon_rbm->mask, *magic);
 	if (ret < 0)
 		dev_err(reboot->dev, "update reboot mode bits failed\n");
 
@@ -39,8 +39,13 @@ static int syscon_reboot_mode_probe(struct device_d *dev)
 	int ret;
 	struct syscon_reboot_mode *syscon_rbm;
 	struct device_node *np = dev->device_node;
+	size_t nelems;
 	u32 magic;
 
+	nelems = of_property_count_elems_of_size(np, "offset", sizeof(__be32));
+	if (nelems != 1)
+		return -EINVAL;
+
 	syscon_rbm = xzalloc(sizeof(*syscon_rbm));
 
 	syscon_rbm->reboot.dev = dev;
@@ -65,7 +70,7 @@ static int syscon_reboot_mode_probe(struct device_d *dev)
 
 	magic &= syscon_rbm->mask;
 
-	ret = reboot_mode_register(&syscon_rbm->reboot, magic);
+	ret = reboot_mode_register(&syscon_rbm->reboot, &magic, 1);
 	if (ret)
 		dev_err(dev, "can't register reboot mode\n");
 
diff --git a/include/linux/reboot-mode.h b/include/linux/reboot-mode.h
index bc57f1d72df7..9d9ce19c0e5f 100644
--- a/include/linux/reboot-mode.h
+++ b/include/linux/reboot-mode.h
@@ -9,18 +9,19 @@ struct device_d;
 #ifdef CONFIG_REBOOT_MODE
 struct reboot_mode_driver {
 	struct device_d *dev;
-	int (*write)(struct reboot_mode_driver *reboot, u32 magic);
+	int (*write)(struct reboot_mode_driver *reboot, const u32 *magic);
 	int priority;
 	bool no_fixup;
 
 	/* filled by reboot_mode_register */
 	int reboot_mode_prev, reboot_mode_next;
-	unsigned nmodes;
+	unsigned nmodes, nelems;
 	const char **modes;
 	u32 *magics;
 };
 
-int reboot_mode_register(struct reboot_mode_driver *reboot, u32 reboot_mode);
+int reboot_mode_register(struct reboot_mode_driver *reboot,
+			 const u32 *magic, size_t num);
 const char *reboot_mode_get(void);
 
 #define REBOOT_MODE_DEFAULT_PRIORITY 100
-- 
2.28.0


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

  parent reply	other threads:[~2020-09-28 14:45 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-28 14:45 [PATCH v2 00/10] power: reset: add support for syscon reboot Ahmad Fatoum
2020-09-28 14:45 ` [PATCH v2 01/10] usbgadget: autostart: support delayed usbgadget.autostart=1 Ahmad Fatoum
2020-09-28 14:45 ` [PATCH v2 02/10] drivers: add reboot-mode infrastructure Ahmad Fatoum
2020-09-28 14:45 ` [PATCH v2 03/10] power: reset: reboot-mode: port syscon-reboot-mode support Ahmad Fatoum
2020-09-28 14:45 ` [PATCH v2 04/10] power: reset: reboot-mode: fix up node into boot device tree Ahmad Fatoum
2020-09-28 14:45 ` [PATCH v2 05/10] defaultenv: provide defaults for generic reboot modes Ahmad Fatoum
2020-09-28 14:45 ` [PATCH v2 06/10] ARM: dts: stm32mp: setup syscon-reboot-mode on TAMP general purpose register Ahmad Fatoum
2020-09-28 14:45 ` [PATCH v2 07/10] ARM: stm32mp: remove custom reboot mode logic from arch code Ahmad Fatoum
2020-09-28 14:45 ` Ahmad Fatoum [this message]
2020-09-28 14:45 ` [PATCH v2 09/10] power: reset: syscon-reboot-mode: support multi-word reboot modes Ahmad Fatoum
2020-09-28 14:45 ` [PATCH v2 10/10] ARM: dts: i.MX6qdl: define BootROM reboot-mode on top of SRC_GPR{9, 10} Ahmad Fatoum
2020-09-29  8:25 ` [PATCH v2 00/10] power: reset: add support for syscon reboot 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=20200928144514.14398-9-a.fatoum@pengutronix.de \
    --to=a.fatoum@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