From: Wenchao Chen <wenchao.chen@unisoc.com>
To: <ulf.hansson@linaro.org>, <adrian.hunter@intel.com>
Cc: <linux-mmc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<wenchao.chen666@gmail.com>, <zhenxiong.lai@unisoc.com>,
<chunyan.zhang@unisoc.com>, <yuelin.tang@unisoc.com>,
Wenchao Chen <wenchao.chen@unisoc.com>
Subject: [PATCH] mmc: core: Remove FW revision from CID check
Date: Tue, 18 Jul 2023 09:15:04 +0800 [thread overview]
Message-ID: <20230718011504.10947-1-wenchao.chen@unisoc.com> (raw)
When the card is reset, mmc_card_init() will check if this
card is the previous card by comparing the CID.
If the firmware is upgraded, the product version may change,
so we remove the product version from the CID check.
Signed-off-by: Wenchao Chen <wenchao.chen@unisoc.com>
---
drivers/mmc/core/mmc.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 89cd48fcec79..32a73378d5c3 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -32,6 +32,9 @@
#define MIN_CACHE_EN_TIMEOUT_MS 1600
#define CACHE_FLUSH_TIMEOUT_MS 30000 /* 30s */
+#define MMC_CID_PRV_MASK GENMASK(23, 16)
+#define MMC_CID_CRC_MASK GENMASK(7, 0)
+
static const unsigned int tran_exp[] = {
10000, 100000, 1000000, 10000000,
0, 0, 0, 0
@@ -126,6 +129,19 @@ static int mmc_decode_cid(struct mmc_card *card)
return 0;
}
+static int mmc_check_cid(u32 *cid, u32 *raw_cid)
+{
+ /*
+ * When comparing CID, we need to remove the product
+ * version (Field PRV, offset 55:48) and CRC. Because
+ * the product version will change when the firmware
+ * is upgraded. Also, the new CRC is different.
+ */
+ return cid[0] != raw_cid[0] || cid[1] != raw_cid[1] ||
+ (cid[2] & ~MMC_CID_PRV_MASK) != (raw_cid[2] & ~MMC_CID_PRV_MASK) ||
+ (cid[3] & ~MMC_CID_CRC_MASK) != (raw_cid[3] & ~MMC_CID_CRC_MASK);
+}
+
static void mmc_set_erase_size(struct mmc_card *card)
{
if (card->ext_csd.erase_group_def & 1)
@@ -1640,7 +1656,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
goto err;
if (oldcard) {
- if (memcmp(cid, oldcard->raw_cid, sizeof(cid)) != 0) {
+ if (mmc_check_cid(cid, oldcard->raw_cid)) {
pr_debug("%s: Perhaps the card was replaced\n",
mmc_hostname(host));
err = -ENOENT;
--
2.17.1
next reply other threads:[~2023-07-18 1:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-18 1:15 Wenchao Chen [this message]
2023-07-18 6:13 ` Adrian Hunter
2023-07-18 12:32 ` Avri Altman
2023-07-19 2:57 ` Wenchao Chen
2023-07-19 2:46 ` Wenchao Chen
2023-07-20 6:44 ` Adrian Hunter
2023-07-20 8:38 ` Wenchao Chen
2023-07-20 9:11 ` Adrian Hunter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230718011504.10947-1-wenchao.chen@unisoc.com \
--to=wenchao.chen@unisoc.com \
--cc=adrian.hunter@intel.com \
--cc=chunyan.zhang@unisoc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=wenchao.chen666@gmail.com \
--cc=yuelin.tang@unisoc.com \
--cc=zhenxiong.lai@unisoc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®