diff options
author | Ke, VincentX <vincentx.ke@intel.com> | 2021-12-23 15:07:54 +0800 |
---|---|---|
committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2022-01-04 02:23:14 +0000 |
commit | 13d9e8ec98ee3f9f14a45471b38a22b9fd66d1ce (patch) | |
tree | 26dd811744243f5cc9658aa369a3f3ce25f4ffd5 | |
parent | 45920941d9ae543d9c5b4881622fe0ed769673b6 (diff) | |
download | edk2-13d9e8ec98ee3f9f14a45471b38a22b9fd66d1ce.zip edk2-13d9e8ec98ee3f9f14a45471b38a22b9fd66d1ce.tar.gz edk2-13d9e8ec98ee3f9f14a45471b38a22b9fd66d1ce.tar.bz2 |
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>
-rw-r--r-- | MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c | 47 |
1 files changed, 19 insertions, 28 deletions
diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c index 409ea28..d19a7fe 100644 --- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c +++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c @@ -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;
}
/**
|