From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH master] ARM: at91: at91sam9x5: fix co-existance of erratum-aware and generic reset
Date: Mon, 4 Jan 2021 10:34:32 +0100 [thread overview]
Message-ID: <20210104093432.6257-1-a.fatoum@pengutronix.de> (raw)
We have a generic at91sam9 reset driver, but it's unaware of the
erratum on the at91sam9x5, which can prevent reboot from NAND due to
interference from SDRAM. The workaround is packing the powering down
of the DDR and the system reset into a single cache line and executing
that. This would be a bit tedious to add into the device tree probed
driver, thus:
- Don't activate the work around if we are device-tree enabled, but
have a newer SoC
- Give the workaround a slightly higher priority, so it's taken instead
of the generic DT driver
This fixes an issue of failing reset with the at91_multi_defconfig,
because both reset drivers have the same priority of 100.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
arch/arm/mach-at91/at91sam9x5.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
index 086e27a79f51..8266b512c999 100644
--- a/arch/arm/mach-at91/at91sam9x5.c
+++ b/arch/arm/mach-at91/at91sam9x5.c
@@ -11,10 +11,17 @@ static void at91sam9x5_restart(struct restart_handler *rst)
IOMEM(AT91SAM9X5_BASE_RSTC + AT91_RSTC_CR));
}
+static struct restart_handler restart;
+
static int at91sam9x5_initialize(void)
{
- restart_handler_register_fn("soc", at91sam9x5_restart);
+ if (IS_ENABLED(CONFIG_OFDEVICE) && !of_machine_is_compatible("atmel,at91sam9x5"))
+ return 0;
+
+ restart.name = "soc";
+ restart.priority = 110;
+ restart.restart = at91sam9x5_restart;
- return 0;
+ return restart_handler_register(&restart);
}
coredevice_initcall(at91sam9x5_initialize);
--
2.29.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2021-01-04 9:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-04 9:34 Ahmad Fatoum [this message]
2021-01-05 12:02 ` 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=20210104093432.6257-1-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