diff options
| -rw-r--r-- | MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c | 30 | ||||
| -rw-r--r-- | MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c | 8 |
2 files changed, 22 insertions, 16 deletions
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c index 40012d7978..8ba0201563 100644 --- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c +++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c @@ -1778,6 +1778,9 @@ AhciCreateTransferDescriptor ( UINT64 MaxReceiveFisSize;
UINT64 MaxCommandListSize;
UINT64 MaxCommandTableSize;
+ EFI_PHYSICAL_ADDRESS AhciRFisPciAddr;
+ EFI_PHYSICAL_ADDRESS AhciCmdListPciAddr;
+ EFI_PHYSICAL_ADDRESS AhciCommandTablePciAddr;
Buffer = NULL;
//
@@ -1796,7 +1799,7 @@ AhciCreateTransferDescriptor ( PciIo,
AllocateAnyPages,
EfiBootServicesData,
- (UINTN)EFI_SIZE_TO_PAGES (MaxReceiveFisSize),
+ EFI_SIZE_TO_PAGES ((UINTN) MaxReceiveFisSize),
&Buffer,
0
);
@@ -1816,7 +1819,7 @@ AhciCreateTransferDescriptor ( EfiPciIoOperationBusMasterCommonBuffer,
Buffer,
&Bytes,
- (EFI_PHYSICAL_ADDRESS *) &AhciRegisters->AhciRFisPciAddr,
+ &AhciRFisPciAddr,
&AhciRegisters->MapRFis
);
@@ -1828,13 +1831,14 @@ AhciCreateTransferDescriptor ( goto Error6;
}
- if ((!Support64Bit) && ((EFI_PHYSICAL_ADDRESS)(UINTN)AhciRegisters->AhciRFisPciAddr > 0x100000000ULL)) {
+ if ((!Support64Bit) && (AhciRFisPciAddr > 0x100000000ULL)) {
//
// The AHCI HBA doesn't support 64bit addressing, so should not get a >4G pci bus master address.
//
Status = EFI_DEVICE_ERROR;
goto Error5;
}
+ AhciRegisters->AhciRFisPciAddr = (EFI_AHCI_RECEIVED_FIS *)(UINTN)AhciRFisPciAddr;
//
// Allocate memory for command list
@@ -1846,7 +1850,7 @@ AhciCreateTransferDescriptor ( PciIo,
AllocateAnyPages,
EfiBootServicesData,
- (UINTN)EFI_SIZE_TO_PAGES (MaxCommandListSize),
+ EFI_SIZE_TO_PAGES ((UINTN) MaxCommandListSize),
&Buffer,
0
);
@@ -1870,7 +1874,7 @@ AhciCreateTransferDescriptor ( EfiPciIoOperationBusMasterCommonBuffer,
Buffer,
&Bytes,
- (EFI_PHYSICAL_ADDRESS *)&AhciRegisters->AhciCmdListPciAddr,
+ &AhciCmdListPciAddr,
&AhciRegisters->MapCmdList
);
@@ -1882,13 +1886,14 @@ AhciCreateTransferDescriptor ( goto Error4;
}
- if ((!Support64Bit) && ((EFI_PHYSICAL_ADDRESS)(UINTN)AhciRegisters->AhciCmdListPciAddr > 0x100000000ULL)) {
+ if ((!Support64Bit) && (AhciCmdListPciAddr > 0x100000000ULL)) {
//
// The AHCI HBA doesn't support 64bit addressing, so should not get a >4G pci bus master address.
//
Status = EFI_DEVICE_ERROR;
goto Error3;
}
+ AhciRegisters->AhciCmdListPciAddr = (EFI_AHCI_COMMAND_LIST *)(UINTN)AhciCmdListPciAddr;
//
// Allocate memory for command table
@@ -1901,7 +1906,7 @@ AhciCreateTransferDescriptor ( PciIo,
AllocateAnyPages,
EfiBootServicesData,
- (UINTN)EFI_SIZE_TO_PAGES (MaxCommandTableSize),
+ EFI_SIZE_TO_PAGES ((UINTN) MaxCommandTableSize),
&Buffer,
0
);
@@ -1925,7 +1930,7 @@ AhciCreateTransferDescriptor ( EfiPciIoOperationBusMasterCommonBuffer,
Buffer,
&Bytes,
- (EFI_PHYSICAL_ADDRESS *)&AhciRegisters->AhciCommandTablePciAddr,
+ &AhciCommandTablePciAddr,
&AhciRegisters->MapCommandTable
);
@@ -1937,13 +1942,14 @@ AhciCreateTransferDescriptor ( goto Error2;
}
- if ((!Support64Bit) && ((EFI_PHYSICAL_ADDRESS)(UINTN)AhciRegisters->AhciCommandTablePciAddr > 0x100000000ULL)) {
+ if ((!Support64Bit) && (AhciCommandTablePciAddr > 0x100000000ULL)) {
//
// The AHCI HBA doesn't support 64bit addressing, so should not get a >4G pci bus master address.
//
Status = EFI_DEVICE_ERROR;
goto Error1;
}
+ AhciRegisters->AhciCommandTablePciAddr = (EFI_AHCI_COMMAND_TABLE *)(UINTN)AhciCommandTablePciAddr;
return EFI_SUCCESS;
//
@@ -1957,7 +1963,7 @@ Error1: Error2:
PciIo->FreeBuffer (
PciIo,
- (UINTN)EFI_SIZE_TO_PAGES (MaxCommandTableSize),
+ EFI_SIZE_TO_PAGES ((UINTN) MaxCommandTableSize),
AhciRegisters->AhciCommandTable
);
Error3:
@@ -1968,7 +1974,7 @@ Error3: Error4:
PciIo->FreeBuffer (
PciIo,
- (UINTN)EFI_SIZE_TO_PAGES (MaxCommandListSize),
+ EFI_SIZE_TO_PAGES ((UINTN) MaxCommandListSize),
AhciRegisters->AhciCmdList
);
Error5:
@@ -1979,7 +1985,7 @@ Error5: Error6:
PciIo->FreeBuffer (
PciIo,
- (UINTN)EFI_SIZE_TO_PAGES (MaxReceiveFisSize),
+ EFI_SIZE_TO_PAGES ((UINTN) MaxReceiveFisSize),
AhciRegisters->AhciRFis
);
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c index bbaf5523ac..ca64df7f6b 100644 --- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c +++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.c @@ -2,7 +2,7 @@ This file implements ATA_PASSTHRU_PROCTOCOL and EXT_SCSI_PASSTHRU_PROTOCOL interfaces
for managed ATA controllers.
- Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2010 - 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -610,7 +610,7 @@ AtaAtapiPassThruStop ( );
PciIo->FreeBuffer (
PciIo,
- (UINTN) EFI_SIZE_TO_PAGES (AhciRegisters->MaxCommandTableSize),
+ EFI_SIZE_TO_PAGES ((UINTN) AhciRegisters->MaxCommandTableSize),
AhciRegisters->AhciCommandTable
);
PciIo->Unmap (
@@ -619,7 +619,7 @@ AtaAtapiPassThruStop ( );
PciIo->FreeBuffer (
PciIo,
- (UINTN) EFI_SIZE_TO_PAGES (AhciRegisters->MaxCommandListSize),
+ EFI_SIZE_TO_PAGES ((UINTN) AhciRegisters->MaxCommandListSize),
AhciRegisters->AhciCmdList
);
PciIo->Unmap (
@@ -628,7 +628,7 @@ AtaAtapiPassThruStop ( );
PciIo->FreeBuffer (
PciIo,
- (UINTN) EFI_SIZE_TO_PAGES (AhciRegisters->MaxReceiveFisSize),
+ EFI_SIZE_TO_PAGES ((UINTN) AhciRegisters->MaxReceiveFisSize),
AhciRegisters->AhciRFis
);
}
|