diff mbox series

raspi4b: Reduce RAM to 1Gb on 32-bit hosts

Message ID 20240329150155.357043-1-clg@redhat.com
State New
Headers show
Series raspi4b: Reduce RAM to 1Gb on 32-bit hosts | expand

Commit Message

Cédric Le Goater March 29, 2024, 3:01 p.m. UTC 
Change the board revision number and RAM size to 1Gb on 32-bit hosts.
On these systems, RAM has a 2047 MB limit and this breaks the tests.

Fixes: 7785e8ea2204 ("hw/arm: Introduce Raspberry PI 4 machine")
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---
 hw/arm/raspi4b.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Peter Maydell April 2, 2024, 9:14 a.m. UTC | #1 
On Fri, 29 Mar 2024 at 15:02, Cédric Le Goater <clg@redhat.com> wrote:
>
> Change the board revision number and RAM size to 1Gb on 32-bit hosts.
> On these systems, RAM has a 2047 MB limit and this breaks the tests.
>
> Fixes: 7785e8ea2204 ("hw/arm: Introduce Raspberry PI 4 machine")
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
>  hw/arm/raspi4b.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c
> index cb1b1f2f147e8685a1dba6f137335ea0bc89bca5..85877880fc706d216de04ff1e081d66e6080ebac 100644
> --- a/hw/arm/raspi4b.c
> +++ b/hw/arm/raspi4b.c
> @@ -112,7 +112,11 @@ static void raspi4b_machine_class_init(ObjectClass *oc, void *data)
>      MachineClass *mc = MACHINE_CLASS(oc);
>      RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
>
> +#if HOST_LONG_BITS == 32
> +    rmc->board_rev = 0xa03111; /* Revision 1.1, 1 Gb RAM */
> +#else
>      rmc->board_rev = 0xb03115; /* Revision 1.5, 2 Gb RAM */
> +#endif
>      raspi_machine_class_common_init(mc, rmc->board_rev);
>      mc->init = raspi4b_machine_init;
>  }

Running "make check" on a 32-bit host has clearly fallen off
our CI config...

Applied to target-arm.next for 9.0, thanks.

-- PMM
diff mbox series

Patch

diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c
index cb1b1f2f147e8685a1dba6f137335ea0bc89bca5..85877880fc706d216de04ff1e081d66e6080ebac 100644
--- a/hw/arm/raspi4b.c
+++ b/hw/arm/raspi4b.c
@@ -112,7 +112,11 @@  static void raspi4b_machine_class_init(ObjectClass *oc, void *data)
     MachineClass *mc = MACHINE_CLASS(oc);
     RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc);
 
+#if HOST_LONG_BITS == 32
+    rmc->board_rev = 0xa03111; /* Revision 1.1, 1 Gb RAM */
+#else
     rmc->board_rev = 0xb03115; /* Revision 1.5, 2 Gb RAM */
+#endif
     raspi_machine_class_common_init(mc, rmc->board_rev);
     mc->init = raspi4b_machine_init;
 }