From nobody Tue Feb 10 05:43:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+84493+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+84493+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1638946979; cv=none; d=zohomail.com; s=zohoarc; b=MhczNoEN/hMe/2tYJ3RiF3aIwTkSBlp7bWiaAG2aPC9lwOBfs3Jn0+G6Lh/T0wHxcFk+RnOxhQVDRzAYyH5n8G8IqzIRZDlhGkYBwcqtsPOA+pGvr5xP2ibTtIoun9BH0ZJCYUyynTfFJQbXJ3AMvZRVD64hr1CeOdEI1RYm8hk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638946979; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=fPWQs2XPll7PtX+dMB4zeXH2XOw7G3pChGBO6SyLdPc=; b=IWvKIbfP5A9oXHi51PI7JwMpyfiKoQ0+YX8JV5i2vPCU1eiUKZjaZPfQ7koGM6YClhjYGpkLExAUn1sIX0/vBfxcBPuBsbcq/uV8ZxKF3fEkq2L3p7No1KjuoLQcnG4BjLvl1pNfeVxAUidm62kjVJWX17Z+Y3LKmj5kOf2Lhyg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+84493+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 163894697969420.404560768897; Tue, 7 Dec 2021 23:02:59 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id 5U7oYY1788612x9CTr1XSAk6; Tue, 07 Dec 2021 23:02:59 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web09.9163.1638946978671392265 for ; Tue, 07 Dec 2021 23:02:58 -0800 X-Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-247-_ayRvrmbMzKkuTNwyA6d-g-1; Wed, 08 Dec 2021 02:02:54 -0500 X-MC-Unique: _ayRvrmbMzKkuTNwyA6d-g-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9A5EE1006AA3; Wed, 8 Dec 2021 07:02:53 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3583710A3945; Wed, 8 Dec 2021 07:02:07 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 212CE18000B2; Wed, 8 Dec 2021 08:01:46 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ard Biesheuvel , Pawel Polawski , Jordan Justen , Jiewen Yao , Gerd Hoffmann Subject: [edk2-devel] [PATCH v4 2/3] OvmfPkg/PlatformPei: prefer etc/e820 for memory detection Date: Wed, 8 Dec 2021 08:01:45 +0100 Message-Id: <20211208070146.1239368-3-kraxel@redhat.com> In-Reply-To: <20211208070146.1239368-1-kraxel@redhat.com> References: <20211208070146.1239368-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: IsnGAOQyFUXTfC7mksbgFXIXx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638946979; bh=aL6g1Q4hnApttTTF1qaBVQCkJ78RQXUbmJ+m0vZ8irw=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=MOI4L61KJbBMN5J+kQ5bsCLeNxyZbRmwTzzwk6ox0RXq1Nh40K+cL8MERzQHMNjH64K gF279UC6prRG36fDXOuH704Irt16YA7+aaU0s3DpQLeD8ft23Xm6qgymw+vZEyJC8Z0DQ GSa1sI0on/LEj74BhTyreCQlsos4pFfu218= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638946981689100001 Content-Type: text/plain; charset="utf-8" Prefer the e820 map provided via qemu firmware config interface for memory detection. Use rtc cmos only as fallback, which should be rarely needed these days as qemu supports etc/e820 since 2013. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3593 Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daude --- OvmfPkg/PlatformPei/MemDetect.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetec= t.c index 912889ab9b75..e0f2caa9cd3c 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -313,8 +313,15 @@ GetSystemMemorySizeBelow4gb ( VOID ) { - UINT8 Cmos0x34; - UINT8 Cmos0x35; + EFI_STATUS Status; + UINT64 LowerMemorySize =3D 0; + UINT8 Cmos0x34; + UINT8 Cmos0x35; + + Status =3D ScanOrAdd64BitE820Ram (FALSE, &LowerMemorySize, NULL); + if ((Status =3D=3D EFI_SUCCESS) && (LowerMemorySize > 0)) { + return (UINT32)LowerMemorySize; + } =20 // // CMOS 0x34/0x35 specifies the system memory above 16 MB. @@ -769,7 +776,6 @@ QemuInitializeRam ( // Determine total memory size available // LowerMemorySize =3D GetSystemMemorySizeBelow4gb (); - UpperMemorySize =3D GetSystemMemorySizeAbove4gb (); =20 if (mBootMode =3D=3D BOOT_ON_S3_RESUME) { // @@ -819,8 +825,11 @@ QemuInitializeRam ( // memory size read from the CMOS. // Status =3D ScanOrAdd64BitE820Ram (TRUE, NULL, NULL); - if (EFI_ERROR (Status) && (UpperMemorySize !=3D 0)) { - AddMemoryBaseSizeHob (BASE_4GB, UpperMemorySize); + if (EFI_ERROR (Status)) { + UpperMemorySize =3D GetSystemMemorySizeAbove4gb (); + if (UpperMemorySize !=3D 0) { + AddMemoryBaseSizeHob (BASE_4GB, UpperMemorySize); + } } } =20 --=20 2.33.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#84493): https://edk2.groups.io/g/devel/message/84493 Mute This Topic: https://groups.io/mt/87583852/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-