From nobody Sat Sep 21 02:35:05 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+79839+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+79839+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629971752; cv=none; d=zohomail.com; s=zohoarc; b=ghUGAB69f+owklVftpwGGTyUcGvuMpXt1Q9CarjUIlLDPhSwt0oOiUtRL4zLHjSYhTKnIWjaMb18k7gUeyPjnfzMXjriIQ7V3YoxtsBZaZv6HL6TmphjoChZSDj/NZsJbCiGKVHHMF26lltnG216U4vHPSH4MaOiDAtcOxVBd0E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629971752; 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=oNlMVZx0z227DUlU/7nJomYlNpep3kn0FReWh0SzqCE=; b=ZDU9d+XeIjQLSfT8dcm/pril85q1XTJ0MJgvihO5XnvW0NgorNY3/hnoukcn8N5hq+6+GboNZ7ghAjG91w4VY74jDcr1KLH2abrFhH18PVE3tLqFfzF2qfH2lmTS07OyK57iSqIuiWogXSR+FfDhAJiGdPACmfJgaGwCIjiEHmo= 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+79839+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 1629971752530470.2693900769383; Thu, 26 Aug 2021 02:55:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Abv7YY1788612xAzBBQWF4KD; Thu, 26 Aug 2021 02:55:52 -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.web11.28255.1629971751188277138 for ; Thu, 26 Aug 2021 02:55:51 -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-90-t4LXFOjEP5OgbpaaTDu_Cg-1; Thu, 26 Aug 2021 05:55:46 -0400 X-MC-Unique: t4LXFOjEP5OgbpaaTDu_Cg-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 BB2E81019623; Thu, 26 Aug 2021 09:55:45 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8D22719C59; Thu, 26 Aug 2021 09:55:42 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0494D18003B6; 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 1/3] OvmfPkg/PlatformPei: ScanOrAdd64BitE820Ram improvements Date: Thu, 26 Aug 2021 11:55:38 +0200 Message-Id: <20210826095540.3798609-2-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.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: sfJ7OKM3alIWFH64rnSHnsftx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629971752; bh=Eb4+x/Bcd53sVfWoy0tAh16FF6+01f1aJi+k5JHaEd0=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=HHZIyzeSpPMU+sVLdZitAH9Pq7aT/MqLZLJF5aODyX+m8LMwoSvsyFowy9IxE/rGHQF G5o6wO/OQ7exs7L5SOJCyToW2pHfoQs6OS/U3/eGjnqcLL3APu7r283EM10HqHzmr2Pla 2YCeGEMXzaz3zekpFotHZklUy7LxAB1rYuI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629971754737100008 Content-Type: text/plain; charset="utf-8" Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3593 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. Signed-off-by: Gerd Hoffmann Reviewed-by: Philippe Mathieu-Daude --- OvmfPkg/PlatformPei/MemDetect.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetec= t.c index 2deec128f464..d7fb3e742be3 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -200,6 +200,8 @@ QemuUc32BaseInitialization ( STATIC EFI_STATUS ScanOrAdd64BitE820Ram ( + IN BOOLEAN AddHighHob, + OUT UINT64 *LowMemory OPTIONAL, OUT UINT64 *MaxAddress OPTIONAL ) { @@ -217,6 +219,9 @@ ScanOrAdd64BitE820Ram ( return EFI_PROTOCOL_ERROR; } =20 + if (LowMemory !=3D NULL) { + *LowMemory =3D 0; + } if (MaxAddress !=3D NULL) { *MaxAddress =3D BASE_4GB; } @@ -232,9 +237,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 @@ -254,11 +258,12 @@ 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, @@ -267,6 +272,15 @@ ScanOrAdd64BitE820Ram ( *MaxAddress )); } + if (LowMemory && Candidate > *LowMemory && Candidate < BASE_4GB) { + *LowMemory =3D Candidate; + DEBUG (( + DEBUG_VERBOSE, + "%a: LowMemory=3D0x%Lx\n", + __FUNCTION__, + *LowMemory + )); + } } } } @@ -353,7 +367,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 (); } @@ -754,7 +768,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.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 (#79839): https://edk2.groups.io/g/devel/message/79839 Mute This Topic: https://groups.io/mt/85157657/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-