From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-x236.google.com (mail-pa0-x236.google.com [IPv6:2607:f8b0:400e:c03::236]) (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 654FE1A1EDF for ; Wed, 21 Sep 2016 08:02:40 -0700 (PDT) Received: by mail-pa0-x236.google.com with SMTP id hm5so19301373pac.0 for ; Wed, 21 Sep 2016 08:02:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZyCHgP+AkRtqac8mMBdPu1TAv+1DdRm2zqE8Y6hB6/0=; b=PRaVSdgRiNREmaQxe7/3TJ7Rg8qSwDwEWFdJdzD7dLTCVHYODiJv5C5BkssIrKECnn sduJWQCYHNlMR098CWvRWxt8JvtvYz2e/Ygb+cgEmHYCfyEL3qQzKg+5e0FDKsyNIASO KnIiqlHNMbByH/u2szVgNhJB6LcR1aK6AEMDw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZyCHgP+AkRtqac8mMBdPu1TAv+1DdRm2zqE8Y6hB6/0=; b=WBwS8AxgyOtzk60AL0os6+53NKaIPir27zmmdDD+TElRJF7PdsAOCXJZx0QTVxE6bz BlnkAOV6SjONeFh/hh2DELIAdFApCw6vPi4PMTsnTzCh2AcJYTf8+XSzr9qSAKAMpWAK xNEm1v1tseWX/m78v/+A3cqNNQ3f2ymSs9JdrLtZ1fBplt9+V6M4X2v0aU6r3G7DrRWt 5SbULPfxIV9Jx3hSsWHvsk9Z8OI30v7JGxYP2FidRCiwWOf7lLV/3Fu2gPwQKw8sNRNh OP31dwt1yUz2jWtCBQmqO4XmRAkQBo1TjEPHIYnUipFz0BA0L8TO83ZZyEwbB8keEhTO 0PCw== X-Gm-Message-State: AE9vXwN4AbO8t93REdG6c65u8hqnylKPqhMAvUEf1jpB29XzOJLagtLSloc7sTn+PBgzr3uN X-Received: by 10.66.5.5 with SMTP id o5mr7528123pao.38.1474470160014; Wed, 21 Sep 2016 08:02:40 -0700 (PDT) Received: from localhost.localdomain ([104.237.91.137]) by smtp.gmail.com with ESMTPSA id 85sm28914221pfw.92.2016.09.21.08.02.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Sep 2016 08:02:39 -0700 (PDT) From: Haojian Zhuang To: ryan.harkin@linaro.org, edk2-devel@lists.01.org, leif.lindholm@linaro.org, ard.biesheuvel@linaro.org Cc: Haojian Zhuang Date: Wed, 21 Sep 2016 23:02:19 +0800 Message-Id: <1474470147-23156-3-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474470147-23156-1-git-send-email-haojian.zhuang@linaro.org> References: <1474470147-23156-1-git-send-email-haojian.zhuang@linaro.org> Subject: [PATCH v3 02/10] MmcDxe: move ECSD into CardInfo structure X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Sep 2016 15:02:40 -0000 Since ECSD also describes the information of card, move it into structure CardInfo. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Haojian Zhuang --- EmbeddedPkg/Universal/MmcDxe/Mmc.h | 1 + EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/EmbeddedPkg/Universal/MmcDxe/Mmc.h b/EmbeddedPkg/Universal/MmcDxe/Mmc.h index 46a156c..f4e0aa0 100644 --- a/EmbeddedPkg/Universal/MmcDxe/Mmc.h +++ b/EmbeddedPkg/Universal/MmcDxe/Mmc.h @@ -138,6 +138,7 @@ typedef struct { OCR OCRData; CID CIDData; CSD CSDData; + UINT32 ECSD[128]; // 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 0b0a044..3531fb4 100644 --- a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c +++ b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c @@ -39,7 +39,6 @@ EmmcIdentificationMode ( EFI_BLOCK_IO_MEDIA *Media; EFI_STATUS Status; UINT32 RCA; - UINT32 ECSD[128]; Host = MmcHostInstance->MmcHost; Media = MmcHostInstance->BlockIo.Media; @@ -91,7 +90,7 @@ EmmcIdentificationMode ( DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): ECSD fetch error, Status=%r.\n", Status)); } - Status = Host->ReadBlockData (Host, 0, 512, ECSD); + Status = Host->ReadBlockData (Host, 0, 512, (UINT32 *)&(MmcHostInstance->CardInfo.ECSD)); if (EFI_ERROR (Status)) { DEBUG ((EFI_D_ERROR, "EmmcIdentificationMode(): ECSD read error, Status=%r.\n", Status)); return Status; @@ -104,7 +103,7 @@ EmmcIdentificationMode ( Media->LogicalBlocksPerPhysicalBlock = 1; Media->IoAlign = 4; // Compute last block using bits [215:212] of the ECSD - Media->LastBlock = ECSD[EMMC_ECSD_SIZE_OFFSET] - 1; // eMMC isn't supposed to report this for + Media->LastBlock = MmcHostInstance->CardInfo.ECSD[EMMC_ECSD_SIZE_OFFSET] - 1; // eMMC isn't supposed to report this for // Cards <2GB in size, but the model does. // Setup card type -- 2.7.4