-----Original Message-----
From: Ke, VincentX <vincentx.ke@...>
Sent: Friday, December 17, 2021 4:10 PM
To: devel@edk2.groups.io
Cc: Ke, VincentX <vincentx.ke@...>; Wu, Hao A <hao.a.wu@...>;
Ni, Ray <ray.ni@...>; Chiu, Ian <Ian.chiu@...>; Chu, Maggie
<maggie.chu@...>
Subject: [PATCH v4] MdeModulePkg: Replace with UFS_UNIT_DESC to fix
timeout problem

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

Replace with UFS_UNIT_DESC to fix response timeout problem.

Cc: Hao A Wu <hao.a.wu@...>
Cc: Ray Ni <ray.ni@...>
Cc: Ian Chiu <Ian.chiu@...>
Cc: Maggie Chu <maggie.chu@...>
Signed-off-by: VincentX Ke <vincentx.ke@...>
---
.../Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c | 20 +++++++++----------
1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c
b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c
index b331c0f3e3..9ad1e19fe0 100644
--- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c
+++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsBlockIoPei.c
@@ -1037,9 +1037,9 @@ InitializeUfsBlockIoPeim (
UFS_PEIM_HC_PRIVATE_DATA *Private;
EDKII_UFS_HOST_CONTROLLER_PPI *UfsHcPpi;
UINT32 Index;
- UFS_CONFIG_DESC Config;
UINTN MmioBase;
UINT8 Controller;
+ UFS_UNIT_DESC UnitDescriptor;

//
// Shadow this PEIM to run from memory @@ -1126,19 +1126,17 @@
InitializeUfsBlockIoPeim (
}

//
- // Get Ufs Device's Lun Info by reading Configuration Descriptor.
+ // Check if 8 common luns are active and set corresponding bit mask.
//
- Status = UfsRwDeviceDesc (Private, TRUE, UfsConfigDesc, 0, 0, &Config,
sizeof (UFS_CONFIG_DESC));
- if (EFI_ERROR (Status)) {
- DEBUG ((DEBUG_ERROR, "Ufs Get Configuration Descriptor Error, Status
= %r\n", Status));
- Controller++;
- continue;
- }
-
for (Index = 0; Index < UFS_PEIM_MAX_LUNS; Index++) {
- if (Config.UnitDescConfParams[Index].LunEn != 0) {
- Private->Luns.BitMask |= (BIT0 << Index);
+ Status = UfsRwDeviceDesc (Private, TRUE, UfsUnitDesc, (UINT8) Index, 0,
&UnitDescriptor, sizeof (UFS_UNIT_DESC));
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "Fail to read UFS Unit Descriptor, Index = %X,
Status = %r\n", Index, Status));
+ continue;
+ }
+ if (UnitDescriptor.LunEn == 0x1) {
DEBUG ((DEBUG_INFO, "Ufs %d Lun %d is enabled\n", Controller, Index));
+ Private->Luns.BitMask |= (BIT0 << Index);
}
}

--
2.18.0.windows.1