[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 57/80] ppc/e500: drop RAM size fixup
From: |
Igor Mammedov |
Subject: |
[PATCH v4 57/80] ppc/e500: drop RAM size fixup |
Date: |
Fri, 31 Jan 2020 16:09:27 +0100 |
If user provided non-sense RAM size, board will complain and
continue running with max RAM size supported.
Also RAM is going to be allocated by generic code, so it won't be
possible for board to fix things up for user.
Make it error message and exit to force user fix CLI,
instead of accepting non-sense CLI values.
While at it, replace usage of global ram_size with
machine->ram_size
Signed-off-by: Igor Mammedov <address@hidden>
Acked-by: David Gibson <address@hidden>
---
v2:
* fix format string cousing build failure on 32-bit host
(Philippe Mathieu-Daudé <address@hidden>)
---
hw/ppc/e500.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 886442e..960024b 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -906,12 +906,14 @@ void ppce500_init(MachineState *machine)
env = firstenv;
- /* Fixup Memory size on a alignment boundary */
- ram_size &= ~(RAM_SIZES_ALIGN - 1);
- machine->ram_size = ram_size;
+ if (!QEMU_IS_ALIGNED(machine->ram_size, RAM_SIZES_ALIGN)) {
+ error_report("RAM size must be multiple of %" PRIu64, RAM_SIZES_ALIGN);
+ exit(EXIT_FAILURE);
+ }
/* Register Memory */
- memory_region_allocate_system_memory(ram, NULL, "mpc8544ds.ram", ram_size);
+ memory_region_allocate_system_memory(ram, NULL, "mpc8544ds.ram",
+ machine->ram_size);
memory_region_add_subregion(address_space_mem, 0, ram);
dev = qdev_create(NULL, "e500-ccsr");
@@ -1083,7 +1085,7 @@ void ppce500_init(MachineState *machine)
kernel_base = cur_base;
kernel_size = load_image_targphys(machine->kernel_filename,
cur_base,
- ram_size - cur_base);
+ machine->ram_size - cur_base);
if (kernel_size < 0) {
error_report("could not load kernel '%s'",
machine->kernel_filename);
@@ -1097,7 +1099,7 @@ void ppce500_init(MachineState *machine)
if (machine->initrd_filename) {
initrd_base = (cur_base + INITRD_LOAD_PAD) & ~INITRD_PAD_MASK;
initrd_size = load_image_targphys(machine->initrd_filename,
initrd_base,
- ram_size - initrd_base);
+ machine->ram_size - initrd_base);
if (initrd_size < 0) {
error_report("could not load initial ram disk '%s'",
@@ -1115,7 +1117,7 @@ void ppce500_init(MachineState *machine)
* ensures enough space between kernel and initrd.
*/
dt_base = (loadaddr + payload_size + DTC_LOAD_PAD) & ~DTC_PAD_MASK;
- if (dt_base + DTB_MAX_SIZE > ram_size) {
+ if (dt_base + DTB_MAX_SIZE > machine->ram_size) {
error_report("not enough memory for device tree");
exit(1);
}
--
2.7.4
- [PATCH v4 50/80] mips/boston: use memdev for RAM, (continued)
- [PATCH v4 50/80] mips/boston: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 44/80] lm32/lm32_boards: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 46/80] m68k/an5206: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 47/80] m68k/q800: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 48/80] m68k/mcf5208: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 51/80] mips/mips_fulong2e: drop RAM size fixup, Igor Mammedov, 2020/01/31
- [PATCH v4 55/80] mips/mips_mipssim: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 52/80] mips/mips_fulong2e: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 53/80] mips/mips_jazz: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 58/80] ppc/e500: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 57/80] ppc/e500: drop RAM size fixup,
Igor Mammedov <=
- [PATCH v4 56/80] mips/mips_r4k: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 54/80] mips/mips_malta: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 60/80] ppc/mac_oldworld: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 61/80] ppc/pnv: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 63/80] ppc/ppc405_boards: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 67/80] ppc/spapr: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 59/80] ppc/mac_newworld: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 66/80] ppc/prep: use memdev for RAM, Igor Mammedov, 2020/01/31
- [PATCH v4 62/80] ppc/ppc405_boards: add RAM size checks, Igor Mammedov, 2020/01/31
- [PATCH v4 69/80] ppc/virtex_ml507: use memdev for RAM, Igor Mammedov, 2020/01/31