From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 3F6BFD81112 for ; Mon, 5 Feb 2024 08:27:40 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=0UDaAXBvarprrS9TJR6ElAA0NatQPs6CL8NQAhrfga8=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From:In-Reply-To:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1707121658; v=1; b=NiCEJW6YMdvIraQ7xovROPg+fbXtVZinV5wlt2XCEXYRvCAeNhjYfXLfOYTOkPUrVPO0y2v2 Q0D4dgDDCFSfYY/8VPWz4xC1RGcTlRGu0WJGk2VvFB29Wa+j5PNuDABi2H9Bufg1PRwTFiMAiWM FlSfZuTNFovxvCKob30d5Ips= X-Received: by 127.0.0.2 with SMTP id zhvHYY7687511xjqP8zB0AKQ; Mon, 05 Feb 2024 00:27:38 -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.web11.58424.1707121657918874553 for ; Mon, 05 Feb 2024 00:27:38 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-628-_URqAeZFNhibievliTHl6A-1; Mon, 05 Feb 2024 03:27:33 -0500 X-MC-Unique: _URqAeZFNhibievliTHl6A-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CDC4F85A58A; Mon, 5 Feb 2024 08:27:32 +0000 (UTC) X-Received: from [10.39.192.216] (unknown [10.39.192.216]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0456C400DF3D; Mon, 5 Feb 2024 08:27:31 +0000 (UTC) Message-ID: Date: Mon, 5 Feb 2024 09:27:30 +0100 MIME-Version: 1.0 Subject: Re: [edk2-devel] [PATCH v2 4/4] OvmfPkg/PlatformPei: log pei memory cap details To: devel@edk2.groups.io, kraxel@redhat.com Cc: Jiewen Yao , Oliver Steffen , Ard Biesheuvel References: <20240202104720.1275308-1-kraxel@redhat.com> <20240202104720.1275308-5-kraxel@redhat.com> From: "Laszlo Ersek" In-Reply-To: <20240202104720.1275308-5-kraxel@redhat.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk 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,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: Gfrd61m6CBkydQgWGKbLLWx6x7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=NiCEJW6Y; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none) On 2/2/24 11:47, Gerd Hoffmann wrote: > Signed-off-by: Gerd Hoffmann > --- > OvmfPkg/PlatformPei/MemDetect.c | 28 ++++++++++++++++++++++++++-- > 1 file changed, 26 insertions(+), 2 deletions(-) >=20 > diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDet= ect.c > index 48ad0b83a55e..737166f1b0ad 100644 > --- a/OvmfPkg/PlatformPei/MemDetect.c > +++ b/OvmfPkg/PlatformPei/MemDetect.c > @@ -263,6 +263,30 @@ GetPeiMemoryCap ( > // > MemoryCap =3D EFI_PAGES_TO_SIZE (TotalPages) + ApStacks + SIZE_64MB; > =20 > + DEBUG (( > + DEBUG_INFO, > + "%a: page tables: %6lu KB (%lu/%lu/%lu/%lu pages for levels 5/4/3/2)= \n", > + __func__, > + RShiftU64 (EFI_PAGES_TO_SIZE (TotalPages), 10), should be RShiftU64 (EFI_PAGES_TO_SIZE ((UINTN)TotalPages), 10) > + Level5Pages, > + Level4Pages, > + Level3Pages, > + Level2Pages These values are now UINT32s, so the format specifier for each should be %u > + )); > + DEBUG (( > + DEBUG_INFO, > + "%a: ap stacks: %6lu KB (%d cpus)\n", > + __func__, > + RShiftU64 (ApStacks, 10), > + PlatformInfoHob->PcdCpuMaxLogicalProcessorNumber "PlatformInfoHob->PcdCpuMaxLogicalProcessorNumber" is a UINT32, should be formatted with %u, not %d > + )); > + DEBUG (( > + DEBUG_INFO, > + "%a: memory cap: %6lu KB\n", > + __func__, > + RShiftU64 (MemoryCap, 10) > + )); > + > ASSERT (MemoryCap <=3D MAX_UINT32); > return (UINT32)MemoryCap; > } OK > @@ -347,10 +371,10 @@ PublishPeiMemory ( > } else { > DEBUG (( > DEBUG_WARN, > - "%a: Not enough memory for PEI (have %llu KB, estimated need %ll= u KB)\n", > + "%a: Not enough memory for PEI (have %lu KB, estimated need %u K= B)\n", > __func__, > RShiftU64 (MemorySize, 10), > - RShiftU64 (PeiMemoryCap, 10) > + PeiMemoryCap >> 10 > )); > } > } Did you mean to squash this hunk into patch#1 instead? (It seems correct, just doesn't belong here IMO.) Laszlo -=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 (#115106): https://edk2.groups.io/g/devel/message/115106 Mute This Topic: https://groups.io/mt/104117105/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-