From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, qemu-arm@nongnu.org, qemu-block@nongnu.org,
"Clément Chigot" <chigot@adacore.com>,
"Frederic Konrad" <konrad.frederic@yahoo.fr>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Artyom Tarasenko" <atar4qemu@gmail.com>
Subject: [PULL 40/56] hw/sparc/leon3: check cpu_id in the tiny bootloader
Date: Thu, 15 Feb 2024 18:57:34 +0100 [thread overview]
Message-ID: <20240215175752.82828-41-philmd@linaro.org> (raw)
In-Reply-To: <20240215175752.82828-1-philmd@linaro.org>
From: Clément Chigot <chigot@adacore.com>
Now that SMP is possible, the asr17 must be checked in the little boot
code or the secondary CPU will reinitialize the Timer and the Uart.
Co-developed-by: Frederic Konrad <konrad.frederic@yahoo.fr>
Signed-off-by: Clément Chigot <chigot@adacore.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240131085047.18458-9-chigot@adacore.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/sparc/leon3.c | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 1637900162..bea84f3ad6 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -99,12 +99,26 @@ static uint32_t *gen_store_u32(uint32_t *code, hwaddr addr, uint32_t val)
/*
* When loading a kernel in RAM the machine is expected to be in a different
- * state (eg: initialized by the bootloader). This little code reproduces
- * this behavior.
+ * state (eg: initialized by the bootloader). This little code reproduces
+ * this behavior. Also this code can be executed by the secondary cpus as
+ * well since it looks at the %asr17 register before doing any
+ * initialization, it allows to use the same reset address for all the
+ * cpus.
*/
static void write_bootloader(void *ptr, hwaddr kernel_addr)
{
uint32_t *p = ptr;
+ uint32_t *sec_cpu_branch_p = NULL;
+
+ /* If we are running on a secondary CPU, jump directly to the kernel. */
+
+ stl_p(p++, 0x85444000); /* rd %asr17, %g2 */
+ stl_p(p++, 0x8530a01c); /* srl %g2, 0x1c, %g2 */
+ stl_p(p++, 0x80908000); /* tst %g2 */
+ /* Filled below. */
+ sec_cpu_branch_p = p;
+ stl_p(p++, 0x0BADC0DE); /* bne xxx */
+ stl_p(p++, 0x01000000); /* nop */
/* Initialize the UARTs */
/* *UART_CONTROL = UART_RECEIVE_ENABLE | UART_TRANSMIT_ENABLE; */
@@ -118,6 +132,10 @@ static void write_bootloader(void *ptr, hwaddr kernel_addr)
/* *GPTIMER0_CONFIG = GPTIMER_ENABLE | GPTIMER_RESTART; */
p = gen_store_u32(p, 0x80000318, 3);
+ /* Now, the relative branch above can be computed. */
+ stl_p(sec_cpu_branch_p, 0x12800000
+ + (p - sec_cpu_branch_p));
+
/* JUMP to the entry point */
stl_p(p++, 0x82100000); /* mov %g0, %g1 */
stl_p(p++, 0x03000000 + extract32(kernel_addr, 10, 22));
--
2.41.0
next prev parent reply other threads:[~2024-02-15 18:05 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-15 17:56 [PULL 00/56] Misc HW patches for 2024-02-15 Philippe Mathieu-Daudé
2024-02-15 17:56 ` [PULL 01/56] hw/block/tc58128: Don't emit deprecation warning under qtest Philippe Mathieu-Daudé
2024-02-15 17:56 ` [PULL 02/56] hw/mips: remove unnecessary "select PTIMER" Philippe Mathieu-Daudé
2024-02-15 17:56 ` [PULL 03/56] target/mips: Use qemu_irq typedef for CPUMIPSState::irq member Philippe Mathieu-Daudé
2024-02-15 17:56 ` [PULL 04/56] target/mips: Remove helpers accessing SAAR registers Philippe Mathieu-Daudé
2024-02-15 17:56 ` [PULL 05/56] hw/misc/mips: Reduce itc_reconfigure() scope Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 06/56] target/mips: Remove MIPSITUState::itu field Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 07/56] target/mips: Remove CPUMIPSState::saarp field Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 08/56] hw/misc/mips_itu: Remove MIPSITUState::cpu0 field Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 09/56] hw/misc/mips_itu: Remove MIPSITUState::saar field Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 10/56] target/mips: Remove unused mips_def_t::SAARP field Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 11/56] target/mips: Remove CPUMIPSState::CP0_SAAR[2] field Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 12/56] target/mips: Remove helpers accessing SAARI register Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 13/56] target/mips: Remove CPUMIPSState::CP0_SAARI field Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 14/56] target/mips: Remove the unused DisasContext::saar field Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 15/56] hw/isa: clean up Kconfig selections for ISA_SUPERIO Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 16/56] hw/mips/Kconfig: Remove ISA dependencies from MIPSsim board Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 17/56] hw/isa: fix ISA_SUPERIO dependencies Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 18/56] hw/isa: specify instance_size in isa_superio_type_info Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 19/56] hw/isa: extract FDC37M81X to a separate file Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 20/56] hw/rx/rx62n: Reduce inclusion of 'qemu/units.h' Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 21/56] hw/rx/rx62n: Only call qdev_get_gpio_in() when necessary Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 22/56] hw/i386/q35: Realize LPC PCI function before accessing it Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 23/56] hw/ppc/prep: Realize ISA bridge " Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 24/56] hw/misc/macio: Realize IDE controller " Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 25/56] hw/sh4/r2d: " Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 26/56] hw/dma: Pass parent object to i8257_dma_init() Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 27/56] hw/sparc/sun4m: Realize DMA controller before accessing it Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 28/56] hw/sparc64/cpu: Initialize GPIO before realizing CPU devices Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 29/56] target/sparc: Provide hint about CPUSPARCState::irq_manager member Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 30/56] hw/sparc/leon3: Remove duplicate code Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 31/56] hw/sparc/leon3: Remove unused 'env' argument of write_bootloader() Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 32/56] hw/sparc/leon3: Have write_bootloader() take a void pointer argument Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 33/56] hw/sparc/grlib: split out the headers for each peripherals Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 34/56] hw/intc/grlib_irqmp: add ncpus property Philippe Mathieu-Daudé
2024-03-08 13:27 ` Peter Maydell
2024-03-08 15:01 ` Clément Chigot
2024-02-15 17:57 ` [PULL 35/56] hw/intc/grlib_irqmp: implements the multiprocessor status register Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 36/56] hw/intc/grlib_irqmp: implements multicore irq Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 37/56] target/sparc: implement asr17 feature for smp Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 38/56] hw/sparc/leon3: remove SP initialization Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 39/56] hw/sparc/leon3: implement multiprocessor Philippe Mathieu-Daudé
2024-02-15 17:57 ` Philippe Mathieu-Daudé [this message]
2024-02-15 17:57 ` [PULL 41/56] hw/sparc/leon3: Pass DeviceState opaque argument to leon3_set_pil_in() Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 42/56] hw/sparc/leon3: Pass DeviceState opaque argument to leon3_start_cpu() Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 43/56] hw/sparc/leon3: Initialize GPIO before realizing CPU devices Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 44/56] MAINTAINERS: replace Fabien by myself as Leon3 maintainer Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 45/56] MAINTAINERS: Add myself as reviewer for TCG Plugins Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 46/56] hw/i386/q35: Simplify pc_q35_init() since PCI is always enabled Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 47/56] hw/i386/q35: Use DEVICE() cast macro with PCIDevice object Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 48/56] hw/ide/ahci: Expose AHCIPCIState structure Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 49/56] hw/ide/ahci: Rename AHCI PCI function as 'pdev' Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 50/56] hw/ide/ahci: Inline ahci_get_num_ports() Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 51/56] hw/ide/ahci: Pass AHCI context to ahci_ide_create_devs() Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 52/56] hw/ide/ahci: Convert AHCIState::ports to unsigned Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 53/56] hw/ide/ahci: Do not pass 'ports' argument to ahci_realize() Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 54/56] hw/ide/ahci: Remove SysbusAHCIState::num_ports field Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 55/56] hw/ide/ahci: Move SysBus definitions to 'ahci-sysbus.h' Philippe Mathieu-Daudé
2024-02-15 17:57 ` [PULL 56/56] hw/ide/ich9: Use AHCIPCIState typedef Philippe Mathieu-Daudé
2024-02-16 13:31 ` [PULL 00/56] Misc HW patches for 2024-02-15 Peter Maydell
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=20240215175752.82828-41-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=atar4qemu@gmail.com \
--cc=chigot@adacore.com \
--cc=konrad.frederic@yahoo.fr \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.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;
as well as URLs for NNTP newsgroup(s).