On Mon, May 27, 2019 at 05:30:23PM +0800, tien.hock....@intel.com wrote: > From: "Tien Hock, Loh" <tien.hock....@intel.com> > > 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 <tien.hock....@intel.com> > Cc: Leif Lindholm <leif.lindh...@linaro.org> > Cc: Ard Biesheuvel <ard.biesheu...@linaro.org> > > -- > v2 > - Change IsEmmc to EFI_MMC_HOST_CARD_TYPE
Version information goes below ---. Never type this manually - sooner or later you will leave out a like above and accidentally have it included in the commit message. It is also helpful to include this information in a cover letter [0/7]. For simple changes like this, there is no need to list it individually in each patch. > --- > 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; I saw no comment on my feedback from previous revision that --- I think this would be more clear as Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC | BIT_CMD_WAIT_PRVDATA_COMPLETE; if (...) { Cmd |= BIT_CMD_READ | BIT_CMD_DATA_EXPECTED; } --- and the request was not followed. Also, always use { and } with if/else. / Leif > 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 > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#41534): https://edk2.groups.io/g/devel/message/41534 Mute This Topic: https://groups.io/mt/31807961/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-