Re: [edk2-devel] [PATCH v3 3/4] UefiCpuPkg/MtrrLib.h: use cache type #defines from ArchitecturalMsr.h

["Laszlo Ersek" <lersek@redhat.com>]

CC'ing Mike too

On 1/30/24 14:04, Gerd Hoffmann wrote:
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  UefiCpuPkg/Include/Library/MtrrLib.h | 26 ++++++++++++++------------
>  1 file changed, 14 insertions(+), 12 deletions(-)
> 
> diff --git a/UefiCpuPkg/Include/Library/MtrrLib.h b/UefiCpuPkg/Include/Library/MtrrLib.h
> index 86cc1aab3b8e..9d715d50dfb0 100644
> --- a/UefiCpuPkg/Include/Library/MtrrLib.h
> +++ b/UefiCpuPkg/Include/Library/MtrrLib.h
> @@ -9,6 +9,8 @@
>  #ifndef  _MTRR_LIB_H_
>  #define  _MTRR_LIB_H_
>  
> +#include <Register/Intel/ArchitecturalMsr.h>
> +
>  //
>  // According to IA32 SDM, MTRRs number and MSR offset are always consistent
>  // for IA32 processor family
> @@ -82,20 +84,20 @@ typedef struct _MTRR_SETTINGS_ {
>  // Memory cache types
>  //
>  typedef enum {
> -  CacheUncacheable    = 0,
> -  CacheWriteCombining = 1,
> -  CacheWriteThrough   = 4,
> -  CacheWriteProtected = 5,
> -  CacheWriteBack      = 6,
> -  CacheInvalid        = 7
> +  CacheUncacheable    = MSR_IA32_MTRR_CACHE_UNCACHEABLE,
> +  CacheWriteCombining = MSR_IA32_MTRR_CACHE_WRITE_COMBINING,
> +  CacheWriteThrough   = MSR_IA32_MTRR_CACHE_WRITE_THROUGH,
> +  CacheWriteProtected = MSR_IA32_MTRR_CACHE_WRITE_PROTECTED,
> +  CacheWriteBack      = MSR_IA32_MTRR_CACHE_WRITE_BACK,
> +  CacheInvalid        = MSR_IA32_MTRR_CACHE_INVALID_TYPE,
>  } MTRR_MEMORY_CACHE_TYPE;
>  
> -#define  MTRR_CACHE_UNCACHEABLE      0
> -#define  MTRR_CACHE_WRITE_COMBINING  1
> -#define  MTRR_CACHE_WRITE_THROUGH    4
> -#define  MTRR_CACHE_WRITE_PROTECTED  5
> -#define  MTRR_CACHE_WRITE_BACK       6
> -#define  MTRR_CACHE_INVALID_TYPE     7
> +#define  MTRR_CACHE_UNCACHEABLE      MSR_IA32_MTRR_CACHE_UNCACHEABLE
> +#define  MTRR_CACHE_WRITE_COMBINING  MSR_IA32_MTRR_CACHE_WRITE_COMBINING
> +#define  MTRR_CACHE_WRITE_THROUGH    MSR_IA32_MTRR_CACHE_WRITE_THROUGH
> +#define  MTRR_CACHE_WRITE_PROTECTED  MSR_IA32_MTRR_CACHE_WRITE_PROTECTED
> +#define  MTRR_CACHE_WRITE_BACK       MSR_IA32_MTRR_CACHE_WRITE_BACK
> +#define  MTRR_CACHE_INVALID_TYPE     MSR_IA32_MTRR_CACHE_INVALID_TYPE
>  
>  typedef struct {
>    UINT64                    BaseAddress;




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114822): https://edk2.groups.io/g/devel/message/114822
Mute This Topic: https://groups.io/mt/104052592/7686176
Mute #defines:https://edk2.groups.io/g/devel/mutehashtag/defines
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-