[edk2-devel] [PATCH] MdeModulePkg/NonDiscoverablePciDeviceDxe: use standard PCI_MAX_BAR macro
Laszlo Ersek
lersek at redhat.com
Thu Apr 16 20:54:52 UTC 2020
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 at arm.com>
> Cc: Hao A Wu <hao.a.wu at intel.com>
> Cc: Jian J Wang <jian.j.wang at intel.com>
> Cc: Philippe Mathieu-Daudé <philmd at redhat.com>
> Cc: Ray Ni <ray.ni at intel.com>
> Signed-off-by: Laszlo Ersek <lersek at 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/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list