From mboxrd@z Thu Jan 1 00:00:00 1970 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 Authentication-Results: mx.groups.io; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Wp8uJead; spf=pass (domain: redhat.com, ip: 170.10.133.124, mailfrom: kraxel@redhat.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638946945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iLrsvl8sLx3BP6SFsQ1gXGFGQ6Z/Q5rFhV7ivBoxk64=; b=Wp8uJeadXYHOfikZRIpLASsmKESjwtQ2BtWI81i5vHum3tbMbrw32IRyl+az5UjULCto3J tqP/d/j11eUGG4/1UCqHYGPbNrTnvp/fm0wjTPGGU/8d3TveI+TkuTbjMeTepLRbVHdo/n 00WagSM4y8qZfaDHuZ6x8cqn0FfoHx8= 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 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) 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) 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: [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 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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=3593 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/MemDetect.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; } + if (LowMemory != NULL) { + *LowMemory = 0; + } + if (MaxAddress != NULL) { *MaxAddress = BASE_4GB; } @@ -249,10 +255,8 @@ ScanOrAdd64BitE820Ram ( E820Entry.Length, E820Entry.Type )); - if ((E820Entry.Type == EfiAcpiAddressRangeMemory) && - (E820Entry.BaseAddr >= BASE_4GB)) - { - if (MaxAddress == NULL) { + if (E820Entry.Type == EfiAcpiAddressRangeMemory) { + if (AddHighHob && (E820Entry.BaseAddr >= BASE_4GB)) { UINT64 Base; UINT64 End; @@ -272,11 +276,13 @@ ScanOrAdd64BitE820Ram ( End )); } - } else { + } + + if (MaxAddress || LowMemory) { UINT64 Candidate; Candidate = E820Entry.BaseAddr + E820Entry.Length; - if (Candidate > *MaxAddress) { + if (MaxAddress && (Candidate > *MaxAddress)) { *MaxAddress = Candidate; DEBUG (( DEBUG_VERBOSE, @@ -285,6 +291,16 @@ ScanOrAdd64BitE820Ram ( *MaxAddress )); } + + if (LowMemory && (Candidate > *LowMemory) && (Candidate < BASE_4GB)) { + *LowMemory = Candidate; + DEBUG (( + DEBUG_VERBOSE, + "%a: LowMemory=0x%Lx\n", + __FUNCTION__, + *LowMemory + )); + } } } } @@ -369,7 +385,7 @@ GetFirstNonAddress ( // Otherwise, get the flat size of the memory above 4GB from the CMOS (which // can only express a size smaller than 1TB), and add it to 4GB. // - Status = ScanOrAdd64BitE820Ram (&FirstNonAddress); + Status = ScanOrAdd64BitE820Ram (FALSE, NULL, &FirstNonAddress); if (EFI_ERROR (Status)) { FirstNonAddress = BASE_4GB + GetSystemMemorySizeAbove4gb (); } @@ -802,7 +818,7 @@ QemuInitializeRam ( // entries. Otherwise, create a single memory HOB with the flat >=4GB // memory size read from the CMOS. // - Status = ScanOrAdd64BitE820Ram (NULL); + Status = ScanOrAdd64BitE820Ram (TRUE, NULL, NULL); if (EFI_ERROR (Status) && (UpperMemorySize != 0)) { AddMemoryBaseSizeHob (BASE_4GB, UpperMemorySize); } -- 2.33.1