From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: tien.hock.loh@intel.com) Received: from mga14.intel.com (mga14.intel.com []) by groups.io with SMTP; Thu, 02 May 2019 20:28:12 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2019 20:28:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,424,1549958400"; d="scan'208";a="167124858" Received: from pg-iccf0195.altera.com ([10.104.4.90]) by fmsmga002.fm.intel.com with ESMTP; 02 May 2019 20:28:11 -0700 From: "Loh, Tien Hock" To: devel@edk2.groups.io, thloh85@gmail.com Cc: "Tien Hock, Loh" , Leif Lindholm , Ard Biesheuvel Subject: [[PATCH v2] 3/7] EmbeddedPkg: Fix DwEmmc driver bugs Date: Fri, 3 May 2019 11:26:59 +0800 Message-Id: <1556854023-5486-4-git-send-email-tien.hock.loh@intel.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1556854023-5486-1-git-send-email-tien.hock.loh@intel.com> References: <1556854023-5486-1-git-send-email-tien.hock.loh@intel.com> From: "Tien Hock, Loh" On CMD8, for SD, the controller should not expect data as this is a SEND_IF_COND command to verify SD operating condition, and does not have data Signed-off-by: "Tien Hock, Loh" Cc: Leif Lindholm Cc: Ard Biesheuvel --- EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c | 9 ++++++--- EmbeddedPkg/Include/Protocol/MmcHost.h | 1 + EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c index 058665b..04fdcbf 100644 --- a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c +++ b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c @@ -339,9 +339,12 @@ DwEmmcSendCommand ( Cmd = 0; break; case MMC_INDX(8): - Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC | - BIT_CMD_DATA_EXPECTED | BIT_CMD_READ | - BIT_CMD_WAIT_PRVDATA_COMPLETE; + if (!This->IsEmmc) + Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC | + BIT_CMD_WAIT_PRVDATA_COMPLETE ; + else + Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC | + BIT_CMD_WAIT_PRVDATA_COMPLETE | BIT_CMD_READ | BIT_CMD_DATA_EXPECTED; break; case MMC_INDX(9): Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC | diff --git a/EmbeddedPkg/Include/Protocol/MmcHost.h b/EmbeddedPkg/Include/Protocol/MmcHost.h index 9e07082..ae8ea5d 100644 --- a/EmbeddedPkg/Include/Protocol/MmcHost.h +++ b/EmbeddedPkg/Include/Protocol/MmcHost.h @@ -169,6 +169,7 @@ struct _EFI_MMC_HOST_PROTOCOL { MMC_SETIOS SetIos; MMC_ISMULTIBLOCK IsMultiBlock; + BOOLEAN IsEmmc; }; #define MMC_HOST_PROTOCOL_REVISION 0x00010002 // 1.2 diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c index 4dc0be1..fa1eda2 100755 --- a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c +++ b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c @@ -770,8 +770,10 @@ InitializeMmcDevice ( } if (MmcHostInstance->CardInfo.CardType != EMMC_CARD) { + MmcHostInstance->MmcHost->IsEmmc = FALSE; Status = InitializeSdMmcDevice (MmcHostInstance); } else { + MmcHostInstance->MmcHost->IsEmmc = TRUE; Status = InitializeEmmcDevice (MmcHostInstance); } if (EFI_ERROR (Status)) { -- 2.2.2