public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Daryl McDaniel \(EDK2 Lists\)" <edk2-lists@mc2research.org>
To: "'Eric Dong'" <eric.dong@intel.com>, <edk2-devel@lists.01.org>
Cc: "'Jaben Carsey'" <jaben.carsey@intel.com>,
	"'Ruiyu Ni'" <ruiyu.ni@intel.com>
Subject: Re: [Patch] AppPkg/WebServer: Fix build failure.
Date: Wed, 13 Sep 2017 08:20:50 -0700	[thread overview]
Message-ID: <08f401d32ca3$e312d530$a9387f90$@mc2research.org> (raw)
In-Reply-To: <1505297397-8656-1-git-send-email-eric.dong@intel.com>

Looks good.

Reviewed-by: Daryl McDaniel <edk2-lists@mc2research.org>

> -----Original Message-----
> From: Eric Dong [mailto:eric.dong@intel.com]
> Sent: Wednesday, September 13, 2017 3:10 AM
> To: edk2-devel@lists.01.org
> Cc: Daryl McDaniel <edk2-lists@mc2research.org>; Jaben Carsey
> <jaben.carsey@intel.com>; Ruiyu Ni <ruiyu.ni@intel.com>
> Subject: [Patch] AppPkg/WebServer: Fix build failure.
> 
> Fix build failure caused by UefiCpuPkg/MtrrLib removes deprecated macros.
> 
> Cc: Daryl McDaniel <edk2-lists@mc2research.org>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Cc: Ruiyu Ni <ruiyu.ni@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Eric Dong <eric.dong@intel.com>
> ---
>  AppPkg/Applications/Sockets/WebServer/Mtrr.c      | 31 +++++++++++------------
>  AppPkg/Applications/Sockets/WebServer/WebServer.h |  1 +
>  2 files changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> index 92f90b0..54356bd 100644
> --- a/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> +++ b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> @@ -146,12 +146,12 @@ MemoryTypeRegistersPage (
>  {
>    UINT64 Addr;
>    BOOLEAN bValid;
> -  UINT64 Capabilities;
> +  MSR_IA32_MTRRCAP_REGISTER Capabilities;
>    UINTN Count;
> -  UINT64 DefType;
> +  MSR_IA32_MTRR_DEF_TYPE_REGISTER DefType;
>    UINTN Index;
>    UINT64 Mask;
> -  UINT64 MaxMtrrs;
> +
>    CONST UINT64 mFixedAddresses [( 8 * MTRR_NUMBER_OF_FIXED_MTRR ) + 1 ] = {
>             0ULL,
>       0x10000ULL,
> @@ -302,8 +302,8 @@ MemoryTypeRegistersPage (
>        //
>        //  Get the capabilities
>        //
> -      Capabilities = AsmReadMsr64 ( MTRR_LIB_IA32_MTRR_CAP );
> -      DefType =  AsmReadMsr64 ( MTRR_LIB_IA32_MTRR_DEF_TYPE );
> +      Capabilities.Uint64 = AsmReadMsr64 ( MSR_IA32_MTRRCAP );
> +      DefType.Uint64 =  AsmReadMsr64 ( MSR_IA32_MTRR_DEF_TYPE );
> 
>        //
>        //  Display the capabilities
> @@ -316,7 +316,7 @@ MemoryTypeRegistersPage (
>        }
>        Status = HttpSendHexValue ( SocketFD,
>                                    pPort,
> -                                  Capabilities );
> +                                  Capabilities.Uint64 );
>        if ( EFI_ERROR ( Status )) {
>          break;
>        }
> @@ -338,7 +338,7 @@ MemoryTypeRegistersPage (
>        }
>        Status = HttpSendHexValue ( SocketFD,
>                                    pPort,
> -                                  DefType );
> +                                  DefType.Uint64);
>        if ( EFI_ERROR ( Status )) {
>          break;
>        }
> @@ -350,7 +350,7 @@ MemoryTypeRegistersPage (
>        }
>        Status = HttpSendAnsiString ( SocketFD,
>                                      pPort,
> -                                    ( 0 != ( DefType &
> MTRR_LIB_CACHE_MTRR_ENABLED ))
> +                                    ( 0 != DefType.Bits.E )
>                                      ? "Enabled"
>                                      : "Disabled" );
>        if ( EFI_ERROR ( Status )) {
> @@ -364,7 +364,7 @@ MemoryTypeRegistersPage (
>        }
>        Status = HttpSendAnsiString ( SocketFD,
>                                      pPort,
> -                                    ( 0 != ( DefType &
> MTRR_LIB_CACHE_FIXED_MTRR_ENABLED ))
> +                                    ( 0 != DefType.Bits.FE )
>                                      ? "Enabled"
>                                      : "Disabled" );
>        if ( EFI_ERROR ( Status )) {
> @@ -376,7 +376,7 @@ MemoryTypeRegistersPage (
>        if ( EFI_ERROR ( Status )) {
>          break;
>        }
> -      Type = DefType & 0xff;
> +      Type = DefType.Uint64 & 0xff;
>        Status = HttpSendAnsiString ( SocketFD,
>                                      pPort,
>                                      ( DIM ( mMemoryType ) > Type )
> @@ -395,7 +395,7 @@ MemoryTypeRegistersPage (
>        //
>        //  Determine if MTRRs are enabled
>        //
> -      if ( 0 == ( DefType & MTRR_LIB_CACHE_MTRR_ENABLED )) {
> +      if ( 0 == DefType.Bits.E ) {
>          Status = HttpSendAnsiString ( SocketFD,
>                                        pPort,
>                                        "<p>All memory is uncached!</p>\r\n" );
> @@ -412,8 +412,8 @@ MemoryTypeRegistersPage (
>          //
>          //  Determine if the fixed MTRRs are supported
>          //
> -        if (( 0 != ( Capabilities & 0x100 ))
> -          && ( 0 != ( DefType & MTRR_LIB_CACHE_FIXED_MTRR_ENABLED ))) {
> +        if (( 0 != Capabilities.Bits.FIX )
> +          && ( 0 != DefType.Bits.FE)) {
> 
>            //
>            //  Beginning of table
> @@ -615,8 +615,7 @@ MemoryTypeRegistersPage (
>          //
>          //  Determine if the variable MTRRs are supported
>          //
> -        MaxMtrrs = Capabilities & MTRR_LIB_IA32_MTRR_CAP_VCNT_MASK;
> -        if ( 0 < MaxMtrrs ) {
> +        if ( 0 < Capabilities.Bits.VCNT ) {
>            //
>            //  Beginning of table
>            //
> @@ -632,7 +631,7 @@ MemoryTypeRegistersPage (
>            //
>            //  Display the variable MTRRs
>            //
> -          for ( Count = 0; MaxMtrrs > Count; Count++ ) {
> +          for ( Count = 0; Capabilities.Bits.VCNT > Count; Count++ ) {
>              //
>              //  Start the row
>              //
> diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.h
> b/AppPkg/Applications/Sockets/WebServer/WebServer.h
> index 16c30c8..21b07b6 100644
> --- a/AppPkg/Applications/Sockets/WebServer/WebServer.h
> +++ b/AppPkg/Applications/Sockets/WebServer/WebServer.h
> @@ -20,6 +20,7 @@
> 
>  #include <Guid/EventGroup.h>
> 
> +#include <Register/Msr.h>
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/DebugLib.h>
>  #include <Library/MemoryAllocationLib.h>
> --
> 2.7.0.windows.1



  parent reply	other threads:[~2017-09-13 15:17 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-13 10:09 [Patch] AppPkg/WebServer: Fix build failure Eric Dong
2017-09-13 14:13 ` Carsey, Jaben
2017-09-13 15:20 ` Daryl McDaniel (EDK2 Lists) [this message]
2017-09-13 20:18 ` Laszlo Ersek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='08f401d32ca3$e312d530$a9387f90$@mc2research.org' \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox