commit b59e2427c2d92cfee0238d9bde7372691c2af17c
author Ard Biesheuvel <ard.biesheuvel@linaro.org> Thu Apr 28 23:51:28 2016 +0800
committer Ruiyu Ni <ruiyu.ni@intel.com> Fri Apr 29 15:23:20 2016 +0800
tree a73b277ce6e32461d6773ef2354b7d29d4fb40c1
parent cdd1b5e5486460ac96f44cddf1edfda25b1fdce9

MdeModulePkg/PciBusDxe: don't create bogus descriptor if no resources needed

If the current PCI configuration requires no resources to be allocated at
all (i.e., unpopulated bus), the PCI enumeration code creates a single
ACPI_ADDRESS_SPACE_DESCRIPTOR memory descriptor with all fields cleared.
This is rejected by the SubmitResources() implementation of the generic
PciHostBridgeDxe in the following way:

  PciHostBridge: SubmitResources for PcieRoot(0x0)
   Mem: Granularity/SpecificFlag = 0 / 00
        Length/Alignment = 0x0 / 0x0
  PciBus: HostBridge->SubmitResources() - Invalid Parameter

  ASSERT_EFI_ERROR (Status = Invalid Parameter)
  ASSERT [PciBusDxe] .../PciBusDxe/PciLib.c(561): !EFI_ERROR (Status)

So instead, create the empty configuration as a single entry of type
EFI_ACPI_END_TAG_DESCRIPTOR.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>

MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c

diff --git a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
index 597c083..469a2dd 100644
--- a/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
+++ b/MdeModulePkg/Bus/Pci/PciBusDxe/PciEnumerator.c
@@ -1307,15 +1307,12 @@
     //

     // If there is no resource request

     //

-    Configuration = AllocateZeroPool (sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) + sizeof (EFI_ACPI_END_TAG_DESCRIPTOR));

+    Configuration = AllocateZeroPool (sizeof (EFI_ACPI_END_TAG_DESCRIPTOR));

     if (Configuration == NULL) {

       return EFI_OUT_OF_RESOURCES;

     }

 

-    Ptr               = (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *) (Configuration);

-    Ptr->Desc         = ACPI_ADDRESS_SPACE_DESCRIPTOR;

-

-    PtrEnd            = (EFI_ACPI_END_TAG_DESCRIPTOR *) (Ptr + 1);

+    PtrEnd            = (EFI_ACPI_END_TAG_DESCRIPTOR *) (Configuration);

     PtrEnd->Desc      = ACPI_END_TAG_DESCRIPTOR;

     PtrEnd->Checksum  = 0;

   }