[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 53/86] mips:mips_fulong2e: drop RAM size fixup
From: |
Igor Mammedov |
Subject: |
[PATCH v3 53/86] mips:mips_fulong2e: drop RAM size fixup |
Date: |
Thu, 16 Jan 2020 15:12:03 +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.
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 9eaa6e2..e4fba88 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.7.4
- [PATCH v2 46/86] x86:pc: use memdev for RAM, (continued)
- [PATCH v2 46/86] x86:pc: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 47/86] lm32:lm32_boards: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 49/86] m68k:an5206: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 48/86] lm32:milkymist: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 50/86] m68k:mcf5208: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 51/86] m68k:next-cube: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 52/86] mips:boston-cube: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 53/86] mips:mips_fulong2e: drop RAM size fixup, Igor Mammedov, 2020/01/15
- [PATCH v2 55/86] mips:mips_jazz: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 54/86] mips:mips_fulong2e: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 56/86] mips:mips_malta: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 57/86] mips:mips_mipssim: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 59/86] ppc:e500: drop RAM size fixup, Igor Mammedov, 2020/01/15
- [PATCH v2 58/86] mips:mips_r4k: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 60/86] ppc:e500: use memdev for RAM, Igor Mammedov, 2020/01/15
- [PATCH v2 62/86] ppc:mac_oldworld: use memdev for RAM, Igor Mammedov, 2020/01/15