From nobody Tue Feb 10 00:58:04 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+84491+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+84491+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1638946949; cv=none; d=zohomail.com; s=zohoarc; b=WqBL++w1OjVuJD3FM1EfhFF7TKI1mL+yFyiR+W1BjiTpVySkacUEqfB9XFt2XWs10E1H5VBMhiTkA2XHG1prjr54oIVJhNDnWgXJ23lkE2otpxCXVhWuF0td3zbLoBh2ii6QeZVeEZuk3TFTxp3voQxT0Iy5o40N/BOAcgC0z3U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1638946949; 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=p/QtVojAxomzxuUqLx85hdZe7Mwejj2BDGkQMvCZqoQ=; b=DRYGM6+z2XdfFfoCjD7XsEQ01c21ktExvUjTR49d5MEmc4ufDB8BYXF6oUyUy8RReH4NKFtEl3tpOcfR/rWeMU36RsZV2RS0g/y0eZ0ShEpQ0KBvcKe9UnQqyLZsFN+X/DfImeWS2Nb9e39VlMOlpsDWvsgbxOXdNGKgaWX8LOA= 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+84491+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 16389469494821013.8951740729377; Tue, 7 Dec 2021 23:02:29 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id Lx8RYY1788612xVSYMEna11C; Tue, 07 Dec 2021 23:02:27 -0800 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.web09.9158.1638946946306653074 for ; Tue, 07 Dec 2021 23:02:27 -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-20--d22WovXN_ShOL5oDFK4fw-1; Wed, 08 Dec 2021 02:02:20 -0500 X-MC-Unique: -d22WovXN_ShOL5oDFK4fw-1 X-Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4A24410144E9; Wed, 8 Dec 2021 07:02:19 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D00AB1F3; Wed, 8 Dec 2021 07:01:47 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1BAD41800094; 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 1/3] OvmfPkg/PlatformPei: ScanOrAdd64BitE820Ram improvements Date: Wed, 8 Dec 2021 08:01:44 +0100 Message-Id: <20211208070146.1239368-2-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.23 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: VO1MBLsgIXduxMBYWB9SqVm8x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1638946947; bh=hgth9TqcZXhPttkBrt3wJJ+Nf66vnd3KTN0M4kMGsx0=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=MGE0GAduiGgjXkwPbX+vPIAtp0GbU1FV1Mc3/0Cpx+ZfcFPKYerp1hW82exaXfFnGck /n3z2t+MYNPyld80XA5IRdbs/8WUQACs+YwiwN80vvfTR23+sQ1P7LYEva9oGw8SCEQfN yBHcwZWxLLbqyw93W3Fy1koN6XEHD6K/dFg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1638946951898100002 Content-Type: text/plain; charset="utf-8" Add a bool parameter to ScanOrAdd64BitE820Ram to explicitly specify whenever ScanOrAdd64BitE820Ram should add HOBs for high memory (above 4G) or scan only. Also add a lowmem parameter so ScanOrAdd64BitE820Ram can report the memory size below 4G. This allows a more flexible usage of ScanOrAdd64BitE820Ram, a followup patch will use it for all memory detection. No functional change. Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3593 Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daude --- OvmfPkg/PlatformPei/MemDetect.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetec= t.c index 3f59a1ac79f6..912889ab9b75 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -216,6 +216,8 @@ QemuUc32BaseInitialization ( STATIC EFI_STATUS ScanOrAdd64BitE820Ram ( + IN BOOLEAN AddHighHob, + OUT UINT64 *LowMemory OPTIONAL, OUT UINT64 *MaxAddress OPTIONAL ) { @@ -234,6 +236,10 @@ ScanOrAdd64BitE820Ram ( return EFI_PROTOCOL_ERROR; } =20 + if (LowMemory !=3D NULL) { + *LowMemory =3D 0; + } + if (MaxAddress !=3D NULL) { *MaxAddress =3D BASE_4GB; } @@ -249,10 +255,8 @@ ScanOrAdd64BitE820Ram ( E820Entry.Length, E820Entry.Type )); - if ((E820Entry.Type =3D=3D EfiAcpiAddressRangeMemory) && - (E820Entry.BaseAddr >=3D BASE_4GB)) - { - if (MaxAddress =3D=3D NULL) { + if (E820Entry.Type =3D=3D EfiAcpiAddressRangeMemory) { + if (AddHighHob && (E820Entry.BaseAddr >=3D BASE_4GB)) { UINT64 Base; UINT64 End; =20 @@ -272,11 +276,13 @@ ScanOrAdd64BitE820Ram ( End )); } - } else { + } + + if (MaxAddress || LowMemory) { UINT64 Candidate; =20 Candidate =3D E820Entry.BaseAddr + E820Entry.Length; - if (Candidate > *MaxAddress) { + if (MaxAddress && (Candidate > *MaxAddress)) { *MaxAddress =3D Candidate; DEBUG (( DEBUG_VERBOSE, @@ -285,6 +291,16 @@ ScanOrAdd64BitE820Ram ( *MaxAddress )); } + + if (LowMemory && (Candidate > *LowMemory) && (Candidate < BASE_4GB= )) { + *LowMemory =3D Candidate; + DEBUG (( + DEBUG_VERBOSE, + "%a: LowMemory=3D0x%Lx\n", + __FUNCTION__, + *LowMemory + )); + } } } } @@ -369,7 +385,7 @@ GetFirstNonAddress ( // Otherwise, get the flat size of the memory above 4GB from the CMOS (w= hich // can only express a size smaller than 1TB), and add it to 4GB. // - Status =3D ScanOrAdd64BitE820Ram (&FirstNonAddress); + Status =3D ScanOrAdd64BitE820Ram (FALSE, NULL, &FirstNonAddress); if (EFI_ERROR (Status)) { FirstNonAddress =3D BASE_4GB + GetSystemMemorySizeAbove4gb (); } @@ -802,7 +818,7 @@ QemuInitializeRam ( // entries. Otherwise, create a single memory HOB with the flat >=3D4GB // memory size read from the CMOS. // - Status =3D ScanOrAdd64BitE820Ram (NULL); + Status =3D ScanOrAdd64BitE820Ram (TRUE, NULL, NULL); if (EFI_ERROR (Status) && (UpperMemorySize !=3D 0)) { AddMemoryBaseSizeHob (BASE_4GB, UpperMemorySize); } --=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 (#84491): https://edk2.groups.io/g/devel/message/84491 Mute This Topic: https://groups.io/mt/87583845/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-