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 mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Mon, 27 May 2019 02:31:51 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 May 2019 02:31:50 -0700 X-ExtLoop1: 1 Received: from pg-nx11.altera.com ([10.104.4.26]) by orsmga008.jf.intel.com with ESMTP; 27 May 2019 02:31:49 -0700 From: "Loh, Tien Hock" To: devel@edk2.groups.io, thloh85@gmail.com Cc: "Tien Hock, Loh" , Leif Lindholm , Ard Biesheuvel Subject: [PATCH v2 2/7] EmbeddedPkg: Fix DwEmmc CMD8 support for SD Date: Mon, 27 May 2019 17:30:23 +0800 Message-Id: <1558949428-190715-3-git-send-email-tien.hock.loh@intel.com> X-Mailer: git-send-email 2.2.2 In-Reply-To: <1558949428-190715-1-git-send-email-tien.hock.loh@intel.com> References: <1558949428-190715-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 -- v2 - Change IsEmmc to EFI_MMC_HOST_CARD_TYPE --- EmbeddedPkg/Include/Protocol/MmcHost.h | 6 ++++++ EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c | 9 ++++++--- EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c | 2 ++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/EmbeddedPkg/Include/Protocol/MmcHost.h b/EmbeddedPkg/Include/Protocol/MmcHost.h index 9e07082680..7807744721 100644 --- a/EmbeddedPkg/Include/Protocol/MmcHost.h +++ b/EmbeddedPkg/Include/Protocol/MmcHost.h @@ -151,6 +151,11 @@ typedef BOOLEAN (EFIAPI *MMC_ISMULTIBLOCK) ( IN EFI_MMC_HOST_PROTOCOL *This ); +typedef enum { + EMMC, + SD +} EFI_MMC_HOST_CARD_TYPE; + struct _EFI_MMC_HOST_PROTOCOL { UINT32 Revision; @@ -169,6 +174,7 @@ struct _EFI_MMC_HOST_PROTOCOL { MMC_SETIOS SetIos; MMC_ISMULTIBLOCK IsMultiBlock; + EFI_MMC_HOST_CARD_TYPE HostCardType; }; #define MMC_HOST_PROTOCOL_REVISION 0x00010002 // 1.2 diff --git a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c index 420487757d..fd3a5bf685 100644 --- a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c +++ b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c @@ -340,9 +340,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->HostCardType == SD) + 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/Universal/MmcDxe/MmcIdentification.c b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c index 4dc0be125c..c816ae09ee 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->HostCardType = SD; Status = InitializeSdMmcDevice (MmcHostInstance); } else { + MmcHostInstance->MmcHost->HostCardType = EMMC; Status = InitializeEmmcDevice (MmcHostInstance); } if (EFI_ERROR (Status)) { -- 2.19.0