From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.126; helo=mga18.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (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 192F121CB8662 for ; Wed, 28 Mar 2018 19:47:15 -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 orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Mar 2018 19:53:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,374,1517904000"; d="scan'208";a="39027405" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga003.jf.intel.com with ESMTP; 28 Mar 2018 19:53:53 -0700 Received: from fmsmsx118.amr.corp.intel.com (10.18.116.18) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 28 Mar 2018 19:53:53 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx118.amr.corp.intel.com (10.18.116.18) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 28 Mar 2018 19:53:53 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.80]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.235]) with mapi id 14.03.0319.002; Thu, 29 Mar 2018 10:53:51 +0800 From: "Zeng, Star" To: Heyi Guo , "edk2-devel@lists.01.org" CC: Yi Li , Renhao Liang , "Dong, Eric" , "Kinney, Michael D" , "Gao, Liming" , "Wang, Jian J" , "Yao, Jiewen" , "Ni, Ruiyu" , "Zeng, Star" Thread-Topic: [RFC 1/1] MdeModulePkg/Gcd: Fix bug of attribute conversion Thread-Index: AQHTxwYZy4/GpFs84EeWCujCaw6JtaPmhCHw Date: Thu, 29 Mar 2018 02:53:50 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103BA7448D@shsmsx102.ccr.corp.intel.com> References: <1522290692-99585-1-git-send-email-heyi.guo@linaro.org> In-Reply-To: <1522290692-99585-1-git-send-email-heyi.guo@linaro.org> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [RFC 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: Thu, 29 Mar 2018 02:47:15 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Cc Jian, Jiewen and Ruiyu. Thanks, Star -----Original Message----- From: Heyi Guo [mailto:heyi.guo@linaro.org]=20 Sent: Thursday, March 29, 2018 10:32 AM To: edk2-devel@lists.01.org Cc: Heyi Guo ; Yi Li ; Renhao= Liang ; Zeng, Star ; Dong, Er= ic ; Kinney, Michael D ; G= ao, Liming Subject: [RFC 1/1] MdeModulePkg/Gcd: Fix bug of attribute conversion For gDS->SetMemorySpaceAttributes(), when user passes a combined memory att= ribute including CPU arch attribute and other attributes, like EFI_MEMORY_R= UNTIME, ConverToCpuArchAttributes() will return INVALID_CPU_ARCH_ATTRIBUTES= and skip setting page/cache attribute for the specified memory space. We don't see any reason to forbid combining CPU arch attributes and non-CPU= -arch attributes when calling gDS->SetMemorySpaceAttributes(), so we change= ConverToCpuArchAttributes() to only check if there is valid CPU arch attri= butes in the input "Attribute" parameter and just ignore other attributes. 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 --- MdeModulePkg/Core/Dxe/Gcd/Gcd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c b/MdeModulePkg/Core/Dxe/Gcd/Gc= d.c index 77f4adb4bc01..2ababdd14cc6 100644 --- a/MdeModulePkg/Core/Dxe/Gcd/Gcd.c +++ b/MdeModulePkg/Core/Dxe/Gcd/Gcd.c @@ -673,8 +673,8 @@ ConverToCpuArchAttributes ( { UINT64 CpuArchAttributes; =20 - if ((Attributes & ~(EXCLUSIVE_MEMORY_ATTRIBUTES | - NONEXCLUSIVE_MEMORY_ATTRIBUTES)) !=3D 0) { + if ((Attributes & (EXCLUSIVE_MEMORY_ATTRIBUTES | + NONEXCLUSIVE_MEMORY_ATTRIBUTES)) =3D=3D 0) { return INVALID_CPU_ARCH_ATTRIBUTES; } =20 -- 2.7.4