Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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 <hao.a.wu@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
This commit is contained in:
Hao Wu 2017-01-11 09:54:39 +08:00
parent ce5354d68c
commit b494cf96e7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MdeModulePkg/Bus/Pci/NonDiscoverablePciDeviceDxe/NonDiscoverablePciDeviceIo.c
View File

@ -598,7 +598,7 @@ CoherentPciIoMap (
// //
Dev = NON_DISCOVERABLE_PCI_DEVICE_FROM_PCI_IO(This); Dev = NON_DISCOVERABLE_PCI_DEVICE_FROM_PCI_IO(This);
if ((Dev->Attributes & EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE) == 0 && 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 // 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. // a bounce buffer and copy over the data in case HostAddress >= 4 GB.
// //
Bounce = ((Dev->Attributes & EFI_PCI_IO_ATTRIBUTE_DUAL_ADDRESS_CYCLE) == 0 && 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) { if (!Bounce) {
switch (Operation) { switch (Operation) {

2
MdeModulePkg/Library/NonDiscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.c
View File

@ -163,7 +163,7 @@ RegisterNonDiscoverableMmioDevice (
Desc->AddrLen = Size; Desc->AddrLen = Size;
Desc->AddrRangeMax = Base + Size - 1; Desc->AddrRangeMax = Base + Size - 1;
Desc->ResType = ACPI_ADDRESS_SPACE_TYPE_MEM; 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; Desc->AddrTranslationOffset = 0;
} }
VA_END (Args); VA_END (Args);