From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
qemu-arm@nongnu.org, "Jan Kiszka" <jan.kiszka@web.de>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PATCH 02/13] hw/arm/pxa2xx: Simplify pxa270_init()
Date: Mon, 9 Jan 2023 12:53:05 +0100 [thread overview]
Message-ID: <20230109115316.2235-3-philmd@linaro.org> (raw)
In-Reply-To: <20230109115316.2235-1-philmd@linaro.org>
Since pxa270_init() must map the device in the system memory,
there is no point in passing get_system_memory() by argument.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/arm/gumstix.c | 3 +--
hw/arm/mainstone.c | 10 ++++------
hw/arm/pxa2xx.c | 4 ++--
hw/arm/spitz.c | 6 ++----
hw/arm/z2.c | 3 +--
include/hw/arm/pxa.h | 3 +--
6 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index c167518a46..ab9b0182f6 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -80,12 +80,11 @@ static void verdex_init(MachineState *machine)
{
PXA2xxState *cpu;
DriveInfo *dinfo;
- MemoryRegion *address_space_mem = get_system_memory();
uint32_t verdex_rom = 0x02000000;
uint32_t verdex_ram = 0x10000000;
- cpu = pxa270_init(address_space_mem, verdex_ram, machine->cpu_type);
+ cpu = pxa270_init(verdex_ram, machine->cpu_type);
dinfo = drive_get(IF_PFLASH, 0, 0);
if (!dinfo && !qtest_enabled()) {
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index 8454b65458..f6293c6c13 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -108,8 +108,7 @@ static struct arm_boot_info mainstone_binfo = {
.ram_size = 0x04000000,
};
-static void mainstone_common_init(MemoryRegion *address_space_mem,
- MachineState *machine,
+static void mainstone_common_init(MachineState *machine,
enum mainstone_model_e model, int arm_id)
{
uint32_t sector_len = 256 * 1024;
@@ -121,11 +120,10 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,
MemoryRegion *rom = g_new(MemoryRegion, 1);
/* Setup CPU & memory */
- mpu = pxa270_init(address_space_mem, mainstone_binfo.ram_size,
- machine->cpu_type);
+ mpu = pxa270_init(mainstone_binfo.ram_size, machine->cpu_type);
memory_region_init_rom(rom, NULL, "mainstone.rom", MAINSTONE_ROM,
&error_fatal);
- memory_region_add_subregion(address_space_mem, 0, rom);
+ memory_region_add_subregion(get_system_memory(), 0x00000000, rom);
/* There are two 32MiB flash devices on the board */
for (i = 0; i < 2; i ++) {
@@ -165,7 +163,7 @@ static void mainstone_common_init(MemoryRegion *address_space_mem,
static void mainstone_init(MachineState *machine)
{
- mainstone_common_init(get_system_memory(), machine, mainstone, 0x196);
+ mainstone_common_init(machine, mainstone, 0x196);
}
static void mainstone2_machine_init(MachineClass *mc)
diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index 8b8845fc63..07d5dd8691 100644
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -2092,9 +2092,9 @@ static void pxa2xx_reset(void *opaque, int line, int level)
}
/* Initialise a PXA270 integrated chip (ARM based core). */
-PXA2xxState *pxa270_init(MemoryRegion *address_space,
- unsigned int sdram_size, const char *cpu_type)
+PXA2xxState *pxa270_init(unsigned int sdram_size, const char *cpu_type)
{
+ MemoryRegion *address_space = get_system_memory();
PXA2xxState *s;
int i;
DriveInfo *dinfo;
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index 5aab0b8565..f732fe0acf 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -986,18 +986,16 @@ static void spitz_common_init(MachineState *machine)
SpitzMachineState *sms = SPITZ_MACHINE(machine);
enum spitz_model_e model = smc->model;
PXA2xxState *mpu;
- MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *rom = g_new(MemoryRegion, 1);
/* Setup CPU & memory */
- mpu = pxa270_init(address_space_mem, spitz_binfo.ram_size,
- machine->cpu_type);
+ mpu = pxa270_init(spitz_binfo.ram_size, machine->cpu_type);
sms->mpu = mpu;
sl_flash_register(mpu, (model == spitz) ? FLASH_128M : FLASH_1024M);
memory_region_init_rom(rom, NULL, "spitz.rom", SPITZ_ROM, &error_fatal);
- memory_region_add_subregion(address_space_mem, 0, rom);
+ memory_region_add_subregion(get_system_memory(), 0, rom);
/* Setup peripherals */
spitz_keyboard_register(mpu);
diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index 9c1e876207..8eb6f495bc 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -299,7 +299,6 @@ static const TypeInfo aer915_info = {
static void z2_init(MachineState *machine)
{
- MemoryRegion *address_space_mem = get_system_memory();
uint32_t sector_len = 0x10000;
PXA2xxState *mpu;
DriveInfo *dinfo;
@@ -308,7 +307,7 @@ static void z2_init(MachineState *machine)
DeviceState *wm;
/* Setup CPU & memory */
- mpu = pxa270_init(address_space_mem, z2_binfo.ram_size, machine->cpu_type);
+ mpu = pxa270_init(z2_binfo.ram_size, machine->cpu_type);
dinfo = drive_get(IF_PFLASH, 0, 0);
if (!pflash_cfi01_register(Z2_FLASH_BASE, "z2.flash0", Z2_FLASH_SIZE,
diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h
index c26007e57f..ba8f49e48e 100644
--- a/include/hw/arm/pxa.h
+++ b/include/hw/arm/pxa.h
@@ -193,8 +193,7 @@ struct PXA2xxI2SState {
# define PA_FMT "0x%08lx"
-PXA2xxState *pxa270_init(MemoryRegion *address_space, unsigned int sdram_size,
- const char *revision);
+PXA2xxState *pxa270_init(unsigned int sdram_size, const char *revision);
PXA2xxState *pxa255_init(unsigned int sdram_size);
#endif /* PXA_H */
--
2.38.1
next prev parent reply other threads:[~2023-01-09 11:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-09 11:53 [PATCH 00/13] hw/arm: Cleanups before pflash refactor Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 01/13] hw/arm/pxa2xx: Simplify pxa255_init() Philippe Mathieu-Daudé
2023-01-09 11:53 ` Philippe Mathieu-Daudé [this message]
2023-01-09 11:53 ` [PATCH 03/13] hw/arm/collie: Use the IEC binary prefix definitions Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 04/13] hw/arm/collie: Simplify flash creation using for() loop Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 05/13] hw/arm/gumstix: Improve documentation Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 06/13] hw/arm/gumstix: Use the IEC binary prefix definitions Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 07/13] hw/arm/mainstone: " Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 08/13] hw/arm/musicpal: " Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 09/13] hw/arm/omap_sx1: Remove unused 'total_ram' definitions Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 10/13] hw/arm/omap_sx1: Use the IEC binary prefix definitions Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 11/13] hw/arm/z2: " Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 12/13] hw/arm/vexpress: Remove dead code in vexpress_common_init() Philippe Mathieu-Daudé
2023-01-09 11:53 ` [PATCH 13/13] hw/arm: Remove unreachable code calling pflash_cfi01_register() Philippe Mathieu-Daudé
2023-01-09 17:40 ` [PATCH 00/13] hw/arm: Cleanups before pflash refactor Richard Henderson
2023-01-12 17:04 ` 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=20230109115316.2235-3-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=jan.kiszka@web.de \
--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).