From: Al Cooper <acooper@xxxxxxxxxxxx>
- Change mmc_sd_init_card() to check for a locked card and, if found,
try to get a password using the kernel KEYS subsystem, unlock the card
and continue. The unlock can fail due to a bad password, no password
or during boot when the rootfs that holds the password is not yet
available. To handle this, mmc_sd_init_card() will send just the early
init commands before trying to unlock and, on unlock failure, skip the
later init commands (which would fail on a locked card). mmc_sd_init_card()
will also handle the retry case, trigger via sysfs, where it will skip
the already issued early init commands, try again to unlock the card and
if successful issue the previously skipped later init commands.
These changes allow a card that failed unlock to still come up to the
point that the block device and sysfs for the device is created. This
allows the sysfs to be used to issue LOCK maintenance commands or to
trigger a retry, presumably after the password has be made available
by user space.
- Add sysfs attribute "unlock_retry" that will try again to unlock
and fully init the card.
- Add sysfs attribute "lock" to enable sysfs LOCK maintenance
commands
refs #SWLINUX-2545
Signed-off-by: Al Cooper <acooper@xxxxxxxxxxxx>
---
drivers/mmc/core/core.h | 4 ++
drivers/mmc/core/sd.c | 138 ++++++++++++++++++++++++++++++++++-------------
include/linux/mmc/card.h | 1 +
3 files changed, 107 insertions(+), 36 deletions(-)
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index dcf516d..def5d71 100644
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -94,6 +94,10 @@ struct mmc_password {
extern struct key_type mmc_key_type;
int mmc_get_password(struct mmc_card *card, struct mmc_password *password);
+ssize_t mmc_lock_show(struct device *dev, struct device_attribute *att,
+ char *buf);
+ssize_t mmc_lock_store(struct device *dev, struct device_attribute *att,
+ const char *data, size_t len);
#endif /* CONFIG_MMC_LOCK */
#endif
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 176d125..ee81d27 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -25,6 +25,10 @@
#include "sd.h"
#include "sd_ops.h"
+ssize_t mmc_sd_unlock_retry_store(struct device *dev,
+ struct device_attribute *att,
+ const char *data, size_t len);
+
static const unsigned int tran_exp[] = {
10000, 100000, 1000000, 10000000,
0, 0, 0, 0
@@ -665,6 +669,8 @@ out:
return err;
}
+
+
MMC_DEV_ATTR(cid, "%08x%08x%08x%08x\n", card->raw_cid[0], card->raw_cid[1],
card->raw_cid[2], card->raw_cid[3]);
MMC_DEV_ATTR(csd, "%08x%08x%08x%08x\n", card->raw_csd[0], card->raw_csd[1],
@@ -680,6 +686,13 @@ MMC_DEV_ATTR(name, "%s\n", card->cid.prod_name);
MMC_DEV_ATTR(oemid, "0x%04x\n", card->cid.oemid);
MMC_DEV_ATTR(serial, "0x%08x\n", card->cid.serial);
+#ifdef CONFIG_MMC_LOCK
+static DEVICE_ATTR(lock, S_IWUSR | S_IRUGO,
+ mmc_lock_show, mmc_lock_store);
+static DEVICE_ATTR(unlock_retry, S_IWUSR,
+ NULL, mmc_sd_unlock_retry_store);
+#endif /* CONFIG_MMC_LOCK */
+
static struct attribute *sd_std_attrs[] = {
&dev_attr_cid.attr,
@@ -694,6 +707,10 @@ static struct attribute *sd_std_attrs[] = {
&dev_attr_name.attr,
&dev_attr_oemid.attr,
&dev_attr_serial.attr,
+#ifdef CONFIG_MMC_LOCK
+ &dev_attr_lock.attr,
+ &dev_attr_unlock_retry.attr,
+#endif /* CONFIG_MMC_LOCK */
NULL,
};
@@ -911,55 +928,78 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
int err;
u32 cid[4];
u32 rocr = 0;
+ u32 status;
BUG_ON(!host);
WARN_ON(!host->claimed);
- err = mmc_sd_get_cid(host, ocr, cid, &rocr);
- if (err)
- return err;
-
- if (oldcard) {
- if (memcmp(cid, oldcard->raw_cid, sizeof(cid)) != 0)
- return -ENOENT;
-
+ /* Retry init of locked card */
+ if (oldcard && mmc_card_locked(oldcard)) {
card = oldcard;
+ oldcard = NULL;
+ rocr = card->raw_ocr;
} else {
+ err = mmc_sd_get_cid(host, ocr, cid, &rocr);
+ if (err)
+ return err;
+
+ if (oldcard) {
+ if (memcmp(cid, oldcard->raw_cid, sizeof(cid)) != 0)
+ return -ENOENT;
+
+ card = oldcard;
+ } else {
+ /*
+ * Allocate card structure.
+ */
+ card = mmc_alloc_card(host, &sd_type);
+ if (IS_ERR(card))
+ return PTR_ERR(card);
+
+ card->type = MMC_TYPE_SD;
+ memcpy(card->raw_cid, cid, sizeof(card->raw_cid));
+ }
+
/*
- * Allocate card structure.
+ * For native busses: get card RCA and quit open drain mode.
*/
- card = mmc_alloc_card(host, &sd_type);
- if (IS_ERR(card))
- return PTR_ERR(card);
-
- card->type = MMC_TYPE_SD;
- memcpy(card->raw_cid, cid, sizeof(card->raw_cid));
- }
+ if (!mmc_host_is_spi(host)) {
+ err = mmc_send_relative_addr(host, &card->rca);
+ if (err)
+ return err;
+ }
- /*
- * For native busses: get card RCA and quit open drain mode.
- */
- if (!mmc_host_is_spi(host)) {
- err = mmc_send_relative_addr(host, &card->rca);
- if (err)
- return err;
- }
+ if (!oldcard) {
+ err = mmc_sd_get_csd(host, card);
+ if (err)
+ return err;
- if (!oldcard) {
- err = mmc_sd_get_csd(host, card);
- if (err)
- return err;
+ mmc_decode_cid(card);
+ }
- mmc_decode_cid(card);
+ /*
+ * Select card, as all following commands rely on that.
+ */
+ if (!mmc_host_is_spi(host)) {
+ err = mmc_select_card(card);
+ if (err)
+ return err;
+ }
}
- /*
- * Select card, as all following commands rely on that.
- */
- if (!mmc_host_is_spi(host)) {
- err = mmc_select_card(card);
- if (err)
- return err;
+ /* If card is locked, skip the rest of the init */
+ err = mmc_send_status(card, &status);
+ if (err)
+ goto free_card;
+ if (status & R1_CARD_IS_LOCKED) {
+ pr_info("%s: card is locked.\n", mmc_hostname(card->host));
+ err = mmc_unlock_card(card);
+ if (err != 0) {
+ pr_warning("%s: Card unlock failed.\n",
+ mmc_hostname(card->host));
+ card->raw_ocr = rocr;
+ goto locked_return;
+ }
}
err = mmc_sd_setup_card(host, card, oldcard != NULL);
@@ -1002,6 +1042,7 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
}
}
+locked_return:
host->card = card;
return 0;
@@ -1284,3 +1325,28 @@ err:
return err;
}
+ssize_t mmc_sd_unlock_retry_store(struct device *dev,
+ struct device_attribute *att,
+ const char *data, size_t len)
+{
+ int err;
+ struct mmc_card *card = mmc_dev_to_card(dev);
+ struct mmc_host *host = card->host;
+ BUG_ON(!card);
+ BUG_ON(!host);
+
+ mmc_claim_host(host);
+ if (!mmc_card_locked(card)) {
+ mmc_release_host(host);
+ return len;
+ }
+ err = mmc_sd_init_card(host, host->ocr, card);
+ mmc_release_host(host);
+ if (err < 0)
+ return err;
+ device_release_driver(dev);
+ err = device_attach(dev);
+ if (err < 0)
+ return err;
+ return len;
+}
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index af92c44..593b854 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -282,6 +282,7 @@ struct mmc_card {
u32 raw_cid[4]; /* raw card CID */
u32 raw_csd[4]; /* raw card CSD */
u32 raw_scr[2]; /* raw card SCR */
+ u32 raw_ocr; /* raw card OCR */
struct mmc_cid cid; /* card identification */
struct mmc_csd csd; /* card specific */
struct mmc_ext_csd ext_csd; /* mmc v4 extended card specific */
--
1.8.1.3
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
