The i.MX25 PDK board has 2 banks for SDRAM, each can
address up to 256 MiB. So the total RAM usable for this
board is 512M. When we ask for more we get a misleading
error message:
$ qemu-system-arm -M imx25-pdk -m 513M
qemu-system-arm: Invalid RAM size, should be 128 MiB
Update the error message to better match the reality:
$ qemu-system-arm -M imx25-pdk -m 513M
qemu-system-arm: RAM size more than 512 MiB is not supported
Fixes: bf350daae02 ("arm/imx25_pdk: drop RAM size fixup")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/arm/imx25_pdk.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c
index 1c201d0d8ed..51fde71b1bd 100644
--- a/hw/arm/imx25_pdk.c
+++ b/hw/arm/imx25_pdk.c
@@ -67,7 +67,6 @@ static struct arm_boot_info imx25_pdk_binfo;
static void imx25_pdk_init(MachineState *machine)
{
- MachineClass *mc = MACHINE_GET_CLASS(machine);
IMX25PDK *s = g_new0(IMX25PDK, 1);
unsigned int ram_size;
unsigned int alias_offset;
@@ -79,8 +78,8 @@ static void imx25_pdk_init(MachineState *machine)
/* We need to initialize our memory */
if (machine->ram_size > (FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE)) {
- char *sz = size_to_str(mc->default_ram_size);
- error_report("Invalid RAM size, should be %s", sz);
+ char *sz = size_to_str(FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE);
+ error_report("RAM size more than %s is not supported", sz);
g_free(sz);
exit(EXIT_FAILURE);
}
--
2.26.3
On 4/7/21 3:56 PM, Philippe Mathieu-Daudé wrote: > The i.MX25 PDK board has 2 banks for SDRAM, each can > address up to 256 MiB. So the total RAM usable for this > board is 512M. When we ask for more we get a misleading > error message: > > $ qemu-system-arm -M imx25-pdk -m 513M > qemu-system-arm: Invalid RAM size, should be 128 MiB > > Update the error message to better match the reality: > > $ qemu-system-arm -M imx25-pdk -m 513M > qemu-system-arm: RAM size more than 512 MiB is not supported > > Fixes: bf350daae02 ("arm/imx25_pdk: drop RAM size fixup") > Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org> > --- > hw/arm/imx25_pdk.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
Hi Peter, Could you take this patch via the ARM tree? It has been reviewed twice. Thanks, Phil. On 4/8/21 12:56 AM, Philippe Mathieu-Daudé wrote: > The i.MX25 PDK board has 2 banks for SDRAM, each can > address up to 256 MiB. So the total RAM usable for this > board is 512M. When we ask for more we get a misleading > error message: > > $ qemu-system-arm -M imx25-pdk -m 513M > qemu-system-arm: Invalid RAM size, should be 128 MiB > > Update the error message to better match the reality: > > $ qemu-system-arm -M imx25-pdk -m 513M > qemu-system-arm: RAM size more than 512 MiB is not supported > > Fixes: bf350daae02 ("arm/imx25_pdk: drop RAM size fixup") > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/arm/imx25_pdk.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c > index 1c201d0d8ed..51fde71b1bd 100644 > --- a/hw/arm/imx25_pdk.c > +++ b/hw/arm/imx25_pdk.c > @@ -67,7 +67,6 @@ static struct arm_boot_info imx25_pdk_binfo; > > static void imx25_pdk_init(MachineState *machine) > { > - MachineClass *mc = MACHINE_GET_CLASS(machine); > IMX25PDK *s = g_new0(IMX25PDK, 1); > unsigned int ram_size; > unsigned int alias_offset; > @@ -79,8 +78,8 @@ static void imx25_pdk_init(MachineState *machine) > > /* We need to initialize our memory */ > if (machine->ram_size > (FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE)) { > - char *sz = size_to_str(mc->default_ram_size); > - error_report("Invalid RAM size, should be %s", sz); > + char *sz = size_to_str(FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE); > + error_report("RAM size more than %s is not supported", sz); > g_free(sz); > exit(EXIT_FAILURE); > } >
On Sun, 2 May 2021 at 17:29, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > Hi Peter, > > Could you take this patch via the ARM tree? > It has been reviewed twice. Sure; applied to target-arm.next, thanks. -- PMM
On Thu, 8 Apr 2021 00:56:08 +0200 Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > The i.MX25 PDK board has 2 banks for SDRAM, each can > address up to 256 MiB. So the total RAM usable for this > board is 512M. When we ask for more we get a misleading > error message: > > $ qemu-system-arm -M imx25-pdk -m 513M > qemu-system-arm: Invalid RAM size, should be 128 MiB > > Update the error message to better match the reality: > > $ qemu-system-arm -M imx25-pdk -m 513M > qemu-system-arm: RAM size more than 512 MiB is not supported > > Fixes: bf350daae02 ("arm/imx25_pdk: drop RAM size fixup") > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/arm/imx25_pdk.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c > index 1c201d0d8ed..51fde71b1bd 100644 > --- a/hw/arm/imx25_pdk.c > +++ b/hw/arm/imx25_pdk.c > @@ -67,7 +67,6 @@ static struct arm_boot_info imx25_pdk_binfo; > > static void imx25_pdk_init(MachineState *machine) > { > - MachineClass *mc = MACHINE_GET_CLASS(machine); > IMX25PDK *s = g_new0(IMX25PDK, 1); > unsigned int ram_size; > unsigned int alias_offset; > @@ -79,8 +78,8 @@ static void imx25_pdk_init(MachineState *machine) > > /* We need to initialize our memory */ > if (machine->ram_size > (FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE)) { > - char *sz = size_to_str(mc->default_ram_size); > - error_report("Invalid RAM size, should be %s", sz); > + char *sz = size_to_str(FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE); > + error_report("RAM size more than %s is not supported", sz); > g_free(sz); > exit(EXIT_FAILURE); > }
© 2016 - 2024 Red Hat, Inc.