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 CB8CE21CFA608 for ; Thu, 24 Aug 2017 04:05:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 327E87E42D; Thu, 24 Aug 2017 11:07:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 327E87E42D Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=lersek@redhat.com Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-82.phx2.redhat.com [10.3.116.82]) by smtp.corp.redhat.com (Postfix) with ESMTP id 114B66BF7E; Thu, 24 Aug 2017 11:07:38 +0000 (UTC) To: Eric Dong , edk2-devel@lists.01.org Cc: Ruiyu Ni , Jeff Fan References: <1501752726-14072-1-git-send-email-eric.dong@intel.com> <1501752726-14072-8-git-send-email-eric.dong@intel.com> From: Laszlo Ersek Message-ID: <97a3d5e0-c3f4-5b5d-fd08-23acf345cddb@redhat.com> Date: Thu, 24 Aug 2017 13:07:38 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <1501752726-14072-8-git-send-email-eric.dong@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 24 Aug 2017 11:07:40 +0000 (UTC) Subject: Re: [Patch 7/7] UefiCpuPkg MtrrLib: Remove deprecated micro. 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, 24 Aug 2017 11:05:06 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 08/03/17 11:32, Eric Dong wrote: > Cc: Jeff Fan > Cc: Ruiyu Ni > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Eric Dong > --- > UefiCpuPkg/Include/Library/MtrrLib.h | 27 --------------------------- > 1 file changed, 27 deletions(-) > > diff --git a/UefiCpuPkg/Include/Library/MtrrLib.h b/UefiCpuPkg/Include/Library/MtrrLib.h > index a63da4d..6120526 100644 > --- a/UefiCpuPkg/Include/Library/MtrrLib.h > +++ b/UefiCpuPkg/Include/Library/MtrrLib.h > @@ -31,33 +31,6 @@ > #define RESERVED_FIRMWARE_VARIABLE_MTRR_NUMBER 2 > > #define MTRR_NUMBER_OF_FIXED_MTRR 11 > -// > -// Below macro is deprecated, and should not be used. > -// > -#define FIRMWARE_VARIABLE_MTRR_NUMBER 6 > -#define MTRR_LIB_IA32_MTRR_CAP 0x0FE > -#define MTRR_LIB_IA32_MTRR_CAP_VCNT_MASK 0x0FF > -#define MTRR_LIB_IA32_MTRR_FIX64K_00000 0x250 > -#define MTRR_LIB_IA32_MTRR_FIX16K_80000 0x258 > -#define MTRR_LIB_IA32_MTRR_FIX16K_A0000 0x259 > -#define MTRR_LIB_IA32_MTRR_FIX4K_C0000 0x268 > -#define MTRR_LIB_IA32_MTRR_FIX4K_C8000 0x269 > -#define MTRR_LIB_IA32_MTRR_FIX4K_D0000 0x26A > -#define MTRR_LIB_IA32_MTRR_FIX4K_D8000 0x26B > -#define MTRR_LIB_IA32_MTRR_FIX4K_E0000 0x26C > -#define MTRR_LIB_IA32_MTRR_FIX4K_E8000 0x26D > -#define MTRR_LIB_IA32_MTRR_FIX4K_F0000 0x26E > -#define MTRR_LIB_IA32_MTRR_FIX4K_F8000 0x26F > -#define MTRR_LIB_IA32_VARIABLE_MTRR_BASE 0x200 > -// > -// Below macro is deprecated, and should not be used. > -// > -#define MTRR_LIB_IA32_VARIABLE_MTRR_END 0x20F > -#define MTRR_LIB_IA32_MTRR_DEF_TYPE 0x2FF > -#define MTRR_LIB_MSR_VALID_MASK 0xFFFFFFFFFULL > -#define MTRR_LIB_CACHE_VALID_ADDRESS 0xFFFFFF000ULL > -#define MTRR_LIB_CACHE_MTRR_ENABLED 0x800 > -#define MTRR_LIB_CACHE_FIXED_MTRR_ENABLED 0x400 > > // > // Structure to describe a fixed MTRR > I think this patch broke "AppPkg/Applications/Sockets/WebServer": > AppPkg/Applications/Sockets/WebServer/Mtrr.c: In function 'MemoryTypeRegistersPage': > AppPkg/Applications/Sockets/WebServer/Mtrr.c:305:37: error: 'MTRR_LIB_IA32_MTRR_CAP' undeclared (first use in this function) > Capabilities = AsmReadMsr64 ( MTRR_LIB_IA32_MTRR_CAP ); > ^ > AppPkg/Applications/Sockets/WebServer/Mtrr.c:305:37: note: each undeclared identifier is reported only once for each function it appears in > AppPkg/Applications/Sockets/WebServer/Mtrr.c:306:33: error: 'MTRR_LIB_IA32_MTRR_DEF_TYPE' undeclared (first use in this function) > DefType = AsmReadMsr64 ( MTRR_LIB_IA32_MTRR_DEF_TYPE ); > ^ > AppPkg/Applications/Sockets/WebServer/Mtrr.c:353:56: error: 'MTRR_LIB_CACHE_MTRR_ENABLED' undeclared (first use in this function) > ( 0 != ( DefType & MTRR_LIB_CACHE_MTRR_ENABLED )) > ^ > AppPkg/Applications/Sockets/WebServer/Mtrr.c:367:56: error: 'MTRR_LIB_CACHE_FIXED_MTRR_ENABLED' undeclared (first use in this function) > ( 0 != ( DefType & MTRR_LIB_CACHE_FIXED_MTRR_ENABLED )) > ^ > AppPkg/Applications/Sockets/WebServer/Mtrr.c:618:35: error: 'MTRR_LIB_IA32_MTRR_CAP_VCNT_MASK' undeclared (first use in this function) > MaxMtrrs = Capabilities & MTRR_LIB_IA32_MTRR_CAP_VCNT_MASK; Thanks Laszlo