From nobody Mon Feb 9 00:31:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1582130684; cv=none; d=zohomail.com; s=zohoarc; b=H/aWvoY34Vlt4UjegK6pAj2IH0Gc1SO1fZ4YneSjGgUUgxxortuVTHDYjofltiAgl5HIButl+k1ZzX8MDxIyhGGlnF1NqLThwl0GGRLZ/i6aUQ3vi9ly+dSDceFpcIfi06H2c8smlnSVSJiLJjyv/5eeKyQp55VyGZa2D4P0tiI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582130684; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7j1ZdeXTZC2HT7RhMlC+KQtGsCs/myjVSvJQGGbJblY=; b=OmHVvrEuIVz5sjZmDkx0QZvMErJ2a69mJm13QJA112mHdw5a15uq+VrEvxfqztt6t4fxHhXt0wcK/+kl8F8bwmQbOD3Jh5SjDz3dPjxjA83wKiX4nJMBGrOOdql5ql8WrvzeuhEHN8rmIwWHUsrSESNxPoOlM8LUwyxUW/ZzFz4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582130684360239.28562459047646; Wed, 19 Feb 2020 08:44:44 -0800 (PST) Received: from localhost ([::1]:56202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4SSo-0004hm-Ko for importer@patchew.org; Wed, 19 Feb 2020 11:44:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37742) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4RwT-0004bt-5q for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:11:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4RwR-0001MN-Nn for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:11:17 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50584 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4RwR-0001M3-JC for qemu-devel@nongnu.org; Wed, 19 Feb 2020 11:11:15 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-190-ebcgsxANOASjoWb0ydMgnA-1; Wed, 19 Feb 2020 11:11:10 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3200410B01C7 for ; Wed, 19 Feb 2020 16:11:09 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3B1090526; Wed, 19 Feb 2020 16:11:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582128675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7j1ZdeXTZC2HT7RhMlC+KQtGsCs/myjVSvJQGGbJblY=; b=SxWd7GXTAm/4wB9clA8rfqdzbVANpclyqBSPB8iaW2wZfAJsp0z6J5ree0NB5EsWDxvqEH WU5wlv5+aiydoIeJtV8hjktfcMsuuUfZ3we8eNoqdOdVdMV4A4LBGJcp/gM5JbK89MyY23 SC/4Jf4+rRWRo+WHDeKnHiL+4GpSocM= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH v6 63/79] ppc/ppc405_boards: add RAM size checks Date: Wed, 19 Feb 2020 11:09:37 -0500 Message-Id: <20200219160953.13771-64-imammedo@redhat.com> In-Reply-To: <20200219160953.13771-1-imammedo@redhat.com> References: <20200219160953.13771-1-imammedo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: ebcgsxANOASjoWb0ydMgnA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" If user provided non-sense RAM size, board will ignore it and continue running with fixed RAM size. Also RAM is going to be allocated by generic code, so it won't be possible for board to fix CLI. Make it error message and exit to force user fix CLI, instead of accepting non-sense CLI values. PS: move fixed RAM size into mc->default_ram_size, so that generic code will know how much to allocate. Signed-off-by: Igor Mammedov Acked-by: David Gibson Reviewed-by: Richard Henderson --- v2: * fix format string causing build failure on 32-bit host (Philippe Mathieu-Daud=C3=A9 ) v3: * use size_to_str() to pretty print size in MiB (Philippe Mathieu-Daud=C3=A9 / BALATON Zoltan ) --- hw/ppc/ppc405_boards.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index 1f721feed6..057882a5d2 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -40,6 +40,7 @@ #include "qemu/error-report.h" #include "hw/loader.h" #include "exec/address-spaces.h" +#include "qemu/cutils.h" =20 #define BIOS_FILENAME "ppc405_rom.bin" #define BIOS_SIZE (2 * MiB) @@ -137,7 +138,7 @@ static void ref405ep_fpga_init(MemoryRegion *sysmem, ui= nt32_t base) =20 static void ref405ep_init(MachineState *machine) { - ram_addr_t ram_size =3D machine->ram_size; + MachineClass *mc =3D MACHINE_GET_CLASS(machine); const char *kernel_filename =3D machine->kernel_filename; const char *kernel_cmdline =3D machine->kernel_cmdline; const char *initrd_filename =3D machine->initrd_filename; @@ -161,15 +162,21 @@ static void ref405ep_init(MachineState *machine) DriveInfo *dinfo; MemoryRegion *sysmem =3D get_system_memory(); =20 + if (machine->ram_size !=3D mc->default_ram_size) { + char *sz =3D size_to_str(mc->default_ram_size); + error_report("Invalid RAM size, should be %s", sz); + g_free(sz); + exit(EXIT_FAILURE); + } + /* XXX: fix this */ memory_region_allocate_system_memory(&ram_memories[0], NULL, "ef405ep.= ram", - 0x08000000); + machine->ram_size); ram_bases[0] =3D 0; - ram_sizes[0] =3D 0x08000000; + ram_sizes[0] =3D machine->ram_size; memory_region_init(&ram_memories[1], NULL, "ef405ep.ram1", 0); ram_bases[1] =3D 0x00000000; ram_sizes[1] =3D 0x00000000; - ram_size =3D 128 * MiB; env =3D ppc405ep_init(sysmem, ram_memories, ram_bases, ram_sizes, 33333333, &pic, kernel_filename =3D=3D NULL ? 0 : = 1); /* allocate SRAM */ @@ -227,7 +234,7 @@ static void ref405ep_init(MachineState *machine) if (linux_boot) { memset(&bd, 0, sizeof(bd)); bd.bi_memstart =3D 0x00000000; - bd.bi_memsize =3D ram_size; + bd.bi_memsize =3D machine->ram_size; bd.bi_flashstart =3D -bios_size; bd.bi_flashsize =3D -bios_size; bd.bi_flashoffset =3D 0; @@ -255,7 +262,7 @@ static void ref405ep_init(MachineState *machine) kernel_base =3D KERNEL_LOAD_ADDR; /* now we can load the kernel */ kernel_size =3D load_image_targphys(kernel_filename, kernel_base, - ram_size - kernel_base); + machine->ram_size - kernel_base); if (kernel_size < 0) { error_report("could not load kernel '%s'", kernel_filename); exit(1); @@ -266,7 +273,7 @@ static void ref405ep_init(MachineState *machine) if (initrd_filename) { initrd_base =3D INITRD_LOAD_ADDR; initrd_size =3D load_image_targphys(initrd_filename, initrd_ba= se, - ram_size - initrd_base); + machine->ram_size - initrd_b= ase); if (initrd_size < 0) { error_report("could not load initial ram disk '%s'", initrd_filename); @@ -304,6 +311,7 @@ static void ref405ep_class_init(ObjectClass *oc, void *= data) =20 mc->desc =3D "ref405ep"; mc->init =3D ref405ep_init; + mc->default_ram_size =3D 0x08000000; } =20 static const TypeInfo ref405ep_type =3D { @@ -408,7 +416,7 @@ static void taihu_cpld_init(MemoryRegion *sysmem, uint3= 2_t base) =20 static void taihu_405ep_init(MachineState *machine) { - ram_addr_t ram_size =3D machine->ram_size; + MachineClass *mc =3D MACHINE_GET_CLASS(machine); const char *kernel_filename =3D machine->kernel_filename; const char *initrd_filename =3D machine->initrd_filename; char *filename; @@ -425,10 +433,14 @@ static void taihu_405ep_init(MachineState *machine) int fl_idx; DriveInfo *dinfo; =20 - /* RAM is soldered to the board so the size cannot be changed */ - ram_size =3D 0x08000000; + if (machine->ram_size !=3D mc->default_ram_size) { + char *sz =3D size_to_str(mc->default_ram_size); + error_report("Invalid RAM size, should be %s", sz); + g_free(sz); + exit(EXIT_FAILURE); + } memory_region_allocate_system_memory(ram, NULL, "taihu_405ep.ram", - ram_size); + machine->ram_size); =20 ram_bases[0] =3D 0; ram_sizes[0] =3D 0x04000000; @@ -500,7 +512,7 @@ static void taihu_405ep_init(MachineState *machine) kernel_base =3D KERNEL_LOAD_ADDR; /* now we can load the kernel */ kernel_size =3D load_image_targphys(kernel_filename, kernel_base, - ram_size - kernel_base); + machine->ram_size - kernel_base); if (kernel_size < 0) { error_report("could not load kernel '%s'", kernel_filename); exit(1); @@ -509,7 +521,7 @@ static void taihu_405ep_init(MachineState *machine) if (initrd_filename) { initrd_base =3D INITRD_LOAD_ADDR; initrd_size =3D load_image_targphys(initrd_filename, initrd_ba= se, - ram_size - initrd_base); + machine->ram_size - initrd_b= ase); if (initrd_size < 0) { error_report("could not load initial ram disk '%s'", initrd_filename); @@ -533,6 +545,7 @@ static void taihu_class_init(ObjectClass *oc, void *dat= a) =20 mc->desc =3D "taihu"; mc->init =3D taihu_405ep_init; + mc->default_ram_size =3D 0x08000000; } =20 static const TypeInfo taihu_type =3D { --=20 2.18.1