OvmfPkg/FdtPciHostBridgeLib: io range is not mandatory

io range is not mandatory according to pcie spec,
so allow host bridges without io address space.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2022-06-02 10:42:12 +02:00 committed by mergify[bot]
parent 0223898f3e
commit b57911c84c
1 changed files with 23 additions and 22 deletions

View File

@ -292,13 +292,8 @@ ProcessPciHost (
} }
} }
if ((*IoSize == 0) || (*Mmio32Size == 0)) { if (*Mmio32Size == 0) {
DEBUG (( DEBUG ((DEBUG_ERROR, "%a: MMIO32 space empty\n", __FUNCTION__));
DEBUG_ERROR,
"%a: %a space empty\n",
__FUNCTION__,
(*IoSize == 0) ? "IO" : "MMIO32"
));
return EFI_PROTOCOL_ERROR; return EFI_PROTOCOL_ERROR;
} }
@ -333,13 +328,15 @@ ProcessPciHost (
return Status; return Status;
} }
// if (*IoSize != 0) {
// Map the MMIO window that provides I/O access - the PCI host bridge code //
// is not aware of this translation and so it will only map the I/O view // Map the MMIO window that provides I/O access - the PCI host bridge code
// in the GCD I/O map. // is not aware of this translation and so it will only map the I/O view
// // in the GCD I/O map.
Status = MapGcdMmioSpace (*IoBase + IoTranslation, *IoSize); //
ASSERT_EFI_ERROR (Status); Status = MapGcdMmioSpace (*IoBase + IoTranslation, *IoSize);
ASSERT_EFI_ERROR (Status);
}
return Status; return Status;
} }
@ -413,17 +410,21 @@ PciHostBridgeGetRootBridges (
AllocationAttributes = EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM; AllocationAttributes = EFI_PCI_HOST_BRIDGE_COMBINE_MEM_PMEM;
Io.Base = IoBase; if (IoSize != 0) {
Io.Limit = IoBase + IoSize - 1; Io.Base = IoBase;
Io.Limit = IoBase + IoSize - 1;
} else {
Io.Base = MAX_UINT64;
Io.Limit = 0;
}
Mem.Base = Mmio32Base; Mem.Base = Mmio32Base;
Mem.Limit = Mmio32Base + Mmio32Size - 1; Mem.Limit = Mmio32Base + Mmio32Size - 1;
if (sizeof (UINTN) == sizeof (UINT64)) { if ((sizeof (UINTN) == sizeof (UINT64)) && (Mmio64Size != 0)) {
MemAbove4G.Base = Mmio64Base; MemAbove4G.Base = Mmio64Base;
MemAbove4G.Limit = Mmio64Base + Mmio64Size - 1; MemAbove4G.Limit = Mmio64Base + Mmio64Size - 1;
if (Mmio64Size > 0) { AllocationAttributes |= EFI_PCI_HOST_BRIDGE_MEM64_DECODE;
AllocationAttributes |= EFI_PCI_HOST_BRIDGE_MEM64_DECODE;
}
} else { } else {
// //
// UEFI mandates a 1:1 virtual-to-physical mapping, so on a 32-bit // UEFI mandates a 1:1 virtual-to-physical mapping, so on a 32-bit