From nobody Sat Sep 21 03:14: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+79841+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+79841+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629971756; cv=none; d=zohomail.com; s=zohoarc; b=Ij+4TvMX6kwymcWknNYPKrSgOf26mHESS3nsGTkTnCCIuFszEimTqmwbjSvImPU3KQDXXNLcEqSXG099NHQi1nt8fImQ1O33TeC58dapj4WfkF8DmiBvyIt+MNeLpc8hwt7WjAd5JrWNOKtWYBwqDFyVXFngXxqjPiQbWRyI63s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629971756; 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=lB6c4+jz9W6xumA2q/W1lu+t24ohCUbDbOj+RTVXNvE=; b=DoWzKn9o30IH/mQzfivVCQXKVhLDx1dBFcFT+T2BFLd6FcdnjCr7f33g/nP2vW/qiUmkQWcRWDIT1kwTsYv+5mMlRTKViiIbV8aJBt978aFB8b/iNkbKfSt9FPQVQRDLs7sjnuIqZTjwsZSjRoUFMUeFzC5KatGFy248BmnUUAQ= 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+79841+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 1629971756735530.0790805116656; Thu, 26 Aug 2021 02:55:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id a1s4YY1788612xilNOZc0KTD; Thu, 26 Aug 2021 02:55:56 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.groups.io with SMTP id smtpd.web10.28505.1629971755587026173 for ; Thu, 26 Aug 2021 02:55:55 -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-589-6VWMLPb7Of6YC9TzHoXGZQ-1; Thu, 26 Aug 2021 05:55:51 -0400 X-MC-Unique: 6VWMLPb7Of6YC9TzHoXGZQ-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5E8CF802923; Thu, 26 Aug 2021 09:55:50 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3DD69100763B; Thu, 26 Aug 2021 09:55:47 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 0CB4D1800909; 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 3/3] RFC: OvmfPkg/PlatformPei: stop using cmos for memory detection Date: Thu, 26 Aug 2021 11:55:40 +0200 Message-Id: <20210826095540.3798609-4-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.22 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: p84bIdyrhuHhghkBTI8xADGCx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1629971756; bh=rbXE9cjx7nPyKxZ1A8TyJJfn30Y4mrpL8fyFjS/L/6U=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=qy2HyxOBLvB29Ak1YDTOwAkwohb8cUVSccJBdHThZmId752uyj76g4b8ws8G7gb+OzG 9uLofR8cLGFFbq3oZerzxDxI/nqrpt5Plu8dRe9jy7MeCKDmztZHBna2cVIjgAXk0mxxs PjkAC5kDwWVBLulSzcRDzBMGn7nGbvE5Ouc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1629971757060100002 Content-Type: text/plain; charset="utf-8" Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3593 Not needed for qemu 1.7 (released in 2013) and newer. Signed-off-by: Gerd Hoffmann --- OvmfPkg/PlatformPei/MemDetect.c | 58 ++------------------------------- 1 file changed, 3 insertions(+), 55 deletions(-) diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetec= t.c index 20154255324b..8d2c7f432472 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -37,7 +37,6 @@ Module Name: #include =20 #include "Platform.h" -#include "Cmos.h" =20 UINT8 mPhysMemAddressWidth; =20 @@ -295,52 +294,11 @@ GetSystemMemorySizeBelow4gb ( { 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; - } + ASSERT (Status =3D=3D EFI_SUCCESS && LowerMemorySize > 0); + return LowerMemorySize; =20 - // - // CMOS 0x34/0x35 specifies the system memory above 16 MB. - // * CMOS(0x35) is the high byte - // * CMOS(0x34) is the low byte - // * The size is specified in 64kb chunks - // * Since this is memory above 16MB, the 16MB must be added - // into the calculation to get the total memory size. - // - - Cmos0x34 =3D (UINT8) CmosRead8 (0x34); - Cmos0x35 =3D (UINT8) CmosRead8 (0x35); - - return (UINT32) (((UINTN)((Cmos0x35 << 8) + Cmos0x34) << 16) + SIZE_16MB= ); -} - - -STATIC -UINT64 -GetSystemMemorySizeAbove4gb ( - ) -{ - UINT32 Size; - UINTN CmosIndex; - - // - // CMOS 0x5b-0x5d specifies the system memory above 4GB MB. - // * CMOS(0x5d) is the most significant size byte - // * CMOS(0x5c) is the middle size byte - // * CMOS(0x5b) is the least significant size byte - // * The size is specified in 64kb chunks - // - - Size =3D 0; - for (CmosIndex =3D 0x5d; CmosIndex >=3D 0x5b; CmosIndex--) { - Size =3D (UINT32) (Size << 8) + (UINT32) CmosRead8 (CmosIndex); - } - - return LShiftU64 (Size, 16); } =20 =20 @@ -371,12 +329,9 @@ GetFirstNonAddress ( // If QEMU presents an E820 map, then get the highest exclusive >=3D4GB = RAM // address from it. This can express an address >=3D 4GB+1TB. // - // 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 (FALSE, NULL, &FirstNonAddress); if (EFI_ERROR (Status)) { - FirstNonAddress =3D BASE_4GB + GetSystemMemorySizeAbove4gb (); + FirstNonAddress =3D BASE_4GB; } =20 // @@ -719,7 +674,6 @@ QemuInitializeRam ( ) { UINT64 LowerMemorySize; - UINT64 UpperMemorySize; MTRR_SETTINGS MtrrSettings; EFI_STATUS Status; =20 @@ -775,12 +729,6 @@ QemuInitializeRam ( // memory size read from the CMOS. // Status =3D ScanOrAdd64BitE820Ram (TRUE, NULL, NULL); - 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 (#79841): https://edk2.groups.io/g/devel/message/79841 Mute This Topic: https://groups.io/mt/85157660/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-