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: Marco Felsch <m.felsch@pengutronix.de>,
	Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH master 02/14] RISC-V: board-dt-2nd: fix hang in startup
Date: Tue, 11 Apr 2023 09:14:24 +0200	[thread overview]
Message-ID: <20230411071436.1630752-3-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20230411071436.1630752-1-a.fatoum@pengutronix.de>

relocate_to_current_adr() will do a sync_caches_for_execution() after
concluding. The method used for icache synchronization depends on the
CPU being used. Allwinner D1 support added the assumption that any
code running in S-Mode will have populated sscratch with the flags
before calling riscv_vendor_id(). This is not the case for
barebox-dt-2nd, which does relocation before riscv_set_flags().

Quick fix this by calling riscv_set_flags manually.

Cc: Marco Felsch <m.felsch@pengutronix.de>
Fixes: c986c565b023 ("RISC-V: use m/sscratch registers for barebox_riscv_pbl_flags")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/riscv/boot/board-dt-2nd.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/riscv/boot/board-dt-2nd.c b/arch/riscv/boot/board-dt-2nd.c
index 8b78e1b11d31..f1479d834615 100644
--- a/arch/riscv/boot/board-dt-2nd.c
+++ b/arch/riscv/boot/board-dt-2nd.c
@@ -50,6 +50,12 @@ static void noinline __noreturn start_dt_2nd_nonnaked(unsigned long hartid,
 	if (!fdt)
 		hang();
 
+	/*
+	 * We need to call this here, as a multiplatform build
+	 * depends on querying mode for riscv_vendor_id()
+	 */
+	riscv_set_flags(RISCV_S_MODE);
+
 	relocate_to_current_adr();
 	setup_c();
 
-- 
2.39.2




  parent reply	other threads:[~2023-04-11  7:17 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-11  7:14 [PATCH master 00/14] treewide: fixes for master Ahmad Fatoum
2023-04-11  7:14 ` [PATCH master 01/14] test: riscv: fix YAMLs after defconfig rename Ahmad Fatoum
2023-04-11  7:14 ` Ahmad Fatoum [this message]
2023-04-11  7:14 ` [PATCH master 03/14] RISC-V: sifive: disable non-functional SPI nodes Ahmad Fatoum
2023-04-11  7:14 ` [PATCH master 04/14] video: qemu-ramfb: reduce -ENODEV lo level to debug Ahmad Fatoum
2023-04-11  7:14 ` [PATCH master 05/14] gpiolib: fix gpio label generation with gpiod_get Ahmad Fatoum
2023-04-11  7:14 ` [PATCH master 06/14] test: emulate.pl: fix firmware use with non-tuxmake out-of-tree build Ahmad Fatoum
2023-04-11  7:14 ` [PATCH master 07/14] RISC-V: restrict GCC optimization some more Ahmad Fatoum
2023-04-11  7:14 ` [PATCH master 08/14] RISC-V: configs: rv64i_defconfig: disable SBI serial Ahmad Fatoum
2023-04-11  7:14 ` [PATCH master 09/14] net: dsa: realtek: include needed headers directly Ahmad Fatoum
2023-04-11  7:14 ` [PATCH master 10/14] net: linux/mdio.h: add missing init.h header Ahmad Fatoum
2023-04-11  7:14 ` [PATCH master 11/14] Kbuild: export CROSS_PKG_CONFIG Ahmad Fatoum
2023-04-11  7:14 ` [PATCH master 12/14] treewide: fix includes missed by multiarch support Ahmad Fatoum
2023-04-11  7:14 ` [PATCH master 13/14] mci: dw_mmc: make reset optional Ahmad Fatoum
2023-04-11  7:14 ` [PATCH master 14/14] kbuild: remove useless use of /usr/bin/env Ahmad Fatoum
2023-04-11 11:57   ` Sascha Hauer
2023-04-11 11:44 ` [PATCH master 00/14] treewide: fixes for master 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=20230411071436.1630752-3-a.fatoum@pengutronix.de \
    --to=a.fatoum@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