> -----Original Message----- > From: Albecki, Mateusz > Sent: Thursday, March 28, 2019 9:56 PM > To: edk2-devel@lists.01.org > Cc: Albecki, Mateusz; Wu, Hao A > Subject: [PATCH 2/3] MdeModulePkg/UfsPassThruDxe: Refactor UFS device > presence detection > > In current implementation we are checking for device presence every > time we execute UIC command. To make UfsExecUicCommands more generic > checking device presence has been moved to UfsDeviceDetection. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Cc: Hao Wu <hao.a...@intel.com> > Signed-off-by: Albecki Mateusz <mateusz.albe...@intel.com> > --- > .../Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c | 49 > ++++++++-------------- > 1 file changed, 18 insertions(+), 31 deletions(-) > > diff --git a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c > b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c > index 9d0793c6be..c37161c4ae 100644 > --- a/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c > +++ b/MdeModulePkg/Bus/Ufs/UfsPassThruDxe/UfsPassThruHci.c > @@ -1621,7 +1621,7 @@ Exit1: > } > > /** > - Sent UIC DME_LINKSTARTUP command to start the link startup procedure. > + Send UIC command. > > @param[in] Private The pointer to the UFS_PASS_THRU_PRIVATE_DATA > data structure. > @param[in] UicOpcode The opcode of the UIC command.
Please help to update remove the line: @return EFI_NOT_FOUND The presence of the UFS device isn't detected. from the description of functions UfsExecUicCommands(). Other than this, the patch is good to me: Reviewed-by: Hao Wu <hao.a...@intel.com> Best Regards, Hao Wu > @@ -1716,24 +1716,6 @@ UfsExecUicCommands ( > } > } > > - // > - // Check value of HCS.DP and make sure that there is a device attached to > the Link. > - // > - Status = UfsMmioRead32 (Private, UFS_HC_STATUS_OFFSET, &Data); > - if (EFI_ERROR (Status)) { > - return Status; > - } > - > - 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; > - } > - return EFI_NOT_FOUND; > - } > - > - DEBUG ((DEBUG_INFO, "UfsPassThruDxe: found a attached UFS device\n")); > - > return EFI_SUCCESS; > } > > @@ -1907,8 +1889,9 @@ UfsDeviceDetection ( > IN UFS_PASS_THRU_PRIVATE_DATA *Private > ) > { > - UINTN Retry; > - EFI_STATUS Status; > + UINTN Retry; > + EFI_STATUS Status; > + UINT32 Data; > > // > // Start UFS device detection. > @@ -1916,22 +1899,26 @@ 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; > + Status = UfsMmioRead32 (Private, UFS_HC_STATUS_OFFSET, &Data); > + if (EFI_ERROR (Status)) { > + return EFI_DEVICE_ERROR; > } > > - return EFI_DEVICE_ERROR; > - } > - > - if (Retry == 3) { > - return EFI_NOT_FOUND; > + 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; > + } > + } else { > + return EFI_SUCCESS; > + } > } > > - return EFI_SUCCESS; > + return EFI_NOT_FOUND; > } > > /** > -- > 2.14.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel