From nobody Sun Nov 16 16:27:30 2025 Delivered-To: importer@patchew.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=reject dis=none) header.from=hp.com ARC-Seal: i=1; a=rsa-sha256; t=1601056739; cv=none; d=zohomail.com; s=zohoarc; b=OIybft+F0PkVA0IeiPX4UT5x0Jd6aMR+qbCW17RL5RkDjt79EZ3QpOhIgbMietYFn5JisuXGNQu88Sjn8hs0QW7WudoXEwdOM/0nz9uVg4EAgXi8L9VyqAX9p0ECVwdpkeASkMvdNPXPUycjQzq7lednzXPLfN6FWCgohUxPQug= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601056739; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=RL2TOtStrLqSqy6Ewcx68GEBcZMxRJkgmXTPdUppb7w=; b=GbnEJKHd0cH5jxHhleid9enCISx2We+JRIa9tTrZrS6vt1gVOsbsxOfG2nEoh1Ou0LW/aL0P5OcgmdXIQn+daVyunKBHCZHyWY25KAi8SuU7bZIqB+CZM0x/SXSDJSBBpgbaS89i/Ynoe5NUeU2GWvhRG0ZLZQUe6ypuHaCiejg= 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=reject 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 1601056739305106.28187614161936; Fri, 25 Sep 2020 10:58:59 -0700 (PDT) Received: from localhost ([::1]:40224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLrzk-0006g6-RX for importer@patchew.org; Fri, 25 Sep 2020 13:58:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLryt-00069t-5Q for qemu-devel@nongnu.org; Fri, 25 Sep 2020 13:58:03 -0400 Received: from us-smtp-delivery-162.mimecast.com ([216.205.24.162]:55576) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kLryq-0002kv-8r for qemu-devel@nongnu.org; Fri, 25 Sep 2020 13:58:02 -0400 Received: from g2t4619.austin.hp.com (g2t4619.austin.hp.com [15.73.212.82]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-221-GzHqQnS7OY6qQM4pKy0xow-1; Fri, 25 Sep 2020 13:57:57 -0400 Received: from g2t4689.austin.hpicorp.net (g2t4689.austin.hpicorp.net [15.94.10.175]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by g2t4619.austin.hp.com (Postfix) with ESMTPS id BC1D5317; Fri, 25 Sep 2020 17:57:55 +0000 (UTC) Received: from localhost.localdomain (unknown [15.52.82.192]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by g2t4689.austin.hpicorp.net (Postfix) with ESMTPS id 93CA211F; Fri, 25 Sep 2020 17:57:54 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hp.com; s=mimecast20180716; t=1601056678; 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; bh=RL2TOtStrLqSqy6Ewcx68GEBcZMxRJkgmXTPdUppb7w=; b=hxGFO6EFiNvQfFST3elEmrqvs/XrrRYyeFQphSlf3FFak/fkYc90ZhVhm4JXu8heQZKQRJ Vr1KZPxB2QEWH8GOq7L489o/cudXGnAz4qRrod9GI6Gg0ne8TfbDlc3csLfc/arwjQGmYJ MDmjo0dB726dH/n7rWPK5IjWa4WD5/M= X-MC-Unique: GzHqQnS7OY6qQM4pKy0xow-1 From: Erich Mcmillan To: qemu-devel@nongnu.org Cc: lersek@redhat.com, dgilbert@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com, imammedo@redhat.com, kraxel@redhat.com, Erich McMillan Subject: [PATCH v6] hw/i386/pc: add max combined fw size as machine configuration option Date: Fri, 25 Sep 2020 17:57:51 +0000 Message-Id: <20200925175751.4017-1-erich.mcmillan@hp.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA62A171 smtp.mailfrom=erich.mcmillan@hp.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: hp.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=216.205.24.162; envelope-from=erich.mcmillan@hp.com; helo=us-smtp-delivery-162.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/25 13:57:58 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -32 X-Spam_score: -3.3 X-Spam_bar: --- X-Spam_report: (-3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.199, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @hp.com) Content-Type: text/plain; charset="utf-8" From: Erich McMillan At Hewlett Packard Inc. we have a need for increased fw size to enable test= ing of our custom fw. Move return statement for early return Signed-off-by: Erich McMillan Reviewed-by: Laszlo Ersek --- Changes since v5: Move return statement for pc_machine_set_max_fw_size() to follow error= _setg() as early return. hw/i386/pc.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ hw/i386/pc_sysfw.c | 13 ++--------- include/hw/i386/pc.h | 2 ++ 3 files changed, 55 insertions(+), 11 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index d11daacc23..70c8c9adcf 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1869,6 +1869,50 @@ static void pc_machine_set_max_ram_below_4g(Object *= obj, Visitor *v, pcms->max_ram_below_4g =3D value; } =20 +static void pc_machine_get_max_fw_size(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) +{ + PCMachineState *pcms =3D PC_MACHINE(obj); + uint64_t value =3D pcms->max_fw_size; + + visit_type_size(v, name, &value, errp); +} + +static void pc_machine_set_max_fw_size(Object *obj, Visitor *v, + const char *name, void *opaque, + Error **errp) +{ + PCMachineState *pcms =3D PC_MACHINE(obj); + Error *error =3D NULL; + uint64_t value; + + visit_type_size(v, name, &value, &error); + if (error) { + error_propagate(errp, error); + return; + } + + /* + * We don't have a theoretically justifiable exact lower bound on the b= ase + * address of any flash mapping. In practice, the IO-APIC MMIO range is + * [0xFEE00000..0xFEE01000] -- see IO_APIC_DEFAULT_ADDRESS --, leaving = free + * only 18MB-4KB below 4G. For now, restrict the cumulative mapping to = 8MB in + * size. + */ + if (value > 16 * MiB) { + error_setg(errp, + "User specified max allowed firmware size %" PRIu64 " i= s " + "greater than 16MiB. If combined firwmare size exceeds " + "16MiB the system may not boot, or experience intermitt= ent" + "stability issues.", + value); + return; + } + + pcms->max_fw_size =3D value; +} + static void pc_machine_initfn(Object *obj) { PCMachineState *pcms =3D PC_MACHINE(obj); @@ -1884,6 +1928,7 @@ static void pc_machine_initfn(Object *obj) pcms->smbus_enabled =3D true; pcms->sata_enabled =3D true; pcms->pit_enabled =3D true; + pcms->max_fw_size =3D 8 * MiB; =20 pc_system_flash_create(pcms); pcms->pcspk =3D isa_new(TYPE_PC_SPEAKER); @@ -2004,6 +2049,12 @@ static void pc_machine_class_init(ObjectClass *oc, v= oid *data) =20 object_class_property_add_bool(oc, PC_MACHINE_PIT, pc_machine_get_pit, pc_machine_set_pit); + + object_class_property_add(oc, PC_MACHINE_MAX_FW_SIZE, "size", + pc_machine_get_max_fw_size, pc_machine_set_max_fw_size, + NULL, NULL); + object_class_property_set_description(oc, PC_MACHINE_MAX_FW_SIZE, + "Maximum combined firmware size"); } =20 static const TypeInfo pc_machine_info =3D { diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c index b6c0822fe3..22450ba0ef 100644 --- a/hw/i386/pc_sysfw.c +++ b/hw/i386/pc_sysfw.c @@ -39,15 +39,6 @@ #include "hw/block/flash.h" #include "sysemu/kvm.h" =20 -/* - * We don't have a theoretically justifiable exact lower bound on the base - * address of any flash mapping. In practice, the IO-APIC MMIO range is - * [0xFEE00000..0xFEE01000] -- see IO_APIC_DEFAULT_ADDRESS --, leaving free - * only 18MB-4KB below 4G. For now, restrict the cumulative mapping to 8MB= in - * size. - */ -#define FLASH_SIZE_LIMIT (8 * MiB) - #define FLASH_SECTOR_SIZE 4096 =20 static void pc_isa_bios_init(MemoryRegion *rom_memory, @@ -182,10 +173,10 @@ static void pc_system_flash_map(PCMachineState *pcms, } if ((hwaddr)size !=3D size || total_size > HWADDR_MAX - size - || total_size + size > FLASH_SIZE_LIMIT) { + || total_size + size > pcms->max_fw_size) { error_report("combined size of system firmware exceeds " "%" PRIu64 " bytes", - FLASH_SIZE_LIMIT); + pcms->max_fw_size); exit(1); } =20 diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index fe52e165b2..f7c8e7cbfe 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -43,6 +43,7 @@ struct PCMachineState { bool smbus_enabled; bool sata_enabled; bool pit_enabled; + uint64_t max_fw_size; =20 /* NUMA information: */ uint64_t numa_nodes; @@ -59,6 +60,7 @@ struct PCMachineState { #define PC_MACHINE_SMBUS "smbus" #define PC_MACHINE_SATA "sata" #define PC_MACHINE_PIT "pit" +#define PC_MACHINE_MAX_FW_SIZE "max-fw-size" =20 /** * PCMachineClass: --=20 2.25.1