From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.6931.1639637793147068148 for ; Wed, 15 Dec 2021 22:56:33 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=Nn1L58uq; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: vincentx.ke@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639637793; x=1671173793; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=57Toh0RKX0hWcCDJ090GkZPiVBqgR5es76WwFgDFkI0=; b=Nn1L58uqHcv3eLMShmlSIPb3PM4BbRtry24YpyrrwJ3mM0xtgOUAXniK QAoxwC7uCw9jj0eZfQ0t6JzCzukAhQGQuA2wVr0XncCGtIw8AC56t11qR gHtKd/NFB8MUYACvA/3FtINDTIIXl8HCLohqgdMqTUNpgGPAQ4WzS98Qz TjvbP+23/LXXmJObB2TMAfoGMAHv2bBNJ0DKOjjFgPegkKKIgW95qJw9K AH2iyyTZWJaBbFtUmIgHrUI0HjtVEIpP7yQSD8Y/Nd8G7WYPvUZOunFpE NFF7HyE1B7Hp/JdeeAnxaomA1wA2VRTrA6JgJWay0Y2kn4oa2bfFWq4gU w==; X-IronPort-AV: E=McAfee;i="6200,9189,10199"; a="325699611" X-IronPort-AV: E=Sophos;i="5.88,210,1635231600"; d="scan'208";a="325699611" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2021 22:56:31 -0800 X-IronPort-AV: E=Sophos;i="5.88,210,1635231600"; d="scan'208";a="568234923" Received: from kxinfux-win10.gar.corp.intel.com ([10.227.107.41]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2021 22:56:30 -0800 From: "VincentX Ke" To: devel@edk2.groups.io Cc: VincentX Ke , Hao A Wu , Ray Ni , Ian Chiu , Maggie Chu Subject: [PATCH] MdeModulePkg: Moving UFS HCS.DP checking out of UfsExecUicCommands() to fix timing problem Date: Thu, 16 Dec 2021 14:56:15 +0800 Message-Id: <20211216065615.16496-1-vincentx.ke@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3776 Moving UFS HCS.DP (Device Attached) checking under UfsDeviceDetection() to fix timing problem. Cc: Hao A Wu Cc: Ray Ni Cc: Ian Chiu Cc: Maggie Chu Signed-off-by: VincentX Ke --- MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c | 51 +++++++++------------ 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c index 9fa5fcf46f..447d6cab7f 100644 --- a/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c +++ b/MdeModulePkg/Bus/Ufs/UfsBlockIoPei/UfsHci.c @@ -1353,23 +1353,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; } @@ -1442,8 +1425,10 @@ UfsDeviceDetection ( IN UFS_PEIM_HC_PRIVATE_DATA *Private ) { - UINTN Retry; - EFI_STATUS Status; + UINTN Retry; + UINTN Address; + UINT32 Data; + EFI_STATUS Status; // // Start UFS device detection. @@ -1451,22 +1436,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; } /** -- 2.18.0.windows.1