MdeModulePkg: Put off UFS HCS.DP checking to fix timing problem

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3776

Put off UFS HCS.DP (Device Attached) checking
until UfsDeviceDetection() to fix timing problem.

Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Ian Chiu <Ian.chiu@intel.com>
Cc: Maggie Chu <maggie.chu@intel.com>
Signed-off-by: VincentX Ke <vincentx.ke@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
This commit is contained in:
Ke, VincentX 2021-12-23 15:07:54 +08:00 committed by mergify[bot]
parent 45920941d9
commit 13d9e8ec98
1 changed files with 19 additions and 28 deletions

View File

@ -1355,23 +1355,6 @@ UfsExecUicCommands (
}
}
//
// Check value of HCS.DP and make sure that there is a device attached to the Link.
//
Address = UfsHcBase + UFS_HC_STATUS_OFFSET;
Data = MmioRead32 (Address);
if ((Data & UFS_HC_HCS_DP) == 0) {
Address = 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;
}
return EFI_NOT_FOUND;
}
DEBUG ((DEBUG_INFO, "UfsblockioPei: found a attached UFS device\n"));
return EFI_SUCCESS;
}
@ -1445,6 +1428,8 @@ UfsDeviceDetection (
)
{
UINTN Retry;
UINTN Address;
UINT32 Data;
EFI_STATUS Status;
//
@ -1453,22 +1438,28 @@ UfsDeviceDetection (
//
for (Retry = 0; Retry < 3; Retry++) {
Status = UfsExecUicCommands (Private, UfsUicDmeLinkStartup, 0, 0, 0);
if (!EFI_ERROR (Status)) {
break;
if (EFI_ERROR (Status)) {
return EFI_DEVICE_ERROR;
}
if (Status == EFI_NOT_FOUND) {
continue;
//
// Check value of HCS.DP and make sure that there is a device attached to the Link
//
Address = Private->UfsHcBase + UFS_HC_STATUS_OFFSET;
Data = MmioRead32 (Address);
if ((Data & UFS_HC_HCS_DP) == 0) {
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;
}
} else {
DEBUG ((DEBUG_INFO, "UfsblockioPei: found a attached UFS device\n"));
return EFI_SUCCESS;
}
return EFI_DEVICE_ERROR;
}
if (Retry == 3) {
return EFI_NOT_FOUND;
}
return EFI_SUCCESS;
return EFI_NOT_FOUND;
}
/**