Cc: Jeff Fan <jeff.fan@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
---
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
--
2.7.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com> Thanks/Ray > -----Original Message----- > From: Dong, Eric > Sent: Thursday, August 3, 2017 5:32 PM > To: edk2-devel@lists.01.org > Cc: Fan, Jeff <jeff.fan@intel.com>; Ni, Ruiyu <ruiyu.ni@intel.com> > Subject: [Patch 7/7] UefiCpuPkg MtrrLib: Remove deprecated micro. > > Cc: Jeff Fan <jeff.fan@intel.com> > Cc: Ruiyu Ni <ruiyu.ni@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Eric Dong <eric.dong@intel.com> > --- > 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 > -- > 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
On 08/03/17 11:32, Eric Dong wrote: > Cc: Jeff Fan <jeff.fan@intel.com> > Cc: Ruiyu Ni <ruiyu.ni@intel.com> > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Eric Dong <eric.dong@intel.com> > --- > 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 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
© 2016 - 2024 Red Hat, Inc.