mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmc: core: Calculate the discard arg only once

Browse source 
In MMC, the discard arg is a read-only ext_csd parameter - set it once
on card init. To be consistent, do that for SD as well even though its
discard arg is always 0x0.

Signed-off-by: Avri Altman <avri.altman@wdc.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Avri Altman 2019-02-06 13:28:05 +02:00 committed by Ulf Hansson
parent a2b760a601
commit 01904ff776
6 changed files with 21 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/mmc/core/block.c
View file

@ -1124,7 +1124,7 @@ static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
{ {
struct mmc_blk_data *md = mq->blkdata; struct mmc_blk_data *md = mq->blkdata;
struct mmc_card *card = md->queue.card; struct mmc_card *card = md->queue.card;
unsigned int from, nr, arg; unsigned int from, nr;
int err = 0, type = MMC_BLK_DISCARD; int err = 0, type = MMC_BLK_DISCARD;
blk_status_t status = BLK_STS_OK; blk_status_t status = BLK_STS_OK;
@ -1136,24 +1136,18 @@ static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
from = blk_rq_pos(req); from = blk_rq_pos(req);
nr = blk_rq_sectors(req); nr = blk_rq_sectors(req);
if (mmc_can_discard(card))
arg = MMC_DISCARD_ARG;
else if (mmc_can_trim(card))
arg = MMC_TRIM_ARG;
else
arg = MMC_ERASE_ARG;
do { do {
err = 0; err = 0;
if (card->quirks & MMC_QUIRK_INAND_CMD38) { if (card->quirks & MMC_QUIRK_INAND_CMD38) {
err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
INAND_CMD38_ARG_EXT_CSD, INAND_CMD38_ARG_EXT_CSD,
arg == MMC_TRIM_ARG ? card->erase_arg == MMC_TRIM_ARG ?
INAND_CMD38_ARG_TRIM : INAND_CMD38_ARG_TRIM :
INAND_CMD38_ARG_ERASE, INAND_CMD38_ARG_ERASE,
0); 0);
} }
if (!err) if (!err)
err = mmc_erase(card, from, nr, arg); err = mmc_erase(card, from, nr, card->erase_arg);
} while (err == -EIO && !mmc_blk_reset(md, card->host, type)); } while (err == -EIO && !mmc_blk_reset(md, card->host, type));
if (err) if (err)
status = BLK_STS_IOERR; status = BLK_STS_IOERR;

4
drivers/mmc/core/core.c
View file

@ -2164,7 +2164,7 @@ static unsigned int mmc_align_erase_size(struct mmc_card *card,
* @card: card to erase * @card: card to erase
* @from: first sector to erase * @from: first sector to erase
* @nr: number of sectors to erase * @nr: number of sectors to erase
* @arg: erase command argument (SD supports only %MMC_ERASE_ARG) * @arg: erase command argument (SD supports only %SD_ERASE_ARG)
* *
* Caller must claim host before calling this function. * Caller must claim host before calling this function.
*/ */
@ -2181,7 +2181,7 @@ int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr,
if (!card->erase_size) if (!card->erase_size)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (mmc_card_sd(card) && arg != MMC_ERASE_ARG) if (mmc_card_sd(card) && arg != SD_ERASE_ARG)
return -EOPNOTSUPP; return -EOPNOTSUPP;
if ((arg & MMC_SECURE_ARGS) && if ((arg & MMC_SECURE_ARGS) &&

8
drivers/mmc/core/mmc.c
View file

@ -1743,6 +1743,14 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
card->ext_csd.power_off_notification = EXT_CSD_POWER_ON; card->ext_csd.power_off_notification = EXT_CSD_POWER_ON;
} }
/* set erase_arg */
if (mmc_can_discard(card))
card->erase_arg = MMC_DISCARD_ARG;
else if (mmc_can_trim(card))
card->erase_arg = MMC_TRIM_ARG;
else
card->erase_arg = MMC_ERASE_ARG;
/* /*
* Select timing interface * Select timing interface
*/ */

2
drivers/mmc/core/sd.c
View file

@ -271,6 +271,8 @@ static int mmc_read_ssr(struct mmc_card *card)
} }
} }
card->erase_arg = SD_ERASE_ARG;
return 0; return 0;
} }

1
include/linux/mmc/card.h
View file

@ -277,6 +277,7 @@ struct mmc_card {
unsigned int erase_shift; /* if erase unit is power 2 */ unsigned int erase_shift; /* if erase unit is power 2 */
unsigned int pref_erase; /* in sectors */ unsigned int pref_erase; /* in sectors */
unsigned int eg_boundary; /* don't cross erase-group boundaries */ unsigned int eg_boundary; /* don't cross erase-group boundaries */
unsigned int erase_arg; /* erase / trim / discard */
u8 erased_byte; /* value of erased bytes */ u8 erased_byte; /* value of erased bytes */
u32 raw_cid[4]; /* raw card CID */ u32 raw_cid[4]; /* raw card CID */

5
include/linux/mmc/sd.h
View file

@ -91,4 +91,9 @@
#define SD_SWITCH_ACCESS_DEF 0 #define SD_SWITCH_ACCESS_DEF 0
#define SD_SWITCH_ACCESS_HS 1 #define SD_SWITCH_ACCESS_HS 1
/*
* Erase/discard
*/
#define SD_ERASE_ARG 0x00000000
#endif /* LINUX_MMC_SD_H */ #endif /* LINUX_MMC_SD_H */