From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (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 3FA5B210DF5C9 for ; Thu, 5 Jul 2018 01:09:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C43BB406F8B2; Thu, 5 Jul 2018 08:09:22 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-21.rdu2.redhat.com [10.10.120.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8115B1018E; Thu, 5 Jul 2018 08:09:21 +0000 (UTC) To: "Zeng, Star" , Brijesh Singh , "edk2-devel@lists.01.org" Cc: Tom Lendacky , "Dong, Eric" , "Justen, Jordan L" References: <1530669736-6941-1-git-send-email-brijesh.singh@amd.com> <0C09AFA07DD0434D9E2A0C6AEB0483103BB6E213@shsmsx102.ccr.corp.intel.com> <0C09AFA07DD0434D9E2A0C6AEB0483103BB70302@shsmsx102.ccr.corp.intel.com> From: Laszlo Ersek Message-ID: <00fbe98c-36b8-604b-438b-69801c29f3f9@redhat.com> Date: Thu, 5 Jul 2018 10:09:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <0C09AFA07DD0434D9E2A0C6AEB0483103BB70302@shsmsx102.ccr.corp.intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Thu, 05 Jul 2018 08:09:22 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Thu, 05 Jul 2018 08:09:22 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: Re: [PATCH v2 1/1] MdeModulePkg/Variable: Check EFI_MEMORY_RUNTIME attribute before setting it X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jul 2018 08:09:24 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 07/04/18 16:23, Zeng, Star wrote: > Pushed at f88290964fe528ffeb67ff108e8174fc2ce52741. Thank you! Laszlo > -----Original Message----- > From: Zeng, Star > Sent: Wednesday, July 4, 2018 10:00 PM > To: Brijesh Singh ; edk2-devel@lists.01.org > Cc: Tom Lendacky ; Dong, Eric ; Justen, Jordan L ; Laszlo Ersek ; Zeng, Star > Subject: RE: [PATCH v2 1/1] MdeModulePkg/Variable: Check EFI_MEMORY_RUNTIME attribute before setting it > > Reviewed-by: Star Zeng > > > Thanks, > Star > -----Original Message----- > From: Brijesh Singh [mailto:brijesh.singh@amd.com] > Sent: Wednesday, July 4, 2018 10:02 AM > To: edk2-devel@lists.01.org > Cc: Tom Lendacky ; Brijesh Singh ; Dong, Eric ; Justen, Jordan L ; Zeng, Star ; Laszlo Ersek > Subject: [PATCH v2 1/1] MdeModulePkg/Variable: Check EFI_MEMORY_RUNTIME attribute before setting it > > Set the EFI_MEMORY_RUNTIME attribute in FtwNotificationEvent() only if the attribute is not already present. This will ensure that the attributes set by the platform drivers (e.g Ovmf pflash) is not lost. > > Cc: Dong Eric > Cc: Justen Jordan L > Cc: Zeng Star > Cc: Laszlo Ersek > Contributed-under: TianoCore Contribution Agreement 1.1 > Reviewed-by: Star Zeng > Signed-off-by: Brijesh Singh > --- > > Change since v1: > - fix coding style > > MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c > index 6b04f4f7b394..23186176be75 100644 > --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c > +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c > @@ -412,13 +412,15 @@ FtwNotificationEvent ( > if (EFI_ERROR (Status)) { > DEBUG ((DEBUG_WARN, "Variable driver failed to get flash memory attribute.\n")); > } else { > - Status = gDS->SetMemorySpaceAttributes ( > - BaseAddress, > - Length, > - GcdDescriptor.Attributes | EFI_MEMORY_RUNTIME > - ); > - if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_WARN, "Variable driver failed to add EFI_MEMORY_RUNTIME attribute to Flash.\n")); > + if ((GcdDescriptor.Attributes & EFI_MEMORY_RUNTIME) == 0) { > + Status = gDS->SetMemorySpaceAttributes ( > + BaseAddress, > + Length, > + GcdDescriptor.Attributes | EFI_MEMORY_RUNTIME > + ); > + if (EFI_ERROR (Status)) { > + DEBUG ((DEBUG_WARN, "Variable driver failed to add EFI_MEMORY_RUNTIME attribute to Flash.\n")); > + } > } > } > > -- > 2.7.4 >