From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.20; helo=mga02.intel.com; envelope-from=mateusz.albecki@intel.com; receiver=edk2-devel@lists.01.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A7A2A211EB2A8 for ; Thu, 28 Mar 2019 06:56:25 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Mar 2019 06:56:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,280,1549958400"; d="scan'208";a="144630923" Received: from gklab-27-32.ger.corp.intel.com ([10.102.10.44]) by FMSMGA003.fm.intel.com with ESMTP; 28 Mar 2019 06:56:22 -0700 From: "Albecki, Mateusz" To: edk2-devel@lists.01.org Cc: "Albecki, Mateusz" , Hao Wu Date: Thu, 28 Mar 2019 14:56:02 +0100 Message-Id: X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <947b069cf75a3418bbd7664d0de60c386753d938.1553774396.git.mateusz.albecki@intel.com> References: <947b069cf75a3418bbd7664d0de60c386753d938.1553774396.git.mateusz.albecki@intel.com> In-Reply-To: References: Subject: [PATCH 2/3] MdeModulePkg/UfsPassThruDxe: Refactor UFS device presence detection X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2019 13:56:25 -0000 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 Signed-off-by: Albecki Mateusz --- .../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. @@ -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 -------------------------------------------------------------------- Intel Technology Poland sp. z o.o. ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN. Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione. This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited.