aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAvri Altman <avri.altman@wdc.com>2024-10-06 08:11:44 +0300
committerUlf Hansson <ulf.hansson@linaro.org>2024-10-14 12:29:01 +0200
commitc2d8d4954ebbd860f4dbab1f3107d24b8b5b5697 (patch)
tree14650c082773bd9a868d750c538b0f22f36c0774
parentmmc: core: Allow mmc erase to carry large addresses (diff)
downloadwireguard-linux-c2d8d4954ebbd860f4dbab1f3107d24b8b5b5697.tar.xz
wireguard-linux-c2d8d4954ebbd860f4dbab1f3107d24b8b5b5697.zip
mmc: core: Add Ext memory addressing for erase
CMD22 shall precede CMD32 and CMD33 to configure 38-bit erase start address and 38 bit erase stop address. Reviewed-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Avri Altman <avri.altman@wdc.com> Link: https://lore.kernel.org/r/20241006051148.160278-7-avri.altman@wdc.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/core/core.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 06f63fbaadfb..01a7142eada3 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1647,6 +1647,12 @@ static int mmc_do_erase(struct mmc_card *card, sector_t from,
cmd.opcode = MMC_ERASE_GROUP_START;
cmd.arg = from;
cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
+
+ if (mmc_card_ult_capacity(card)) {
+ cmd.ext_addr = from >> 32;
+ cmd.has_ext_addr = true;
+ }
+
err = mmc_wait_for_cmd(card->host, &cmd, 0);
if (err) {
pr_err("mmc_erase: group start error %d, "
@@ -1662,6 +1668,12 @@ static int mmc_do_erase(struct mmc_card *card, sector_t from,
cmd.opcode = MMC_ERASE_GROUP_END;
cmd.arg = to;
cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
+
+ if (mmc_card_ult_capacity(card)) {
+ cmd.ext_addr = to >> 32;
+ cmd.has_ext_addr = true;
+ }
+
err = mmc_wait_for_cmd(card->host, &cmd, 0);
if (err) {
pr_err("mmc_erase: group end error %d, status %#x\n",