Re: [Patch V3 1/2] MdePkg: Define structures for Resizable BAR Capability

["Ni, Ray" <ray.ni@intel.com>]

Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Luo, Heng <heng.luo@intel.com>
> Sent: Monday, January 4, 2021 3:00 PM
> To: devel@edk2.groups.io
> Cc: Ni, Ray <ray.ni@intel.com>; Wu, Hao A <hao.a.wu@intel.com>
> Subject: [Patch V3 1/2] MdePkg: Define structures for Resizable BAR Capability
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3138
> 
> Define structures for Resizable BAR Capability in
> MdePkg/Include/IndustryStandard/PciExpress21.h,
> Change ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
> to use new structures.
> 
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Signed-off-by: Heng Luo <heng.luo@intel.com>
> ---
>  MdePkg/Include/IndustryStandard/PciExpress21.h    | 30
> +++++++++++++++++++++++++-----
>  ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c |  6 +++---
>  2 files changed, 28 insertions(+), 8 deletions(-)
> 
> diff --git a/MdePkg/Include/IndustryStandard/PciExpress21.h
> b/MdePkg/Include/IndustryStandard/PciExpress21.h
> index 2c07cb560e..4617dc1569 100644
> --- a/MdePkg/Include/IndustryStandard/PciExpress21.h
> +++ b/MdePkg/Include/IndustryStandard/PciExpress21.h
> @@ -1,7 +1,7 @@
>  /** @file
> 
>    Support for the latest PCI standard.
> 
> 
> 
> -  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> 
> +  Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>
> 
>    (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
> 
> 
> 
> @@ -632,10 +632,30 @@ typedef struct {
>  #define PCI_EXPRESS_EXTENDED_CAPABILITY_RESIZABLE_BAR_ID    0x0015
> 
>  #define PCI_EXPRESS_EXTENDED_CAPABILITY_RESIZABLE_BAR_VER1  0x1
> 
> 
> 
> +typedef union {
> 
> +  struct {
> 
> +    UINT32 Reserved:4;
> 
> +    UINT32 BarSizeCapability:28;
> 
> +  } Bits;
> 
> +  UINT32   Uint32;
> 
> +} PCI_EXPRESS_EXTENDED_CAPABILITIES_RESIZABLE_BAR_CAPABILITY;
> 
> +
> 
> +
> 
> +typedef union {
> 
> +  struct {
> 
> +    UINT32 BarIndex:3;
> 
> +    UINT32 Reserved:2;
> 
> +    UINT32 ResizableBarNumber:3;
> 
> +    UINT32 BarSize:6;
> 
> +    UINT32 Reserved2:2;
> 
> +    UINT32 BarSizeCapability:16;
> 
> +  } Bits;
> 
> +  UINT32   Uint32;
> 
> +} PCI_EXPRESS_EXTENDED_CAPABILITIES_RESIZABLE_BAR_CONTROL;
> 
> +
> 
>  typedef struct {
> 
> -  UINT32                                                 ResizableBarCapability;
> 
> -  UINT16                                                 ResizableBarControl;
> 
> -  UINT16                                                 Reserved;
> 
> +  PCI_EXPRESS_EXTENDED_CAPABILITIES_RESIZABLE_BAR_CAPABILITY
> ResizableBarCapability;
> 
> +  PCI_EXPRESS_EXTENDED_CAPABILITIES_RESIZABLE_BAR_CONTROL
> ResizableBarControl;
> 
>  } PCI_EXPRESS_EXTENDED_CAPABILITIES_RESIZABLE_BAR_ENTRY;
> 
> 
> 
>  typedef struct {
> 
> @@ -643,7 +663,7 @@ typedef struct {
>    PCI_EXPRESS_EXTENDED_CAPABILITIES_RESIZABLE_BAR_ENTRY
> Capability[1];
> 
>  } PCI_EXPRESS_EXTENDED_CAPABILITIES_RESIZABLE_BAR;
> 
> 
> 
> -#define GET_NUMBER_RESIZABLE_BARS(x) (((x-
> >Capability[0].ResizableBarControl) & 0xE0) >> 5)
> 
> +#define GET_NUMBER_RESIZABLE_BARS(x) (x-
> >Capability[0].ResizableBarControl.Bits.ResizableBarNumber)
> 
> 
> 
>  #define PCI_EXPRESS_EXTENDED_CAPABILITY_ARI_CAPABILITY_ID    0x000E
> 
>  #define PCI_EXPRESS_EXTENDED_CAPABILITY_ARI_CAPABILITY_VER1  0x1
> 
> diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
> b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
> index 3e138188ce..a2f04d8db5 100644
> --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
> +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/Pci.c
> @@ -1,7 +1,7 @@
>  /** @file
> 
>    Main file for Pci shell Debug1 function.
> 
> 
> 
> -  Copyright (c) 2005 - 2019, Intel Corporation. All rights reserved.<BR>
> 
> +  Copyright (c) 2005 - 2021, Intel Corporation. All rights reserved.<BR>
> 
>    (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
> 
>    (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
> 
> @@ -5534,8 +5534,8 @@ PrintInterpretedExtendedCompatibilityResizeableBar
> (
>        STRING_TOKEN (STR_PCI_EXT_CAP_RESIZE_BAR),
> 
>        gShellDebug1HiiHandle,
> 
>        ItemCount+1,
> 
> -      Header->Capability[ItemCount].ResizableBarCapability,
> 
> -      Header->Capability[ItemCount].ResizableBarControl
> 
> +      Header->Capability[ItemCount].ResizableBarCapability.Uint32,
> 
> +      Header->Capability[ItemCount].ResizableBarControl.Uint32
> 
>        );
> 
>    }
> 
> 
> 
> --
> 2.24.0.windows.2