From nobody Tue Feb 10 15:29: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+80821+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+80821+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1631804651; cv=none; d=zohomail.com; s=zohoarc; b=GDuF8h0h5Vr7JGXCCh8dkJD9GamZ52zl4DX2jbCwQptCVuDFMrmK0lfN1Qe4PDOCDoBAqO/0iA3EFGUhgNqXVaoRaR8Etv5/G0sRrlhBWoJYj9X33FIthXqmIvHIiiFLyZ5EoY4qDIOx35inwKg0q3UxLIxq9mzHZV+VcnFfkgI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631804651; 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=U2R8XTA5uZtcbbtEoA6Dt7yi+wIRcEdihBOzGhVuOqg=; b=OS/aJOj901iJv73DVCa3yb7gHeV+SKu/bjr9xNLyGfwviZ/8Sue0XI88o0eQIs9B1WIYirR9udMY0AXNaLiW4ZK+7iQ5ElPLYmLXEqJTa1IYYS1S/K6ePI8/oZ/XsYkIfu+dmy8Jz1Aziw6oeUMJI6qqq3s4wQ8lxGGlZ/+Z3so= 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+80821+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 1631804651233326.21686417013314; Thu, 16 Sep 2021 08:04:11 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id d5xqYY1788612xn1bWA1Wotf; Thu, 16 Sep 2021 08:04:10 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.566.1631804649896974365 for ; Thu, 16 Sep 2021 08:04:10 -0700 X-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-104-OgxB9PefONOitRq9tVvAqQ-1; Thu, 16 Sep 2021 11:04:04 -0400 X-MC-Unique: OgxB9PefONOitRq9tVvAqQ-1 X-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 BCB2C801B3D; Thu, 16 Sep 2021 15:04:03 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 07AB67A8CE; Thu, 16 Sep 2021 15:04:00 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 33DD818007A8; Thu, 16 Sep 2021 17:03:52 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Philippe Mathieu-Daude , Jiewen Yao , Jordan Justen , Ard Biesheuvel , Gerd Hoffmann Subject: [edk2-devel] [PATCH v3 2/3] OvmfPkg/PlatformPei: prefer etc/e820 for memory detection Date: Thu, 16 Sep 2021 17:03:51 +0200 Message-Id: <20210916150352.2662317-3-kraxel@redhat.com> In-Reply-To: <20210916150352.2662317-1-kraxel@redhat.com> References: <20210916150352.2662317-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: D7jMPA52s4ntbThuuuAsHRopx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1631804650; bh=WI9vnZ6mgZIutg88amKd3q3Q64Eptn87r48wUinkMFI=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=GMtlCpIshkcSkhn5RYJfW8bgqUUlftUXU6okLtnLCS/aGY+QlWet0DnqQNbGTyUwxO4 Y/WXFYM3FwTEo0mRqsU9C72NFZUThmrHqr1FvXa1wvC97Ns5SDOFijThSJgmw6uNS8YSW eUOkJS1zgN7HY06FNzwda/HKTrH7IkNxFH0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1631804651971100002 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 | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetec= t.c index 500c1d4d5231..1d942b12d519 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -293,9 +293,16 @@ GetSystemMemorySizeBelow4gb ( VOID ) { + EFI_STATUS Status; + UINT64 LowerMemorySize =3D 0; UINT8 Cmos0x34; UINT8 Cmos0x35; =20 + Status =3D ScanOrAdd64BitE820Ram (FALSE, &LowerMemorySize, NULL); + if (Status =3D=3D EFI_SUCCESS && LowerMemorySize > 0) { + return (UINT32)LowerMemorySize; + } + // // CMOS 0x34/0x35 specifies the system memory above 16 MB. // * CMOS(0x35) is the high byte @@ -722,7 +729,6 @@ QemuInitializeRam ( // Determine total memory size available // LowerMemorySize =3D GetSystemMemorySizeBelow4gb (); - UpperMemorySize =3D GetSystemMemorySizeAbove4gb (); =20 if (mBootMode =3D=3D BOOT_ON_S3_RESUME) { // @@ -769,8 +775,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.31.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 (#80821): https://edk2.groups.io/g/devel/message/80821 Mute This Topic: https://groups.io/mt/85653733/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-