From b494cf96e70f8640acd9288951be39a0f714f2be Mon Sep 17 00:00:00 2001 From: Hao Wu Date: Wed, 11 Jan 2017 09:54:39 +0800 Subject: [PATCH] MdeModulePkg/NonDiscoverable: Compare SIZE_4GB with address type Refine the codes to compare the definition 'SIZE_4GB' with type EFI_PHYSICAL_ADDRESS. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Ruiyu Ni --- .../NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c | 4 ++-- .../NonDiscoverableDeviceRegistrationLib.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c index b07c1293d6..c836ad6a91 100644 --- a/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c +++ b/MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c @@ -598,7 +598,7 @@ CoherentPciIoMap ( // Dev = NON_DISCOVERABLE_PCI_DEVICE_FROM_PCI_IO(This); if ((Dev->Attributes & EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE) == 0 && - (UINTN)HostAddress + *NumberOfBytes > SIZE_4GB) { + (EFI_PHYSICAL_ADDRESS)(UINTN)HostAddress + *NumberOfBytes > SIZE_4GB) { // // Bounce buffering is not possible for consistent mappings @@ -1006,7 +1006,7 @@ NonCoherentPciIoMap ( // a bounce buffer and copy over the data in case HostAddress >= 4 GB. // Bounce = ((Dev->Attributes & EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE) == 0 && - (UINTN)HostAddress + *NumberOfBytes > SIZE_4GB); + (EFI_PHYSICAL_ADDRESS)(UINTN)HostAddress + *NumberOfBytes > SIZE_4GB); if (!Bounce) { switch (Operation) { diff --git a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c b/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c index 6f46dfac0f..536dfc7297 100644 --- a/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c +++ b/MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c @@ -163,7 +163,7 @@ RegisterNonDiscoverableMmioDevice ( Desc->AddrLen = Size; Desc->AddrRangeMax = Base + Size - 1; Desc->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM; - Desc->AddrSpaceGranularity = (Base + Size > SIZE_4GB) ? 64 : 32; + Desc->AddrSpaceGranularity = ((EFI_PHYSICAL_ADDRESS)Base + Size > SIZE_4GB) ? 64 : 32; Desc->AddrTranslationOffset = 0; } VA_END (Args);