This is a note to let you know that I've just added the patch titled mmc: block: Make card_busy_detect() a bit more generic to the 4.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mmc-block-make-card_busy_detect-a-bit-more-generic.patch and it can be found in the queue-4.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 3869468e0c4800af52bfe1e0b72b338dcdae2cfc Mon Sep 17 00:00:00 2001 From: Chaotian Jing <chaotian.jing@xxxxxxxxxxxx> Date: Thu, 5 Sep 2019 15:53:17 +0800 Subject: mmc: block: Make card_busy_detect() a bit more generic From: Chaotian Jing <chaotian.jing@xxxxxxxxxxxx> commit 3869468e0c4800af52bfe1e0b72b338dcdae2cfc upstream. To prepare for more users of card_busy_detect(), let's drop the struct request * as an in-parameter and convert to log the error message via dev_err() instead of pr_err(). Signed-off-by: Chaotian Jing <chaotian.jing@xxxxxxxxxxxx> Reviewed-by: Avri Altman <avri.altman@xxxxxxx> Cc: stable@xxxxxxxxxxxxxxx Signed-off-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/mmc/core/block.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -982,7 +982,7 @@ static inline bool mmc_blk_in_tran_state } static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms, - struct request *req, u32 *resp_errs) + u32 *resp_errs) { unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms); int err = 0; @@ -993,8 +993,8 @@ static int card_busy_detect(struct mmc_c err = __mmc_send_status(card, &status, 5); if (err) { - pr_err("%s: error %d requesting status\n", - req->rq_disk->disk_name, err); + dev_err(mmc_dev(card->host), + "error %d requesting status\n", err); return err; } @@ -1007,9 +1007,9 @@ static int card_busy_detect(struct mmc_c * leaves the program state. */ if (done) { - pr_err("%s: Card stuck in wrong state! %s %s status: %#x\n", - mmc_hostname(card->host), - req->rq_disk->disk_name, __func__, status); + dev_err(mmc_dev(card->host), + "Card stuck in wrong state! %s status: %#x\n", + __func__, status); return -ETIMEDOUT; } @@ -1678,7 +1678,7 @@ static int mmc_blk_fix_state(struct mmc_ mmc_blk_send_stop(card, timeout); - err = card_busy_detect(card, timeout, req, NULL); + err = card_busy_detect(card, timeout, NULL); mmc_retune_release(card->host); @@ -1902,7 +1902,7 @@ static int mmc_blk_card_busy(struct mmc_ if (mmc_host_is_spi(card->host) || rq_data_dir(req) == READ) return 0; - err = card_busy_detect(card, MMC_BLK_TIMEOUT_MS, req, &status); + err = card_busy_detect(card, MMC_BLK_TIMEOUT_MS, &status); /* * Do not assume data transferred correctly if there are any error bits Patches currently in stable-queue which might be from chaotian.jing@xxxxxxxxxxxx are queue-4.19/mmc-block-make-card_busy_detect-a-bit-more-generic.patch queue-4.19/mmc-block-add-cmd13-polling-for-mmc-ioctls-with-r1b-response.patch