diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2016-03-04 13:04:21 +0800 |
|---|---|---|
| committer | Hao Wu <hao.a.wu@intel.com> | 2016-03-09 20:31:19 +0800 |
| commit | dc6cc13bc2f9f928378c180bcdc4080991e5d343 (patch) | |
| tree | a9f9af5817278d14ac0708cafc75ab0f860ab958 | |
| parent | 873d970c5c7314e1f186552c6aec13f2f111af88 (diff) | |
| download | edk2-platforms-dc6cc13bc2f9f928378c180bcdc4080991e5d343.tar.xz | |
MdeModulePkg/PciHostBridge: Don't assert when setting UC to MMIO fails
Failing to set EFI_MEMORY_UC to MMIO aperture is not a fatal error.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
(cherry picked from commit 13be90faafdfe2a053090b99644a246680687166)
| -rw-r--r-- | MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c index ef0c4f2a5e..d5da6995af 100644 --- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c +++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c @@ -425,7 +425,9 @@ InitializePciHostBridge ( MemApertures[MemApertureIndex]->Limit - MemApertures[MemApertureIndex]->Base + 1,
EFI_MEMORY_UC
);
- ASSERT_EFI_ERROR (Status);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_WARN, "PciHostBridge driver failed to set EFI_MEMORY_UC to MMIO aperture - %r.\n", Status));
+ }
}
}
//
|