From patchwork Tue Mar 22 12:48:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 64169 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp2041190lbc; Tue, 22 Mar 2016 05:48:51 -0700 (PDT) X-Received: by 10.66.218.225 with SMTP id pj1mr53089294pac.83.1458650931826; Tue, 22 Mar 2016 05:48:51 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id m76si8399538pfj.133.2016.03.22.05.48.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Mar 2016 05:48:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 1B61C1A1FED; Tue, 22 Mar 2016 05:49:15 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-pf0-x22f.google.com (mail-pf0-x22f.google.com [IPv6:2607:f8b0:400e:c00::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 ECB111A1FB8 for ; Tue, 22 Mar 2016 05:49:13 -0700 (PDT) Received: by mail-pf0-x22f.google.com with SMTP id 4so179359074pfd.0 for ; Tue, 22 Mar 2016 05:48:50 -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=D0GIkQ/NU0TD/g2qTMm05WNhU4zhk/TO4w+ZXMxwFZM=; b=W9PjjcTQOjZ+8nQVGOQgOmzblnPH83hogmiRvZE30EkLmi9ppzeCQUZkq75wDXaQHG 1sRUQ9y8J5OX7R5t4p8ZnTlNUZJKR/qKqsqY82TJ2B2r6SKMTPFnTzsS9Wp6yhQCdvHh 9PV4POQFUi8TBuaW1tb563Spl71RdN974Q/GM= 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=D0GIkQ/NU0TD/g2qTMm05WNhU4zhk/TO4w+ZXMxwFZM=; b=N25lUUaiQwggsFpxj4UfDzMB7YDM9c0dkTdnpBh+Yqab50r2H88EiJo/ht+c42Kv+p l1zt5gdXM572dulY3N0c5Aux8YYZtCgWbgGJ5OVIx3TOMmptp7JjjM2wAp+cYO4lNmfY rRPuI1Ikn4tDeFBpAALG1X4395VDti1geBtTANwTK/G3blYde3VanMUOI2UE+rWHHLvX +XZWUZgyVVkSGxK55ZhKBm6vRQQ6zcagJ9ROgBfUP5pdsZnahXDPnTHmowR+itWWvzY8 bnHdHRx1mzx90ydcv06H0g36a1g7lVE8AjLHavm0PjfKanAsml7qSp1vma9vmB02sFrL Ejiw== X-Gm-Message-State: AD7BkJLBDTJr6E2NtQRYbSLYUSfqtV+DbzB7qSFgg9Odv+i/gwHJh2X3UJYUuvLLMghgPava X-Received: by 10.67.8.100 with SMTP id dj4mr54006222pad.88.1458650927889; Tue, 22 Mar 2016 05:48:47 -0700 (PDT) Received: from localhost.localdomain ([104.237.91.127]) by smtp.gmail.com with ESMTPSA id 9sm48245982pft.44.2016.03.22.05.48.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Mar 2016 05:48:46 -0700 (PDT) From: Haojian Zhuang To: ryan.harkin@linaro.org, edk2-devel@lists.01.org, leif.lindholm@linaro.org, ard.biesheuvel@linaro.org Date: Tue, 22 Mar 2016 20:48:19 +0800 Message-Id: <1458650901-7229-8-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458650901-7229-1-git-send-email-haojian.zhuang@linaro.org> References: <1458650901-7229-1-git-send-email-haojian.zhuang@linaro.org> Subject: [edk2] [PATCH v2 7/9] MmcDxe: Fix uninitialized mediaid for SD X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Haojian Zhuang MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" When SD card is used, mediaid is not initialized and used directly. So fix it. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Haojian Zhuang --- EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 1.9.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c index a5915e4..f806bfc 100644 --- a/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c +++ b/EmbeddedPkg/Universal/MmcDxe/MmcIdentification.c @@ -57,6 +57,7 @@ typedef enum _EMMC_DEVICE_STATE { } EMMC_DEVICE_STATE; UINT32 mEmmcRcaCount = 0; +UINT32 CurrentMediaId = 0; STATIC EFI_STATUS @@ -231,6 +232,10 @@ EmmcIdentificationMode ( // Set up media Media->BlockSize = EMMC_CARD_SIZE; // 512-byte support is mandatory for eMMC cards Media->MediaId = MmcHostInstance->CardInfo.CIDData.PSN; + if (CurrentMediaId > Media->MediaId) + Media->MediaId = ++CurrentMediaId; + else + CurrentMediaId = Media->MediaId; Media->ReadOnly = MmcHostInstance->CardInfo.CSDData.PERM_WRITE_PROTECT; Media->LogicalBlocksPerPhysicalBlock = 1; Media->IoAlign = 4; @@ -344,7 +349,7 @@ InitializeSdMmcDevice ( MmcHostInstance->BlockIo.Media->BlockSize = BlockSize; MmcHostInstance->BlockIo.Media->ReadOnly = MmcHost->IsReadOnly (MmcHost); MmcHostInstance->BlockIo.Media->MediaPresent = TRUE; - MmcHostInstance->BlockIo.Media->MediaId++; + MmcHostInstance->BlockIo.Media->MediaId = ++CurrentMediaId; CmdArg = MmcHostInstance->CardInfo.RCA << 16; Status = MmcHost->SendCommand (MmcHost, MMC_CMD7, CmdArg);