mmc: core: Allow mmc erase to carry large addresses

Preparing for SDUC, Allow the erase address to be larger beyond a 32 bit
address.

Tested-by: Ricky WU <ricky_wu@realtek.com>
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-6-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 c9325fe..26a67d2 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1199,7 +1199,8 @@ static void mmc_blk_issue_erase_rq(struct mmc_queue *mq, struct request *req,
 {
        struct mmc_blk_data *md = mq->blkdata;
        struct mmc_card *card = md->queue.card;
-       unsigned int from, nr;
+       unsigned int nr;
+       sector_t from;
        int err = 0;
        blk_status_t status = BLK_STS_OK;
 
@@ -1254,7 +1255,8 @@ static void mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq,
 {
        struct mmc_blk_data *md = mq->blkdata;
        struct mmc_card *card = md->queue.card;
-       unsigned int from, nr, arg;
+       unsigned int nr, arg;
+       sector_t from;
        int err = 0, type = MMC_BLK_SECDISCARD;
        blk_status_t status = BLK_STS_OK;
 

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index a0b2999..06f63fb 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1601,8 +1601,8 @@ static unsigned int mmc_erase_timeout(struct mmc_card *card,
                return mmc_mmc_erase_timeout(card, arg, qty);
 }
 
-static int mmc_do_erase(struct mmc_card *card, unsigned int from,
-                       unsigned int to, unsigned int arg)
+static int mmc_do_erase(struct mmc_card *card, sector_t from,
+                       sector_t to, unsigned int arg)
 {
        struct mmc_command cmd = {};
        unsigned int qty = 0, busy_timeout = 0;
@@ -1633,8 +1633,8 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
        else if (mmc_card_sd(card))
                qty += to - from + 1;
        else
-               qty += ((to / card->erase_size) -
-                       (from / card->erase_size)) + 1;
+               qty += (mmc_sector_div(to, card->erase_size) -
+                       mmc_sector_div(from, card->erase_size)) + 1;
 
        if (!mmc_card_blockaddr(card)) {
                from <<= 9;
@@ -1703,18 +1703,19 @@ out:
 }
 
 static unsigned int mmc_align_erase_size(struct mmc_card *card,
-                                        unsigned int *from,
-                                        unsigned int *to,
+                                        sector_t *from,
+                                        sector_t *to,
                                         unsigned int nr)
 {
-       unsigned int from_new = *from, nr_new = nr, rem;
+       sector_t from_new = *from;
+       unsigned int nr_new = nr, rem;
 
        /*
         * When the 'card->erase_size' is power of 2, we can use round_up/down()
         * to align the erase size efficiently.
         */
        if (is_power_of_2(card->erase_size)) {
-               unsigned int temp = from_new;
+               sector_t temp = from_new;
 
                from_new = round_up(temp, card->erase_size);
                rem = from_new - temp;
@@ -1726,7 +1727,7 @@ static unsigned int mmc_align_erase_size(struct mmc_card *card,
 
                nr_new = round_down(nr_new, card->erase_size);
        } else {
-               rem = from_new % card->erase_size;
+               rem = mmc_sector_mod(from_new, card->erase_size);
                if (rem) {
                        rem = card->erase_size - rem;
                        from_new += rem;
@@ -1759,10 +1760,12 @@ static unsigned int mmc_align_erase_size(struct mmc_card *card,
  *
  * Caller must claim host before calling this function.
  */
-int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr,
+int mmc_erase(struct mmc_card *card, sector_t from, unsigned int nr,
              unsigned int arg)
 {
-       unsigned int rem, to = from + nr;
+       unsigned int rem;
+       sector_t to = from + nr;
+
        int err;
 
        if (!(card->csd.cmdclass & CCC_ERASE))
@@ -1783,7 +1786,7 @@ int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr,
                return -EOPNOTSUPP;
 
        if (arg == MMC_SECURE_ERASE_ARG) {
-               if (from % card->erase_size || nr % card->erase_size)
+               if (mmc_sector_mod(from, card->erase_size) || nr % card->erase_size)
                        return -EINVAL;
        }
 
@@ -1807,7 +1810,7 @@ int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr,
         * and call mmc_do_erase() twice if necessary. This special case is
         * identified by the card->eg_boundary flag.
         */
-       rem = card->erase_size - (from % card->erase_size);
+       rem = card->erase_size - mmc_sector_mod(from, card->erase_size);
        if ((arg & MMC_TRIM_OR_DISCARD_ARGS) && card->eg_boundary && nr > rem) {
                err = mmc_do_erase(card, from, from + rem - 1, arg);
                from += rem;
@@ -1866,12 +1869,12 @@ int mmc_can_secure_erase_trim(struct mmc_card *card)
 }
 EXPORT_SYMBOL(mmc_can_secure_erase_trim);
 
-int mmc_erase_group_aligned(struct mmc_card *card, unsigned int from,
+int mmc_erase_group_aligned(struct mmc_card *card, sector_t from,
                            unsigned int nr)
 {
        if (!card->erase_size)
                return 0;
-       if (from % card->erase_size || nr % card->erase_size)
+       if (mmc_sector_mod(from, card->erase_size) || nr % card->erase_size)
                return 0;
        return 1;
 }

diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index 37091a6..fc9d5e9 100644 (file)
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -116,15 +116,13 @@ bool mmc_is_req_done(struct mmc_host *host, struct mmc_request *mrq);
 
 int mmc_start_request(struct mmc_host *host, struct mmc_request *mrq);
 
-int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr,
-               unsigned int arg);
+int mmc_erase(struct mmc_card *card, sector_t from, unsigned int nr, unsigned int arg);
 int mmc_can_erase(struct mmc_card *card);
 int mmc_can_trim(struct mmc_card *card);
 int mmc_can_discard(struct mmc_card *card);
 int mmc_can_sanitize(struct mmc_card *card);
 int mmc_can_secure_erase_trim(struct mmc_card *card);
-int mmc_erase_group_aligned(struct mmc_card *card, unsigned int from,
-                       unsigned int nr);
+int mmc_erase_group_aligned(struct mmc_card *card, sector_t from, unsigned int nr);
 unsigned int mmc_calc_max_discard(struct mmc_card *card);
 
 int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen);
@@ -199,4 +197,14 @@ static inline int mmc_flush_cache(struct mmc_host *host)
        return 0;
 }
 
+static inline unsigned int mmc_sector_div(sector_t dividend, u32 divisor)
+{
+       return div_u64(dividend, divisor);
+}
+
+static inline unsigned int mmc_sector_mod(sector_t dividend, u32 divisor)
+{
+       return sector_div(dividend, divisor);
+}
+
 #endif