| Message ID | 20190821030945.473-1-joel@jms.id.au |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] ppc/pnv: Set default ram size to 1.75GB | expand |
On Wed, Aug 21, 2019 at 12:39:45PM +0930, Joel Stanley wrote: > This makes the powernv machine easier for end users as the default > initrd address (1.5GB) is now within RAM. > > This uses less than 2GB of RAM to ensure 32 bit Qemu still works. > > Signed-off-by: Joel Stanley <joel@jms.id.au> Applied to ppc-for-4.2, in place of the earlier version. -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index d95086fbbd1e..5000db5faab5 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -1361,7 +1361,9 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data) * storage */ mc->no_parallel = 1; mc->default_boot_order = NULL; - mc->default_ram_size = 1 * GiB; + /* RAM defaults to less than 2048 for 32-bit hosts, and large + * enough to fit the maximum initrd size at it's load address */ + mc->default_ram_size = INITRD_LOAD_ADDR + INITRD_MAX_SIZE; xic->icp_get = pnv_icp_get; xic->ics_get = pnv_ics_get; xic->ics_resend = pnv_ics_resend;
This makes the powernv machine easier for end users as the default initrd address (1.5GB) is now within RAM. This uses less than 2GB of RAM to ensure 32 bit Qemu still works. Signed-off-by: Joel Stanley <joel@jms.id.au> -- v2: Use INITRD defines, whcih come out to 1.75, instead of 2GB --- hw/ppc/pnv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.23.0.rc1