From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Andrew Jeffery" <andrew@aj.id.au>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Igor Mitsyanko" <i.mitsyanko@gmail.com>,
"Joel Stanley" <joel@jms.id.au>,
"Havard Skinnemoen" <hskinnemoen@google.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Alistair Francis" <alistair@alistair23.me>,
qemu-arm@nongnu.org, "Tyrone Ting" <kfting@nuvoton.com>
Subject: [PATCH 3/6] hw/arm/exynos4210: Remove tswap32() calls and constify smpboot[]
Date: Thu, 22 Dec 2022 22:55:46 +0100 [thread overview]
Message-ID: <20221222215549.86872-4-philmd@linaro.org> (raw)
In-Reply-To: <20221222215549.86872-1-philmd@linaro.org>
ARM CPUs fetch instructions in little-endian.
smpboot[] encoded instructions are written in little-endian.
We call tswap32() on the array. tswap32 function swap a 32-bit
value if the target endianness doesn't match the host one.
Otherwise it is a NOP.
* On a little-endian host, the array is stored as it. tswap32()
is a NOP, and the vCPU fetches the instructions as it, in
little-endian.
* On a big-endian host, the array is stored as it. tswap32()
swap the instructions to little-endian, and the vCPU fetches
the instructions as it, in little-endian.
Using tswap() on system emulation is a bit odd: while the target
particularities might change the system emulation, the host ones
(such its endianness) shouldn't interfere.
We can simplify by using const_le32() to always store the
instructions in the array in little-endian, removing the need
for the dubious tswap().
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/exynos4210.c | 48 ++++++++++++++++++++-------------------------
1 file changed, 21 insertions(+), 27 deletions(-)
diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index 8dafa2215b..89ee83456d 100644
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -468,35 +468,29 @@ static const MemoryRegionOps exynos4210_chipid_and_omr_ops = {
}
};
-void exynos4210_write_secondary(ARMCPU *cpu,
- const struct arm_boot_info *info)
+void exynos4210_write_secondary(ARMCPU *cpu, const struct arm_boot_info *info)
{
- int n;
- uint32_t smpboot[] = {
- 0xe59f3034, /* ldr r3, External gic_cpu_if */
- 0xe59f2034, /* ldr r2, Internal gic_cpu_if */
- 0xe59f0034, /* ldr r0, startaddr */
- 0xe3a01001, /* mov r1, #1 */
- 0xe5821000, /* str r1, [r2] */
- 0xe5831000, /* str r1, [r3] */
- 0xe3a010ff, /* mov r1, #0xff */
- 0xe5821004, /* str r1, [r2, #4] */
- 0xe5831004, /* str r1, [r3, #4] */
- 0xf57ff04f, /* dsb */
- 0xe320f003, /* wfi */
- 0xe5901000, /* ldr r1, [r0] */
- 0xe1110001, /* tst r1, r1 */
- 0x0afffffb, /* beq <wfi> */
- 0xe12fff11, /* bx r1 */
- EXYNOS4210_EXT_GIC_CPU_BASE_ADDR,
- 0, /* gic_cpu_if: base address of Internal GIC CPU interface */
- 0 /* bootreg: Boot register address is held here */
+ const uint32_t smpboot[] = {
+ const_le32(0xe59f3034), /* ldr r3, External gic_cpu_if */
+ const_le32(0xe59f2034), /* ldr r2, Internal gic_cpu_if */
+ const_le32(0xe59f0034), /* ldr r0, startaddr */
+ const_le32(0xe3a01001), /* mov r1, #1 */
+ const_le32(0xe5821000), /* str r1, [r2] */
+ const_le32(0xe5831000), /* str r1, [r3] */
+ const_le32(0xe3a010ff), /* mov r1, #0xff */
+ const_le32(0xe5821004), /* str r1, [r2, #4] */
+ const_le32(0xe5831004), /* str r1, [r3, #4] */
+ const_le32(0xf57ff04f), /* dsb */
+ const_le32(0xe320f003), /* wfi */
+ const_le32(0xe5901000), /* ldr r1, [r0] */
+ const_le32(0xe1110001), /* tst r1, r1 */
+ const_le32(0x0afffffb), /* beq <wfi> */
+ const_le32(0xe12fff11), /* bx r1 */
+ const_le32(EXYNOS4210_EXT_GIC_CPU_BASE_ADDR),
+ cpu_to_le32(info->gic_cpu_if_addr), /* base address of Internal GIC CPU interface */
+ cpu_to_le32(info->smp_bootreg_addr) /* Boot register address is held here */
};
- smpboot[ARRAY_SIZE(smpboot) - 1] = info->smp_bootreg_addr;
- smpboot[ARRAY_SIZE(smpboot) - 2] = info->gic_cpu_if_addr;
- for (n = 0; n < ARRAY_SIZE(smpboot); n++) {
- smpboot[n] = tswap32(smpboot[n]);
- }
+
rom_add_blob_fixed("smpboot", smpboot, sizeof(smpboot),
info->smp_loader_start);
}
--
2.38.1
next prev parent reply other threads:[~2022-12-22 21:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-22 21:55 [PATCH 0/6] hw/arm: Fix smpboot[] on big-endian hosts and remove tswap32() Philippe Mathieu-Daudé
2022-12-22 21:55 ` [PATCH 1/6] hw/arm/aspeed: Fix smpboot[] on big-endian hosts Philippe Mathieu-Daudé
2022-12-23 7:24 ` Cédric Le Goater
2023-01-03 17:33 ` Peter Maydell
2023-01-04 8:43 ` Cédric Le Goater
2023-01-04 22:35 ` Philippe Mathieu-Daudé
2023-01-04 23:25 ` Cédric Le Goater
2022-12-22 21:55 ` [PATCH 2/6] hw/arm/raspi: " Philippe Mathieu-Daudé
2022-12-22 21:55 ` Philippe Mathieu-Daudé [this message]
2022-12-22 21:55 ` [PATCH 4/6] hw/arm/npcm7xx: Remove tswap32() calls and constify smpboot[] Philippe Mathieu-Daudé
2022-12-22 21:55 ` [PATCH 5/6] hw/arm/xilinx_zynq: " Philippe Mathieu-Daudé
2022-12-23 3:54 ` Edgar E. Iglesias
2022-12-23 10:01 ` Philippe Mathieu-Daudé
2022-12-23 10:05 ` Philippe Mathieu-Daudé
2022-12-22 21:55 ` [PATCH 6/6] hw/arm/boot: Remove tswap32() calls and constify board_setup_blob[] Philippe Mathieu-Daudé
2022-12-22 21:59 ` [PATCH 0/6] hw/arm: Fix smpboot[] on big-endian hosts and remove tswap32() Philippe Mathieu-Daudé
2022-12-24 23:32 ` Richard Henderson
2023-01-03 17:43 ` Peter Maydell
2023-01-04 22:51 ` Philippe Mathieu-Daudé
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=20221222215549.86872-4-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=alistair@alistair23.me \
--cc=andrew@aj.id.au \
--cc=clg@kaod.org \
--cc=edgar.iglesias@gmail.com \
--cc=hskinnemoen@google.com \
--cc=i.mitsyanko@gmail.com \
--cc=joel@jms.id.au \
--cc=kfting@nuvoton.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@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).