From: Helge Deller <deller@gmx.de>
Allow up to 256 GB RAM, which is the maximum a rp8440 machine (the very
last 64-bit PA-RISC machine) physically supports.
Signed-off-by: Helge Deller <deller@gmx.de>
---
hw/hppa/hppa_hardware.h | 2 ++
hw/hppa/machine.c | 26 +++++++++++++++++++-------
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/hw/hppa/hppa_hardware.h b/hw/hppa/hppa_hardware.h
index a9be7bb851..a276240967 100644
--- a/hw/hppa/hppa_hardware.h
+++ b/hw/hppa/hppa_hardware.h
@@ -49,4 +49,6 @@
#define CPU_HPA_CR_REG 7 /* store CPU HPA in cr7 (SeaBIOS internal) */
#define PIM_STORAGE_SIZE 600 /* storage size of pdc_pim_toc_struct (64bit) */
+#define RAM_MAP_HIGH 0x0100000000 /* memory above 3.75 GB is mapped here */
+
#endif
diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c
index 8230f43e41..4bcc66cd6f 100644
--- a/hw/hppa/machine.c
+++ b/hw/hppa/machine.c
@@ -283,16 +283,13 @@ static TranslateFn *machine_HP_common_init_cpus(MachineState *machine)
cpu[i] = HPPA_CPU(cpu_create(machine->cpu_type));
}
- /*
- * For now, treat address layout as if PSW_W is clear.
- * TODO: create a proper hppa64 board model and load elf64 firmware.
- */
+ /* Initialize memory */
if (hppa_is_pa20(&cpu[0]->env)) {
translate = translate_pa20;
- ram_max = 0xf0000000; /* 3.75 GB (limited by 32-bit firmware) */
+ ram_max = 256 * GiB; /* like HP rp8440 */
} else {
translate = translate_pa10;
- ram_max = 0xf0000000; /* 3.75 GB (32-bit CPU) */
+ ram_max = FIRMWARE_START; /* 3.75 GB (32-bit CPU) */
}
soft_power_reg = translate(NULL, HPA_POWER_BUTTON);
@@ -320,7 +317,22 @@ static TranslateFn *machine_HP_common_init_cpus(MachineState *machine)
info_report("Max RAM size limited to %" PRIu64 " MB", ram_max / MiB);
machine->ram_size = ram_max;
}
- memory_region_add_subregion_overlap(addr_space, 0, machine->ram, -1);
+ if (machine->ram_size <= FIRMWARE_START) {
+ /* contiguous memory up to 3.75 GB RAM */
+ memory_region_add_subregion_overlap(addr_space, 0, machine->ram, -1);
+ } else {
+ /* non-contiguous: Memory above 3.75 GB is mapped at RAM_MAP_HIGH */
+ MemoryRegion *mem_region;
+ mem_region = g_new(MemoryRegion, 2);
+ memory_region_init_alias(&mem_region[0], &addr_space->parent_obj,
+ "LowMem", machine->ram, 0, FIRMWARE_START);
+ memory_region_init_alias(&mem_region[1], &addr_space->parent_obj,
+ "HighMem", machine->ram, FIRMWARE_START,
+ machine->ram_size - FIRMWARE_START);
+ memory_region_add_subregion_overlap(addr_space, 0, &mem_region[0], -1);
+ memory_region_add_subregion_overlap(addr_space, RAM_MAP_HIGH,
+ &mem_region[1], -1);
+ }
return translate;
}
--
2.47.0On 22/1/25 19:09, deller@kernel.org wrote: > From: Helge Deller <deller@gmx.de> > > Allow up to 256 GB RAM, which is the maximum a rp8440 machine (the very > last 64-bit PA-RISC machine) physically supports. > > Signed-off-by: Helge Deller <deller@gmx.de> > --- > hw/hppa/hppa_hardware.h | 2 ++ > hw/hppa/machine.c | 26 +++++++++++++++++++------- > 2 files changed, 21 insertions(+), 7 deletions(-) > > diff --git a/hw/hppa/hppa_hardware.h b/hw/hppa/hppa_hardware.h > index a9be7bb851..a276240967 100644 > --- a/hw/hppa/hppa_hardware.h > +++ b/hw/hppa/hppa_hardware.h > @@ -49,4 +49,6 @@ > #define CPU_HPA_CR_REG 7 /* store CPU HPA in cr7 (SeaBIOS internal) */ > #define PIM_STORAGE_SIZE 600 /* storage size of pdc_pim_toc_struct (64bit) */ > > +#define RAM_MAP_HIGH 0x0100000000 /* memory above 3.75 GB is mapped here */ Should we use ull suffix? > + > #endif
On 1/24/25 18:52, Philippe Mathieu-Daudé wrote: > On 22/1/25 19:09, deller@kernel.org wrote: >> From: Helge Deller <deller@gmx.de> >> >> Allow up to 256 GB RAM, which is the maximum a rp8440 machine (the very >> last 64-bit PA-RISC machine) physically supports. >> >> Signed-off-by: Helge Deller <deller@gmx.de> >> --- >> hw/hppa/hppa_hardware.h | 2 ++ >> hw/hppa/machine.c | 26 +++++++++++++++++++------- >> 2 files changed, 21 insertions(+), 7 deletions(-) >> >> diff --git a/hw/hppa/hppa_hardware.h b/hw/hppa/hppa_hardware.h >> index a9be7bb851..a276240967 100644 >> --- a/hw/hppa/hppa_hardware.h >> +++ b/hw/hppa/hppa_hardware.h >> @@ -49,4 +49,6 @@ >> #define CPU_HPA_CR_REG 7 /* store CPU HPA in cr7 (SeaBIOS internal) */ >> #define PIM_STORAGE_SIZE 600 /* storage size of pdc_pim_toc_struct (64bit) */ >> +#define RAM_MAP_HIGH 0x0100000000 /* memory above 3.75 GB is mapped here */ > > Should we use ull suffix? I prefer not to add this suffix, as this file is shared as-is with SeaBIOS-hppa sources and included by the hppa assembler. Helge
On 1/22/25 10:09, deller@kernel.org wrote: > From: Helge Deller <deller@gmx.de> > > Allow up to 256 GB RAM, which is the maximum a rp8440 machine (the very > last 64-bit PA-RISC machine) physically supports. > > Signed-off-by: Helge Deller <deller@gmx.de> > --- > hw/hppa/hppa_hardware.h | 2 ++ > hw/hppa/machine.c | 26 +++++++++++++++++++------- > 2 files changed, 21 insertions(+), 7 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
© 2016 - 2026 Red Hat, Inc.