From nobody Sat Sep 21 02:50:43 2024 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+79840+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+79840+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629971753; cv=none; d=zohomail.com; s=zohoarc; b=kTBPyeNV2XcZmbmqtAA2dnrNw2fFpVlKgIoNi3jF8ejJs9wBmI0Pl9mt4L+xSGABtP0xqS6BFzjmJLs16GF5SbupmYVVCyWkBmjxD1cU84J20eIY8TvPYOx40t68DpbhEGZb2BBYoL6EyxXfpoLVUsfFcYfCi3rXujkQ3RMLlzQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629971753; 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=SvFjo+b3CHt3kX7oVow+JI//g7i2xQm3Z9cRPRN+jXQ=; b=lgUtZylnQtpTgFDCUW2VvGeZ5zuAANFWk7QnD57hI64UvXxWybR9u1zUoJI1DgwX4zcJT7v+PN9j3NyLNdSk6N14SPTut7vddznxhANyW7qD8Prd/Am+zxaBTXQiJNoSwgkIvC9hggLERGmUcAoTvHK0E/sWyCfPFg1kIwdQE94= 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+79840+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 1629971753756837.5342228195158; Thu, 26 Aug 2021 02:55:53 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 9KVjYY1788612xUQwxr3hhP5; Thu, 26 Aug 2021 02:55:53 -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.web08.28212.1629971752744860566 for ; Thu, 26 Aug 2021 02:55:53 -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-394-Tc7aI6CRPBakJPVZHfggOA-1; Thu, 26 Aug 2021 05:55:48 -0400 X-MC-Unique: Tc7aI6CRPBakJPVZHfggOA-1 X-Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 84830804302; Thu, 26 Aug 2021 09:55:47 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 49A2D18432; Thu, 26 Aug 2021 09:55:47 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0A01418007A1; Thu, 26 Aug 2021 11:55:41 +0200 (CEST) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Philippe Mathieu-Daude , Gerd Hoffmann Subject: [edk2-devel] [PATCH v2 2/3] OvmfPkg/PlatformPei: prefer etc/e820 for memory detection Date: Thu, 26 Aug 2021 11:55:39 +0200 Message-Id: <20210826095540.3798609-3-kraxel@redhat.com> In-Reply-To: <20210826095540.3798609-1-kraxel@redhat.com> References: <20210826095540.3798609-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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: pFxiCDHOInmkXQRIJ31lcJ80x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629971753; bh=P8cXGZMfjVnIvv1fZ0tdYY7DORPh7U6GVR+Qv76fcKo=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=N1IuFbYrYmNmWcH5K+ICVKwvB3r+jEdD6PHSV3MH754S4aze53VprmfmtIWaVheHZQL zYnPtGor++NSiug/obKtzIOPA+QL2YSemai9atzaWtHkA+s4ZwhbmihXqRgp4VMHacR4m /8NXeBlmYrQcIVeXsqJCf21akPwT4+M9qWY= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629972655959100001 Content-Type: text/plain; charset="utf-8" Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3593 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. 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 d7fb3e742be3..20154255324b 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 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 (#79840): https://edk2.groups.io/g/devel/message/79840 Mute This Topic: https://groups.io/mt/85157658/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-