From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.120; helo=mga04.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 7D434221467A5 for ; Mon, 2 Apr 2018 14:43:21 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Apr 2018 14:43:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,397,1517904000"; d="scan'208";a="40180813" Received: from orsmsx104.amr.corp.intel.com ([10.22.225.131]) by orsmga003.jf.intel.com with ESMTP; 02 Apr 2018 14:43:19 -0700 Received: from orsmsx113.amr.corp.intel.com ([169.254.9.67]) by ORSMSX104.amr.corp.intel.com ([169.254.4.208]) with mapi id 14.03.0319.002; Mon, 2 Apr 2018 14:43:18 -0700 From: "Kinney, Michael D" To: "Zeng, Star" , Heyi Guo , "edk2-devel@lists.01.org" , "Kinney, Michael D" CC: Yi Li , Renhao Liang , "Dong, Eric" , "Gao, Liming" , "Wang, Jian J" , "Ni, Ruiyu" Thread-Topic: [PATCH 1/1] MdeModulePkg/Gcd: Fix bug of attribute conversion Thread-Index: AQHTxzbJqm1vmX5+4EKptCEz7JicdaPtdi0AgAB3q6A= Date: Mon, 2 Apr 2018 21:43:18 +0000 Message-ID: References: <1522311590-104218-1-git-send-email-heyi.guo@linaro.org> <0C09AFA07DD0434D9E2A0C6AEB0483103BA75236@shsmsx102.ccr.corp.intel.com> In-Reply-To: <0C09AFA07DD0434D9E2A0C6AEB0483103BA75236@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Subject: Re: [PATCH 1/1] MdeModulePkg/Gcd: Fix bug of attribute conversion 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: Mon, 02 Apr 2018 21:43:21 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Star, This commit breaks Vlv2TbltDevicePkg. On this platform, there are 2 calls to=20 gDS->SetMemorySpaceAttributes() for an MMIO range to set only the EFI_MEMORY_RUNTIME bit. With this commit, ConverToCpuArchAttributes()returns 0, and 0 is passed to gCpu->SetMemoryAttributes()that returns EFI_INVALID_PARAMETER on Vlv2TbltDevicePkg. Before this commit, ConverToCpuArchAttributes() returns INVALID_CPU_ARCH_ATTRIBUTES which causes the call to gCpu->SetMemoryAttributes()to be skipped so no error is generated. I think the right fix is to skip the call to=20 gCpu->SetMemoryAttributes() if CpuArchAttributes is 0 so a call that only sets the RUNTIME attribute can be supported along with call the set both the RUNTIME bit and other cache related bits. I will send a patch soon with the proposed fix. Mike > -----Original Message----- > From: Zeng, Star > Sent: Sunday, April 1, 2018 10:59 PM > To: Heyi Guo ; edk2- > devel@lists.01.org > Cc: Yi Li ; Renhao Liang > ; Dong, Eric > ; Kinney, Michael D > ; Gao, Liming > ; Wang, Jian J > ; Ni, Ruiyu ; > Zeng, Star > Subject: RE: [PATCH 1/1] MdeModulePkg/Gcd: Fix bug of > attribute conversion >=20 > Pushed at 5b91bf82c67b586b9588cbe4bbffa1588f6b5926. >=20 > Thanks, > Star > -----Original Message----- > From: Heyi Guo [mailto:heyi.guo@linaro.org] > Sent: Thursday, March 29, 2018 4:20 PM > To: edk2-devel@lists.01.org > Cc: Heyi Guo ; Yi Li > ; Renhao Liang > ; Zeng, Star > ; Dong, Eric ; > Kinney, Michael D ; Gao, > Liming ; Wang, Jian J > ; Ni, Ruiyu > Subject: [PATCH 1/1] MdeModulePkg/Gcd: Fix bug of > attribute conversion >=20 > For gDS->SetMemorySpaceAttributes(), when user passes a > combined memory attribute including CPU arch attribute > and other attributes, like EFI_MEMORY_RUNTIME, > ConverToCpuArchAttributes() will return > INVALID_CPU_ARCH_ATTRIBUTES and skip setting page/cache > attribute for the specified memory space. >=20 > We don't see any reason to forbid combining CPU arch > attributes and non-CPU-arch attributes when calling gDS- > >SetMemorySpaceAttributes(), so we remove the check code > in ConverToCpuArchAttributes(); the remaining code is > enough to grab the interested bits for > Cpu->SetMemoryAttributes(). >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Heyi Guo > Signed-off-by: Yi Li > Signed-off-by: Renhao Liang > Cc: Star Zeng > Cc: Eric Dong > Cc: Michael D Kinney > Cc: Liming Gao > Cc: Jian J Wang > Cc: Ruiyu Ni > --- > MdeModulePkg/Core/Dxe/Gcd/Gcd.c | 5 ----- > 1 file changed, 5 deletions(-) >=20 > diff --git a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c > b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c index > 77f4adb4bc01..907245a3f512 100644 > --- a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c > +++ b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c > @@ -673,11 +673,6 @@ ConverToCpuArchAttributes ( { > UINT64 CpuArchAttributes; >=20 > - if ((Attributes & ~(EXCLUSIVE_MEMORY_ATTRIBUTES | > - NONEXCLUSIVE_MEMORY_ATTRIBUTES)) > !=3D 0) { > - return INVALID_CPU_ARCH_ATTRIBUTES; > - } > - > CpuArchAttributes =3D Attributes & > NONEXCLUSIVE_MEMORY_ATTRIBUTES; >=20 > if ( (Attributes & EFI_MEMORY_UC) =3D=3D EFI_MEMORY_UC) { > -- > 2.7.4