From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com [IPv6:2a00:1450:400c:c09::22f]) (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 C1C6B21B02B97 for ; Thu, 29 Jun 2017 04:09:45 -0700 (PDT) Received: by mail-wm0-x22f.google.com with SMTP id b184so10617312wme.1 for ; Thu, 29 Jun 2017 04:11:18 -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=w0nb2h4KCKk6elVmIvAnbIZiPbQIAfQm2jylNcIf0Wk=; b=EhoH2F/RN5CLQvIV1nYDarrZq0S9/YQ1/wT7cuZiuMikaSZAXDVJyKz3EyRVuq/Ojq wkxKWetXfPNxTw0zIOyLZWO6G7asCYx0NK1Pyb/ikDJbAGVN86roWM90piM+qzJGe1N6 bZ0bTg4I+g4r5d0qYTg/7Omvnfb3rGi+0eBu0= 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=w0nb2h4KCKk6elVmIvAnbIZiPbQIAfQm2jylNcIf0Wk=; b=IQazHw4TTSyIcToN4jHi4H99t3d+fPD4mJWe+LP4Pci8qTULfpZiQRash5CfaUtvCX n6EhxtRmMOp9e71lcaT81awzyzvJQHyvklYVUJ3Q5wWMmpKjFYuTCjulZWVTFn2whzOq fVzRNVO2zctNyO/5TwryLa6laMqzC2P7Fgr1o8n6U5ZT+M/6a7W02UiY8mRttxiFXpf+ DKfApshhNoxWzgHmx4sQ6zNnUCKTpa8cydjBhx22TBqtvIBGumYPbLwTML7H6llb6wk5 NCVCw4lnqFR4koWxAOz0wOjN7fRws64XZbm5ea/BtRziOhLC81l22vUUben6ZnbpJfMA 8XXA== X-Gm-Message-State: AKS2vOzCxvO75mgHlIXYn+nUkPWPxgAXEiNL9aIcL7S6wWRj5S2WvKL6 C2MBoKxTBucVhYVS X-Received: by 10.28.184.207 with SMTP id i198mr9962096wmf.22.1498734676869; Thu, 29 Jun 2017 04:11:16 -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 x21sm2433931wme.24.2017.06.29.04.11.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Jun 2017 04:11:16 -0700 (PDT) Date: Thu, 29 Jun 2017 12:11:14 +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: <20170629111114.GR26676@bivouac.eciton.net> References: <1498727030-26410-1-git-send-email-jun.nie@linaro.org> MIME-Version: 1.0 In-Reply-To: <1498727030-26410-1-git-send-email-jun.nie@linaro.org> User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [PATCH] 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: Thu, 29 Jun 2017 11:09:46 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Jun 29, 2017 at 05:03:50PM +0800, Jun Nie wrote: > ExtCSD structure may be read via DMA. So align it to > page to avoid data corruption. So, this is possibly a valid thing to do, but this is not what you said in the last version. The last version said you needed 64-bit alignment, and this is already guaranteed by all of the allocation functions. > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Jun Nie > --- > EmbeddedPkg/Universal/MmcDxe/Mmc.h | 2 +- > EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c | 11 ++++++++--- > 2 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.h b/EmbeddedPkg/Universal/MmcDxe/Mmc.h > index 8a7d5a3..f3e56ff 100644 > --- a/EmbeddedPkg/Universal/MmcDxe/Mmc.h > +++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.h > @@ -319,7 +319,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..6bb65c3 100644 > --- a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c > +++ b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c > @@ -13,6 +13,7 @@ > **/ > > #include > +#include > #include > > #include "Mmc.h" > @@ -210,12 +211,16 @@ EmmcIdentificationMode ( > } > > // Fetch ECSD > + MmcHostInstance->CardInfo.ECSDData = AllocatePages (1); No magic numbers please. Suggest EFI_SIZE_TO_PAGES (sizeof (ECSD)); Or AllocatePool (EFI_SIZE_TO_PAGES (sizeof (ECSD))); I'm not seeing a balancing FreePages call in this patch. My guess would be that DestroyMmcHostInstance() would be the correct location for it. > + if (MmcHostInstance->CardInfo.ECSDData == NULL) { > + return EFI_BUFFER_TOO_SMALL; I think EFI_OUT_OF_RESOURCES would be more appropriate. / Leif > + } > 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; > @@ -237,7 +242,7 @@ 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 > @@ -258,7 +263,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 >