[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 51/79] mips/mips_fulong2e: drop RAM size fixup
From: |
Igor Mammedov |
Subject: |
[PATCH v5 51/79] mips/mips_fulong2e: drop RAM size fixup |
Date: |
Mon, 17 Feb 2020 12:34:24 -0500 |
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.
Signed-off-by: Igor Mammedov <address@hidden>
---
v2:
* fix format string cousing build failure on 32-bit host
(Philippe Mathieu-Daudé <address@hidden>)
v3:
* since size is ifxed, just hardcode 256Mb value as text
in error message
(BALATON Zoltan <address@hidden>)
CC: address@hidden
CC: address@hidden
CC: address@hidden
CC: address@hidden
CC: address@hidden
---
hw/mips/mips_fulong2e.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 2e043cbb98..cf00211bd2 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -296,7 +296,6 @@ static void mips_fulong2e_init(MachineState *machine)
MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *ram = g_new(MemoryRegion, 1);
MemoryRegion *bios = g_new(MemoryRegion, 1);
- ram_addr_t ram_size = machine->ram_size;
long bios_size;
uint8_t *spd_data;
Error *err = NULL;
@@ -315,10 +314,14 @@ static void mips_fulong2e_init(MachineState *machine)
qemu_register_reset(main_cpu_reset, cpu);
/* TODO: support more than 256M RAM as highmem */
- ram_size = 256 * MiB;
+ if (machine->ram_size != 256 * MiB) {
+ error_report("Invalid RAM size, should be 256MB");
+ exit(EXIT_FAILURE);
+ }
/* allocate RAM */
- memory_region_allocate_system_memory(ram, NULL, "fulong2e.ram", ram_size);
+ memory_region_allocate_system_memory(ram, NULL, "fulong2e.ram",
+ machine->ram_size);
memory_region_init_ram(bios, NULL, "fulong2e.bios", BIOS_SIZE,
&error_fatal);
memory_region_set_readonly(bios, true);
@@ -332,7 +335,7 @@ static void mips_fulong2e_init(MachineState *machine)
*/
if (kernel_filename) {
- loaderparams.ram_size = ram_size;
+ loaderparams.ram_size = machine->ram_size;
loaderparams.kernel_filename = kernel_filename;
loaderparams.kernel_cmdline = kernel_cmdline;
loaderparams.initrd_filename = initrd_filename;
@@ -378,7 +381,7 @@ static void mips_fulong2e_init(MachineState *machine)
}
/* Populate SPD eeprom data */
- spd_data = spd_data_generate(DDR, ram_size, &err);
+ spd_data = spd_data_generate(DDR, machine->ram_size, &err);
if (err) {
warn_report_err(err);
}
--
2.18.1
- [PATCH v5 46/79] m68k/an5206: use memdev for RAM, (continued)
- [PATCH v5 46/79] m68k/an5206: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 48/79] m68k/mcf5208: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 50/79] mips/boston: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 49/79] m68k/next-cube: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 52/79] mips/mips_fulong2e: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 51/79] mips/mips_fulong2e: drop RAM size fixup,
Igor Mammedov <=
- [PATCH v5 53/79] mips/mips_jazz: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 54/79] mips/mips_jazz: add max ram size check, Igor Mammedov, 2020/02/17
- [PATCH v5 55/79] mips/mips_malta: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 56/79] mips/mips_mipssim: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 58/79] ppc/e500: drop RAM size fixup, Igor Mammedov, 2020/02/17
- [PATCH v5 57/79] mips/mips_r4k: use memdev for RAM, Igor Mammedov, 2020/02/17
- [PATCH v5 59/79] ppc/e500: use memdev for RAM, Igor Mammedov, 2020/02/17