1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH] MdeModulePkg/NonDiscoverablePciDeviceDxe: use standard PCI_MAX_BAR macro

Laszlo Ersek posted 1 patch 4 years ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/edk2 tags/patchew/20200409113017.18233-1-lersek@redhat.com
MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h | 2 --
MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
[edk2-devel] [PATCH] MdeModulePkg/NonDiscoverablePciDeviceDxe: use standard PCI_MAX_BAR macro
Posted by Laszlo Ersek 4 years ago 
NonDiscoverablePciDeviceDxe currently #defines the module-internal
PCI_MAX_BARS macro, with value 6 (and type "int").

Remove this private macro definition, and adopt PCI_MAX_BAR from
"MdePkg/Include/IndustryStandard/Pci22.h". Both the value and the type
remain unchanged (the standard PCI_MAX_BAR macro expands to 0x0006).

"NonDiscoverablePciDeviceIo.h" gets the definition of PCI_MAX_BAR via its
existent #include <IndustryStandard/Pci.h> directive.

Build-tested only.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
 MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h | 2 --
 MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
index 15541c281153..3e6df3bebdd7 100644
--- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
+++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
@@ -36,8 +36,6 @@
 #define PCI_ID_VENDOR_UNKNOWN         0xffff
 #define PCI_ID_DEVICE_DONTCARE        0x0000
 
-#define PCI_MAX_BARS                  6
-
 extern EFI_CPU_ARCH_PROTOCOL      *mCpu;
 
 typedef struct {
diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
index c3e83003a01c..a40c1a959350 100644
--- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
+++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
@@ -1679,8 +1679,8 @@ InitializePciIoProtocol (
     ASSERT (Desc->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR);
     ASSERT (Desc->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM);
 
-    if (Idx >= PCI_MAX_BARS ||
-        (Idx == PCI_MAX_BARS - 1 && Desc->AddrSpaceGranularity == 64)) {
+    if (Idx >= PCI_MAX_BAR ||
+        (Idx == PCI_MAX_BAR - 1 && Desc->AddrSpaceGranularity == 64)) {
       DEBUG ((DEBUG_ERROR,
         "%a: resource count exceeds number of emulated BARs\n",
         __FUNCTION__));
-- 
2.19.1.3.g30247aa5d201


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#57118): https://edk2.groups.io/g/devel/message/57118
Mute This Topic: https://groups.io/mt/72894144/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/NonDiscoverablePciDeviceDxe: use standard PCI_MAX_BAR macro
Posted by Ard Biesheuvel 4 years ago 
On 4/9/20 1:30 PM, Laszlo Ersek wrote:
> NonDiscoverablePciDeviceDxe currently #defines the module-internal
> PCI_MAX_BARS macro, with value 6 (and type "int").
> 
> Remove this private macro definition, and adopt PCI_MAX_BAR from
> "MdePkg/Include/IndustryStandard/Pci22.h". Both the value and the type
> remain unchanged (the standard PCI_MAX_BAR macro expands to 0x0006).
> 
> "NonDiscoverablePciDeviceIo.h" gets the definition of PCI_MAX_BAR via its
> existent #include <IndustryStandard/Pci.h> directive.
> 
> Build-tested only.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

> ---
>   MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h | 2 --
>   MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c | 4 ++--
>   2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> index 15541c281153..3e6df3bebdd7 100644
> --- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> +++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> @@ -36,8 +36,6 @@
>   #define PCI_ID_VENDOR_UNKNOWN         0xffff
>   #define PCI_ID_DEVICE_DONTCARE        0x0000
>   
> -#define PCI_MAX_BARS                  6
> -
>   extern EFI_CPU_ARCH_PROTOCOL      *mCpu;
>   
>   typedef struct {
> diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> index c3e83003a01c..a40c1a959350 100644
> --- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> +++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> @@ -1679,8 +1679,8 @@ InitializePciIoProtocol (
>       ASSERT (Desc->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR);
>       ASSERT (Desc->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM);
>   
> -    if (Idx >= PCI_MAX_BARS ||
> -        (Idx == PCI_MAX_BARS - 1 && Desc->AddrSpaceGranularity == 64)) {
> +    if (Idx >= PCI_MAX_BAR ||
> +        (Idx == PCI_MAX_BAR - 1 && Desc->AddrSpaceGranularity == 64)) {
>         DEBUG ((DEBUG_ERROR,
>           "%a: resource count exceeds number of emulated BARs\n",
>           __FUNCTION__));
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#57123): https://edk2.groups.io/g/devel/message/57123
Mute This Topic: https://groups.io/mt/72894144/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/NonDiscoverablePciDeviceDxe: use standard PCI_MAX_BAR macro
Posted by Laszlo Ersek 4 years ago 
On 04/09/20 13:30, Laszlo Ersek wrote:
> NonDiscoverablePciDeviceDxe currently #defines the module-internal
> PCI_MAX_BARS macro, with value 6 (and type "int").
> 
> Remove this private macro definition, and adopt PCI_MAX_BAR from
> "MdePkg/Include/IndustryStandard/Pci22.h". Both the value and the type
> remain unchanged (the standard PCI_MAX_BAR macro expands to 0x0006).
> 
> "NonDiscoverablePciDeviceIo.h" gets the definition of PCI_MAX_BAR via its
> existent #include <IndustryStandard/Pci.h> directive.
> 
> Build-tested only.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h | 2 --
>  MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c | 4 ++--
>  2 files changed, 2 insertions(+), 4 deletions(-)

Pushed as commit a7947b6366a6, via
<https://github.com/tianocore/edk2/pull/520>.

Thanks!
Laszlo

> 
> diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> index 15541c281153..3e6df3bebdd7 100644
> --- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> +++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> @@ -36,8 +36,6 @@
>  #define PCI_ID_VENDOR_UNKNOWN         0xffff
>  #define PCI_ID_DEVICE_DONTCARE        0x0000
>  
> -#define PCI_MAX_BARS                  6
> -
>  extern EFI_CPU_ARCH_PROTOCOL      *mCpu;
>  
>  typedef struct {
> diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> index c3e83003a01c..a40c1a959350 100644
> --- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> +++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> @@ -1679,8 +1679,8 @@ InitializePciIoProtocol (
>      ASSERT (Desc->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR);
>      ASSERT (Desc->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM);
>  
> -    if (Idx >= PCI_MAX_BARS ||
> -        (Idx == PCI_MAX_BARS - 1 && Desc->AddrSpaceGranularity == 64)) {
> +    if (Idx >= PCI_MAX_BAR ||
> +        (Idx == PCI_MAX_BAR - 1 && Desc->AddrSpaceGranularity == 64)) {
>        DEBUG ((DEBUG_ERROR,
>          "%a: resource count exceeds number of emulated BARs\n",
>          __FUNCTION__));
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#57477): https://edk2.groups.io/g/devel/message/57477
Mute This Topic: https://groups.io/mt/72894144/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/NonDiscoverablePciDeviceDxe: use standard PCI_MAX_BAR macro
Posted by Laszlo Ersek 4 years ago 
Hao, Jian, Ray:

can one of you please approve this patch?

Thanks
Laszlo

On 04/09/20 13:30, Laszlo Ersek wrote:
> NonDiscoverablePciDeviceDxe currently #defines the module-internal
> PCI_MAX_BARS macro, with value 6 (and type "int").
> 
> Remove this private macro definition, and adopt PCI_MAX_BAR from
> "MdePkg/Include/IndustryStandard/Pci22.h". Both the value and the type
> remain unchanged (the standard PCI_MAX_BAR macro expands to 0x0006).
> 
> "NonDiscoverablePciDeviceIo.h" gets the definition of PCI_MAX_BAR via its
> existent #include <IndustryStandard/Pci.h> directive.
> 
> Build-tested only.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>  MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h | 2 --
>  MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c | 4 ++--
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> index 15541c281153..3e6df3bebdd7 100644
> --- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> +++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> @@ -36,8 +36,6 @@
>  #define PCI_ID_VENDOR_UNKNOWN         0xffff
>  #define PCI_ID_DEVICE_DONTCARE        0x0000
>  
> -#define PCI_MAX_BARS                  6
> -
>  extern EFI_CPU_ARCH_PROTOCOL      *mCpu;
>  
>  typedef struct {
> diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> index c3e83003a01c..a40c1a959350 100644
> --- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> +++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> @@ -1679,8 +1679,8 @@ InitializePciIoProtocol (
>      ASSERT (Desc->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR);
>      ASSERT (Desc->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM);
>  
> -    if (Idx >= PCI_MAX_BARS ||
> -        (Idx == PCI_MAX_BARS - 1 && Desc->AddrSpaceGranularity == 64)) {
> +    if (Idx >= PCI_MAX_BAR ||
> +        (Idx == PCI_MAX_BAR - 1 && Desc->AddrSpaceGranularity == 64)) {
>        DEBUG ((DEBUG_ERROR,
>          "%a: resource count exceeds number of emulated BARs\n",
>          __FUNCTION__));
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#57424): https://edk2.groups.io/g/devel/message/57424
Mute This Topic: https://groups.io/mt/72894144/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/NonDiscoverablePciDeviceDxe: use standard PCI_MAX_BAR macro
Posted by Ni, Ray 4 years ago 
Reviewed-by: Ray Ni <ray.ni@intel.com>

> -----Original Message-----
> From: Laszlo Ersek <lersek@redhat.com>
> Sent: Thursday, April 16, 2020 1:41 AM
> To: Wu, Hao A <hao.a.wu@intel.com>; Wang, Jian J <jian.j.wang@intel.com>; Ni, Ray <ray.ni@intel.com>
> Cc: edk2-devel-groups-io <devel@edk2.groups.io>; Ard Biesheuvel <ard.biesheuvel@arm.com>; Philippe Mathieu-Daudé
> <philmd@redhat.com>
> Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/NonDiscoverablePciDeviceDxe: use standard PCI_MAX_BAR macro
> 
> Hao, Jian, Ray:
> 
> can one of you please approve this patch?
> 
> Thanks
> Laszlo
> 
> On 04/09/20 13:30, Laszlo Ersek wrote:
> > NonDiscoverablePciDeviceDxe currently #defines the module-internal
> > PCI_MAX_BARS macro, with value 6 (and type "int").
> >
> > Remove this private macro definition, and adopt PCI_MAX_BAR from
> > "MdePkg/Include/IndustryStandard/Pci22.h". Both the value and the type
> > remain unchanged (the standard PCI_MAX_BAR macro expands to 0x0006).
> >
> > "NonDiscoverablePciDeviceIo.h" gets the definition of PCI_MAX_BAR via its
> > existent #include <IndustryStandard/Pci.h> directive.
> >
> > Build-tested only.
> >
> > Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> > Cc: Hao A Wu <hao.a.wu@intel.com>
> > Cc: Jian J Wang <jian.j.wang@intel.com>
> > Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> > Cc: Ray Ni <ray.ni@intel.com>
> > Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> > ---
> >  MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h | 2 --
> >  MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c | 4 ++--
> >  2 files changed, 2 insertions(+), 4 deletions(-)
> >
> > diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> > index 15541c281153..3e6df3bebdd7 100644
> > --- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> > +++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> > @@ -36,8 +36,6 @@
> >  #define PCI_ID_VENDOR_UNKNOWN         0xffff
> >  #define PCI_ID_DEVICE_DONTCARE        0x0000
> >
> > -#define PCI_MAX_BARS                  6
> > -
> >  extern EFI_CPU_ARCH_PROTOCOL      *mCpu;
> >
> >  typedef struct {
> > diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> > index c3e83003a01c..a40c1a959350 100644
> > --- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> > +++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> > @@ -1679,8 +1679,8 @@ InitializePciIoProtocol (
> >      ASSERT (Desc->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR);
> >      ASSERT (Desc->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM);
> >
> > -    if (Idx >= PCI_MAX_BARS ||
> > -        (Idx == PCI_MAX_BARS - 1 && Desc->AddrSpaceGranularity == 64)) {
> > +    if (Idx >= PCI_MAX_BAR ||
> > +        (Idx == PCI_MAX_BAR - 1 && Desc->AddrSpaceGranularity == 64)) {
> >        DEBUG ((DEBUG_ERROR,
> >          "%a: resource count exceeds number of emulated BARs\n",
> >          __FUNCTION__));
> >


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#57451): https://edk2.groups.io/g/devel/message/57451
Mute This Topic: https://groups.io/mt/72894144/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH] MdeModulePkg/NonDiscoverablePciDeviceDxe: use standard PCI_MAX_BAR macro
Posted by Philippe Mathieu-Daudé 4 years ago 
On 4/9/20 1:30 PM, Laszlo Ersek wrote:
> NonDiscoverablePciDeviceDxe currently #defines the module-internal
> PCI_MAX_BARS macro, with value 6 (and type "int").
> 
> Remove this private macro definition, and adopt PCI_MAX_BAR from
> "MdePkg/Include/IndustryStandard/Pci22.h". Both the value and the type
> remain unchanged (the standard PCI_MAX_BAR macro expands to 0x0006).
> 
> "NonDiscoverablePciDeviceIo.h" gets the definition of PCI_MAX_BAR via its
> existent #include <IndustryStandard/Pci.h> directive.
> 
> Build-tested only.
> 
> Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Philippe Mathieu-Daudé <philmd@redhat.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
>   MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h | 2 --
>   MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c | 4 ++--
>   2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> index 15541c281153..3e6df3bebdd7 100644
> --- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> +++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.h
> @@ -36,8 +36,6 @@
>   #define PCI_ID_VENDOR_UNKNOWN         0xffff
>   #define PCI_ID_DEVICE_DONTCARE        0x0000
>   
> -#define PCI_MAX_BARS                  6
> -
>   extern EFI_CPU_ARCH_PROTOCOL      *mCpu;
>   
>   typedef struct {
> diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> index c3e83003a01c..a40c1a959350 100644
> --- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> +++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
> @@ -1679,8 +1679,8 @@ InitializePciIoProtocol (
>       ASSERT (Desc->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR);
>       ASSERT (Desc->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM);
>   
> -    if (Idx >= PCI_MAX_BARS ||
> -        (Idx == PCI_MAX_BARS - 1 && Desc->AddrSpaceGranularity == 64)) {
> +    if (Idx >= PCI_MAX_BAR ||
> +        (Idx == PCI_MAX_BAR - 1 && Desc->AddrSpaceGranularity == 64)) {
>         DEBUG ((DEBUG_ERROR,
>           "%a: resource count exceeds number of emulated BARs\n",
>           __FUNCTION__));
> 

Reviewed-by: Philippe Mathieu-Daude <philmd@redhat.com>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#57408): https://edk2.groups.io/g/devel/message/57408
Mute This Topic: https://groups.io/mt/72894144/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.