sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg/Ufs: Wait fDeviceInit be cleared by devices during init

Browse Source 
In the origin codes, the host sets the fDeviceInit flag to initiate device
initialization, but does not check whether the device resets this flag
to indicate the device initialization is completed.

Details can be referred at UFS 2.0 Spec Section 14.2 - Flags.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Mateusz Albecki <mateusz.albecki@intel.com>
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
(cherry picked from commit 95ad8f7f6a)
This commit is contained in:
Hao Wu
2017-03-21 13:22:36 +08:00
parent c29973b789
commit ce0f811c28
3 changed files with 288 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThru.c
View File

@@ -729,6 +729,48 @@ UfsPassThruDriverBindingSupported (
return EFI_SUCCESS;
}
/**
Finishes device initialization by setting fDeviceInit flag and waiting untill device responds by
clearing it.
@param[in] Private Pointer to the UFS_PASS_THRU_PRIVATE_DATA.
@retval EFI_SUCCESS The operation succeeds.
@retval Others The operation fails.
**/
EFI_STATUS
UfsFinishDeviceInitialization (
IN UFS_PASS_THRU_PRIVATE_DATA *Private
)
{
EFI_STATUS Status;
UINT8 DeviceInitStatus;
UINT8 Timeout;
DeviceInitStatus = 0xFF;
//
// The host enables the device initialization completion by setting fDeviceInit flag.
//
Status = UfsSetFlag (Private, UfsFlagDevInit);
if (EFI_ERROR (Status)) {
return Status;
}
Timeout = 5;
do {
Status = UfsReadFlag (Private, UfsFlagDevInit, &DeviceInitStatus);
if (EFI_ERROR (Status)) {
return Status;
}
MicroSecondDelay (1);
Timeout--;
} while (DeviceInitStatus != 0 && Timeout != 0);
return EFI_SUCCESS;
}
/**
Starts a device controller or a bus controller.
@@ -777,7 +819,7 @@ UfsPassThruDriverBindingStart (
UFS_PASS_THRU_PRIVATE_DATA *Private;
UINTN UfsHcBase;
UINT32 Index;
UFS_CONFIG_DESC Config;
UFS_UNIT_DESC UnitDescriptor;
Status = EFI_SUCCESS;
UfsHc = NULL;
@@ -844,21 +886,9 @@ UfsPassThruDriverBindingStart (
goto Error;
}
//
// The host enables the device initialization completion by setting fDeviceInit flag.
//
Status = UfsSetFlag (Private, UfsFlagDevInit);
Status = UfsFinishDeviceInitialization (Private);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "Ufs Set fDeviceInit Flag Error, Status = %r\n", Status));
goto Error;
}
//
// Get Ufs Device's Lun Info by reading Configuration Descriptor.
//
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));
DEBUG ((DEBUG_ERROR, "Device failed to finish initialization, Status = %r\n", Status));
goto Error;
}
@@ -867,9 +897,14 @@ UfsPassThruDriverBindingStart (
// TODO: Parse device descriptor to decide if exposing RPMB LUN to upper layer for authentication access.
//
for (Index = 0; Index < 8; Index++) {
if (Config.UnitDescConfParams[Index].LunEn != 0) {
Status = UfsRwDeviceDesc (Private, TRUE, UfsUnitDesc, (UINT8) Index, 0, &UnitDescriptor, sizeof (UFS_UNIT_DESC));
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "Failed to read unit descriptor, index = %X, status = %r\n", Index, Status));
continue;
}
if (UnitDescriptor.LunEn == 0x1) {
DEBUG ((DEBUG_INFO, "UFS LUN %X is enabled\n", Index));
Private->Luns.BitMask |= (BIT0 << Index);
DEBUG ((DEBUG_INFO, "Ufs Lun %d is enabled\n", Index));
}
}