[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 034/136] arm/xilinx_zynq: drop RAM size fixup
From: |
Paolo Bonzini |
Subject: |
[PULL 034/136] arm/xilinx_zynq: drop RAM size fixup |
Date: |
Tue, 25 Feb 2020 12:49:24 +0100 |
From: Igor Mammedov <address@hidden>
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>
Reviewed-by: Alistair Francis <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
---
hw/arm/xilinx_zynq.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 3a0fa5b..f548c44 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -158,7 +158,6 @@ static inline void zynq_init_spi_flashes(uint32_t
base_addr, qemu_irq irq,
static void zynq_init(MachineState *machine)
{
- ram_addr_t ram_size = machine->ram_size;
ARMCPU *cpu;
MemoryRegion *address_space_mem = get_system_memory();
MemoryRegion *ext_ram = g_new(MemoryRegion, 1);
@@ -168,6 +167,12 @@ static void zynq_init(MachineState *machine)
qemu_irq pic[64];
int n;
+ /* max 2GB ram */
+ if (machine->ram_size > 2 * GiB) {
+ error_report("RAM size more than 2 GiB is not supported");
+ exit(EXIT_FAILURE);
+ }
+
cpu = ARM_CPU(object_new(machine->cpu_type));
/* By default A9 CPUs have EL3 enabled. This board does not
@@ -184,14 +189,9 @@ static void zynq_init(MachineState *machine)
&error_fatal);
object_property_set_bool(OBJECT(cpu), true, "realized", &error_fatal);
- /* max 2GB ram */
- if (ram_size > 0x80000000) {
- ram_size = 0x80000000;
- }
-
/* DDR remapped to address zero. */
memory_region_allocate_system_memory(ext_ram, NULL, "zynq.ext_ram",
- ram_size);
+ machine->ram_size);
memory_region_add_subregion(address_space_mem, 0, ext_ram);
/* 256K of on-chip memory */
@@ -300,7 +300,7 @@ static void zynq_init(MachineState *machine)
sysbus_connect_irq(busdev, 0, pic[40 - IRQ_OFFSET]);
sysbus_mmio_map(busdev, 0, 0xF8007000);
- zynq_binfo.ram_size = ram_size;
+ zynq_binfo.ram_size = machine->ram_size;
zynq_binfo.nb_cpus = 1;
zynq_binfo.board_id = 0xd32;
zynq_binfo.loader_start = 0;
--
1.8.3.1
- [PULL 019/136] arm/kzm: use memdev for RAM, (continued)
- [PULL 019/136] arm/kzm: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 020/136] arm/mcimx6ul-evk: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 021/136] arm/mcimx7d-sabre: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 028/136] arm/sabrelite: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 032/136] arm/vexpress: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 026/136] arm/omap_sx1: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 031/136] arm/versatilepb: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 029/136] arm/raspi: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 035/136] arm/xilinx_zynq: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 039/136] null-machine: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 034/136] arm/xilinx_zynq: drop RAM size fixup,
Paolo Bonzini <=
- [PULL 038/136] s390x/s390-virtio-ccw: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 033/136] arm/virt: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 030/136] arm/sbsa-ref: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 042/136] x86/microvm: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 044/136] lm32/lm32_boards: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 037/136] arm/xlnx-zcu102: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 041/136] hppa: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 043/136] x86/pc: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 036/136] arm/xlnx-versal-virt: use memdev for RAM, Paolo Bonzini, 2020/02/25
- [PULL 040/136] cris/axis_dev88: use memdev for RAM, Paolo Bonzini, 2020/02/25