Skip to content

Fix retry logic in UFS device detection APIs #1577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NishanthSanjeevi wants to merge 2 commits into
base: release/202502
Choose a base branch
from
+14 −5
Open

Fix retry logic in UFS device detection APIs #1577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0821431
Fix retry in UFS device detection APIs
NishanthSanjeevi Nov 19, 2025
7fb444a
Add MU_CHANGE tags
NishanthSanjeevi Nov 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,10 +1552,12 @@ UfsDeviceDetection (
// Start UFS device detection.
// Try up to 3 times for establishing data link with device.
//
// MU_CHANGE [BEGIN] - Fix UFS device detection retry logic
for (Retry = 0; Retry < 3; Retry++) {
Status = UfsExecUicCommands (Private, UfsUicDmeLinkStartup, 0, 0, 0);
if (EFI_ERROR (Status)) {
return EFI_DEVICE_ERROR;
DEBUG ((DEBUG_ERROR, "[%a] UfsExecUicCommands failed with Status=%r\n", __func__, Status));
continue;
}

//
Expand All @@ -1567,13 +1569,15 @@ UfsDeviceDetection (
Address = Private->UfsHcBase + UFS_HC_IS_OFFSET;
Status = UfsWaitMemSet (Address, UFS_HC_IS_ULSS, UFS_HC_IS_ULSS, UFS_TIMEOUT);
if (EFI_ERROR (Status)) {
return EFI_DEVICE_ERROR;
DEBUG ((DEBUG_ERROR, "[%a] UfsWaitMemSet failed with Status=%r\n", __func__, Status));
continue;
}
} else {
DEBUG ((DEBUG_INFO, "UfsblockioPei: found a attached UFS device\n"));
return EFI_SUCCESS;
}
}
// MU_CHANGE [END] - Fix UFS device detection retry logic

return EFI_NOT_FOUND;
}
Expand Down
11 changes: 8 additions & 3 deletions MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1950,30 +1950,35 @@ UfsDeviceDetection (
// Start UFS device detection.
// Try up to 3 times for establishing data link with device.
//
// MU_CHANGE [BEGIN] - Fix UFS device detection retry logic
for (Retry = 0; Retry < 3; Retry++) {
LinkStartupCommand.Opcode = UfsUicDmeLinkStartup;
LinkStartupCommand.Arg1 = 0;
LinkStartupCommand.Arg2 = 0;
LinkStartupCommand.Arg3 = 0;
Status = UfsExecUicCommands (Private, &LinkStartupCommand);
if (EFI_ERROR (Status)) {
return EFI_DEVICE_ERROR;
DEBUG ((DEBUG_ERROR, "[%a] UfsExecUicCommands failed with Status=%r\n", __func__, Status));
continue;
}

Status = UfsMmioRead32 (Private, UFS_HC_STATUS_OFFSET, &Data);
if (EFI_ERROR (Status)) {
return EFI_DEVICE_ERROR;
DEBUG ((DEBUG_ERROR, "[%a] UfsMmioRead32 failed with Status=%r\n", __func__, Status));
continue;
}

if ((Data & UFS_HC_HCS_DP) == 0) {
Status = UfsWaitMemSet (Private, UFS_HC_IS_OFFSET, UFS_HC_IS_ULSS, UFS_HC_IS_ULSS, UFS_TIMEOUT);
if (EFI_ERROR (Status)) {
return EFI_DEVICE_ERROR;
DEBUG ((DEBUG_ERROR, "[%a] UfsWaitMemSet failed with Status=%r\n", __func__, Status));
continue;
}
} else {
return EFI_SUCCESS;
}
}
// MU_CHANGE [END] - Fix UFS device detection retry logic

return EFI_NOT_FOUND;
}
Expand Down
Loading