Bugzilla: https://bugzilla.tianocore.org/show_bug.cgi?id=4016
AtaAtapiPassThru driver was reporting recovery status on failed command
packets which led to incorrect flows in upper layers and to SCT tests
fails. This commit will change the logic to report command status.
Cc: Hao A Wu <hao.a...@intel.com>
Cc: Ray Ni <ray...@intel.com>
Signed-off-by: Mateusz Albecki <mateusz.albe...@intel.com>
---
.../Bus/Ata/AtaAtapiPassThru/AhciMode.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
index a240be940d..06c4a3e052 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
@@ -949,6 +949,7 @@ AhciPioTransfer (
EFI_AHCI_COMMAND_LIST CmdList;
UINT32 PrdCount;
UINT32 Retry;
+ EFI_STATUS RecoveryStatus;
if (Read) {
Flag = EfiPciIoOperationBusMasterWrite;
@@ -1026,8 +1027,8 @@ AhciPioTransfer (
if (Status == EFI_DEVICE_ERROR) {
DEBUG ((DEBUG_ERROR, "PIO command failed at retry %d\n", Retry));
- Status = AhciRecoverPortError (PciIo, Port);
- if (EFI_ERROR (Status)) {
+ RecoveryStatus = AhciRecoverPortError (PciIo, Port);
+ if (EFI_ERROR (RecoveryStatus)) {
break;
}
} else {
@@ -1122,6 +1123,7 @@ AhciDmaTransfer (
EFI_PCI_IO_PROTOCOL *PciIo;
EFI_TPL OldTpl;
UINT32 Retry;
+ EFI_STATUS RecoveryStatus;
Map = NULL;
PciIo = Instance->PciIo;
@@ -1220,8 +1222,8 @@ AhciDmaTransfer (
Status = AhciWaitUntilFisReceived (PciIo, Port, Timeout, SataFisD2H);
if (Status == EFI_DEVICE_ERROR) {
DEBUG ((DEBUG_ERROR, "DMA command failed at retry: %d\n", Retry));
- Status = AhciRecoverPortError (PciIo, Port);
- if (EFI_ERROR (Status)) {
+ RecoveryStatus = AhciRecoverPortError (PciIo, Port);
+ if (EFI_ERROR (RecoveryStatus)) {
break;
}
} else {
@@ -1261,14 +1263,14 @@ AhciDmaTransfer (
Status = AhciCheckFisReceived (PciIo, Port, SataFisD2H);
if (Status == EFI_DEVICE_ERROR) {
DEBUG ((DEBUG_ERROR, "DMA command failed at retry: %d\n",
Task->RetryTimes));
- Status = AhciRecoverPortError (PciIo, Port);
+ RecoveryStatus = AhciRecoverPortError (PciIo, Port);
//
// If recovery passed mark the Task as not started and change the
status
// to EFI_NOT_READY. This will make the higher level call this
function again
// and on next call the command will be re-issued due to IsStart being
FALSE.
// This also makes the next condition decrement the RetryTimes.
//
- if (Status == EFI_SUCCESS) {
+ if (RecoveryStatus == EFI_SUCCESS) {
Task->IsStart = FALSE;
Status = EFI_NOT_READY;
}
@@ -1375,6 +1377,7 @@ AhciNonDataTransfer (
EFI_AHCI_COMMAND_FIS CFis;
EFI_AHCI_COMMAND_LIST CmdList;
UINT32 Retry;
+ EFI_STATUS RecoveryStatus;
//
// Package read needed
@@ -1415,8 +1418,8 @@ AhciNonDataTransfer (
Status = AhciWaitUntilFisReceived (PciIo, Port, Timeout, SataFisD2H);
if (Status == EFI_DEVICE_ERROR) {
DEBUG ((DEBUG_ERROR, "Non data transfer failed at retry %d\n", Retry));
- Status = AhciRecoverPortError (PciIo, Port);
- if (EFI_ERROR (Status)) {
+ RecoveryStatus = AhciRecoverPortError (PciIo, Port);
+ if (EFI_ERROR (RecoveryStatus)) {
break;
}
} else {
--
2.28.0.windows.1
---------------------------------------------------------------------
Intel Technology Poland sp. z o.o.
ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial
Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 |
Kapital zakladowy 200.000 PLN.
Spolka oswiadcza, ze posiada status duzego przedsiebiorcy w rozumieniu ustawy z
dnia 8 marca 2013 r. o przeciwdzialaniu nadmiernym opoznieniom w transakcjach
handlowych.
Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i
moze zawierac informacje poufne. W razie przypadkowego otrzymania tej
wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie;
jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione.
This e-mail and any attachments may contain confidential material for the sole
use of the intended recipient(s). If you are not the intended recipient, please
contact the sender and delete all copies; any review or distribution by others
is strictly prohibited.
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95344): https://edk2.groups.io/g/devel/message/95344
Mute This Topic: https://groups.io/mt/94411389/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
