From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com [IPv6:2a00:1450:400c:c09::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1D65021C9E7C9 for ; Wed, 5 Jul 2017 08:16:58 -0700 (PDT) Received: by mail-wm0-x232.google.com with SMTP id f67so116521260wmh.1 for ; Wed, 05 Jul 2017 08:18:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=T1Z/rS1q1dxPEBv52R68VYsDLZb5Us8+PP8mTb8whwg=; b=JwCi9LtwGx0dGddPh52gtJ9YIcNiqA0MZhvLbjaCMwQQv0x0atWyyqsa40LTWdctau Yw02lOwSOpGTD0BJzOPsLbjVTDcVjPKn0RPJSiMe4nUQfX+Q7ooVM2XXRv2VZsmq/ORY rwixffynQsQvwIWYeZ5rRwNpzjgyr3bCx3Z2w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=T1Z/rS1q1dxPEBv52R68VYsDLZb5Us8+PP8mTb8whwg=; b=WfmoaPJjpG0H/a442k5sQqTn7m5+e4LhDy+ZwrySj8570xO2zsKFXxNf+1zxsPPZO4 9D5KkilvlF4zTcva8Oq02w+fvDQDVIJK5KDIf8x/uLYc9SA7T5hIJpotyKUY8mSH1J73 ZzhwyNFDpJy5etbiFpCkd8Ji7sdZCY5nNyvLThfzOQ6eVkvpC3y3oI1nreUsGaW+KuTl 5XQtyy6y8VAMFBoRFV+uY2U+bJdV0AP45ZjJdNiFQPqadBAXCObVa4KptP39cAV6PALO vxFhjqXOLirwYunyXxrmcdZTFfFR0N5XwhfQYtAqyrnoGCFeIh5aq19D3YDO8oN3fggF tTIA== X-Gm-Message-State: AIVw111wsGVPOAEsHUChZrHZ87hfnTtHnwHuAqwiTgqKCNeva832FP3s pNSXY4seSk3sCnh0 X-Received: by 10.28.15.8 with SMTP id 8mr7131125wmp.80.1499267916155; Wed, 05 Jul 2017 08:18:36 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id w96sm18540570wrc.33.2017.07.05.08.18.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 08:18:35 -0700 (PDT) Date: Wed, 5 Jul 2017 16:18:33 +0100 From: Leif Lindholm To: Jun Nie Cc: ard.biesheuvel@linaro.org, haojian.zhuang@linaro.org, edk2-devel@lists.01.org, shawn.guo@linaro.org, jason.liu@linaro.org Message-ID: <20170705151833.GC26676@bivouac.eciton.net> References: <1499182996-16225-1-git-send-email-jun.nie@linaro.org> MIME-Version: 1.0 In-Reply-To: <1499182996-16225-1-git-send-email-jun.nie@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [PATCH v5] EmbeddedPkg/MmcDxe: Align the ExtCSD buffer X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Jul 2017 15:16:58 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Jul 04, 2017 at 11:43:16PM +0800, Jun Nie wrote: > ExtCSD structure may be read via DMA. So align it to > page to avoid data corruption. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Jun Nie Reviewed-by: Leif Lindholm Pushed as 7bb5fad566. > --- > EmbeddedPkg/Universal/MmcDxe/Mmc.c | 3 +++ > EmbeddedPkg/Universal/MmcDxe/Mmc.h | 2 +- > EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c | 19 ++++++++++++++----- > 3 files changed, 18 insertions(+), 6 deletions(-) > > diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.c b/EmbeddedPkg/Universal/MmcDxe/Mmc.c > index 30268e3..ce27150 100644 > --- a/EmbeddedPkg/Universal/MmcDxe/Mmc.c > +++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.c > @@ -177,6 +177,9 @@ EFI_STATUS DestroyMmcHostInstance ( > if (MmcHostInstance->BlockIo.Media) { > FreePool(MmcHostInstance->BlockIo.Media); > } > + if (MmcHostInstance->CardInfo.ECSDData) { > + FreePages (MmcHostInstance->CardInfo.ECSDData, EFI_SIZE_TO_PAGES (sizeof (ECSD))); > + } > FreePool (MmcHostInstance); > > return Status; > diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.h b/EmbeddedPkg/Universal/MmcDxe/Mmc.h > index b7b9454..eb4652b 100644 > --- a/EmbeddedPkg/Universal/MmcDxe/Mmc.h > +++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.h > @@ -320,7 +320,7 @@ typedef struct { > OCR OCRData; > CID CIDData; > CSD CSDData; > - ECSD ECSDData; // MMC V4 extended card specific > + ECSD *ECSDData; // MMC V4 extended card specific > } CARD_INFO; > > typedef struct _MMC_HOST_INSTANCE { > diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c > index c28207e..7f74c54 100644 > --- a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c > +++ b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c > @@ -13,6 +13,7 @@ > **/ > > #include > +#include > #include > > #include "Mmc.h" > @@ -210,15 +211,19 @@ EmmcIdentificationMode ( > } > > // Fetch ECSD > + MmcHostInstance->CardInfo.ECSDData = AllocatePages (EFI_SIZE_TO_PAGES (sizeof (ECSD))); > + if (MmcHostInstance->CardInfo.ECSDData == NULL) { > + return EFI_OUT_OF_RESOURCES; > + } > Status = Host->SendCommand (Host, MMC_CMD8, 0); > if (EFI_ERROR (Status)) { > DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): ECSD fetch error, Status=%r.\n", Status)); > } > > - Status = Host->ReadBlockData (Host, 0, 512, (UINT32 *)&(MmcHostInstance->CardInfo.ECSDData)); > + Status = Host->ReadBlockData (Host, 0, 512, (UINT32 *)MmcHostInstance->CardInfo.ECSDData); > if (EFI_ERROR (Status)) { > DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): ECSD read error, Status=%r.\n", Status)); > - return Status; > + goto FreePageExit; > } > > // Make sure device exiting data mode > @@ -226,7 +231,7 @@ EmmcIdentificationMode ( > Status = EmmcGetDeviceState (MmcHostInstance, &State); > if (EFI_ERROR (Status)) { > DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): Failed to get device state, Status=%r.\n", Status)); > - return Status; > + goto FreePageExit; > } > } while (State == EMMC_DATA_STATE); > > @@ -237,12 +242,16 @@ EmmcIdentificationMode ( > Media->LogicalBlocksPerPhysicalBlock = 1; > Media->IoAlign = 4; > // Compute last block using bits [215:212] of the ECSD > - Media->LastBlock = MmcHostInstance->CardInfo.ECSDData.SECTOR_COUNT - 1; // eMMC isn't supposed to report this for > + Media->LastBlock = MmcHostInstance->CardInfo.ECSDData->SECTOR_COUNT - 1; // eMMC isn't supposed to report this for > // Cards <2GB in size, but the model does. > > // Setup card type > MmcHostInstance->CardInfo.CardType = EMMC_CARD; > return EFI_SUCCESS; > + > +FreePageExit: > + FreePages (MmcHostInstance->CardInfo.ECSDData, EFI_SIZE_TO_PAGES (sizeof (ECSD))); > + return Status; > } > > STATIC > @@ -258,7 +267,7 @@ InitializeEmmcDevice ( > UINT32 TimingMode[4] = {EMMCHS52DDR1V2, EMMCHS52DDR1V8, EMMCHS52, EMMCHS26}; > > Host = MmcHostInstance->MmcHost; > - ECSDData = &MmcHostInstance->CardInfo.ECSDData; > + ECSDData = MmcHostInstance->CardInfo.ECSDData; > if (ECSDData->DEVICE_TYPE == EMMCBACKWARD) > return EFI_SUCCESS; > > -- > 1.9.1 >