mmc: core: Add open-ended Ext memory addressing

For open-ended read/write - just send CMD22 before issuing the command.

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-5-avri.altman@wdc.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index f4817ea..c9325fe 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1759,6 +1759,11 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
                brq->sbc.flags = MMC_RSP_R1 | MMC_CMD_AC;
                brq->mrq.sbc = &brq->sbc;
        }
+
+       if (mmc_card_ult_capacity(card)) {
+               brq->cmd.ext_addr = blk_rq_pos(req) >> 32;
+               brq->cmd.has_ext_addr = true;
+       }
 }
 
 #define MMC_MAX_RETRIES                5

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index d6c819d..a0b2999 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -336,6 +336,9 @@ int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
 {
        int err;
 
+       if (mrq->cmd && mrq->cmd->has_ext_addr)
+               mmc_send_ext_addr(host, mrq->cmd->ext_addr);
+
        init_completion(&mrq->cmd_completion);
 
        mmc_retune_hold(host);

diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index f0ac2e4..a890a71 100644 (file)
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -96,6 +96,10 @@ struct mmc_command {
        unsigned int            busy_timeout;   /* busy detect timeout in ms */
        struct mmc_data         *data;          /* data segment associated with cmd */
        struct mmc_request      *mrq;           /* associated request */
+
+       /* for SDUC */
+       bool has_ext_addr;
+       u8 ext_addr;
 };
 
 struct mmc_data {