From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3E36521A16EFF for ; Thu, 18 May 2017 15:13:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AF77580C1F; Thu, 18 May 2017 22:13:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AF77580C1F Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=lersek@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com AF77580C1F Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-86.phx2.redhat.com [10.3.116.86]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1969C189E8; Thu, 18 May 2017 22:13:25 +0000 (UTC) From: Laszlo Ersek To: edk2-devel-01 Cc: Jordan Justen References: <20170518151436.16566-1-lersek@redhat.com> <20170518151436.16566-4-lersek@redhat.com> Message-ID: <362d1ec7-411a-a6eb-83f1-851f7707e4b4@redhat.com> Date: Fri, 19 May 2017 00:13:25 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <20170518151436.16566-4-lersek@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 18 May 2017 22:13:26 +0000 (UTC) Subject: Re: [PATCH v2 3/5] OvmfPkg/PlatformPei: align EmuVariableNvStore at any page boundary X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 May 2017 22:13:27 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 05/18/17 17:14, Laszlo Ersek wrote: > EmuVariableFvbRuntimeDxe now uses a 4KB (EFI_PAGE_SIZE) block size. > > Cc: Jordan Justen > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Laszlo Ersek > Regression-tested-by: Gary Lin > --- > > Notes: > v2: > - no changes > - add Gary's R-t-b > > OvmfPkg/PlatformPei/Platform.c | 20 ++++---------------- > 1 file changed, 4 insertions(+), 16 deletions(-) > > diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c > index 1b4dc00b0180..3e9fda7c7ab0 100644 > --- a/OvmfPkg/PlatformPei/Platform.c > +++ b/OvmfPkg/PlatformPei/Platform.c > @@ -504,7 +504,6 @@ ReserveEmuVariableNvStore ( > { > EFI_PHYSICAL_ADDRESS VariableStore; > RETURN_STATUS PcdStatus; > - UINT32 Alignment; > > // > // Allocate storage for NV variables early on so it will be > @@ -512,26 +511,15 @@ ReserveEmuVariableNvStore ( > // across reboots, this allows the NV variable storage to survive > // a VM reboot. > // > - Alignment = PcdGet32 (PcdFlashNvStorageFtwSpareSize); > - if ((Alignment & (Alignment - 1)) != 0) { > - // > - // Round up Alignment to the next power of two. > - // > - Alignment = GetPowerOfTwo32 (Alignment) << 1; > - } > - > VariableStore = > (EFI_PHYSICAL_ADDRESS)(UINTN) > - AllocateAlignedRuntimePages ( > - EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)), > - Alignment > + AllocateRuntimePages ( > + EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) > ); > DEBUG ((EFI_D_INFO, > - "Reserved variable store memory: 0x%lX; size: %dkb, " > - "alignment: 0x%x\n", > + "Reserved variable store memory: 0x%lX; size: %dkb\n", > VariableStore, > - (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024, > - Alignment > + (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024 > )); > PcdStatus = PcdSet64S (PcdEmuVariableNvStoreReserved, VariableStore); > ASSERT_RETURN_ERROR (PcdStatus); > Commit c9e7907d09ea.