UPSTREAM: mmc: hsq: Fix data stomping during mmc recovery

The block device uses multiple queues to access emmc. There will be up to 3
requests in the hsq of the host. The current code will check whether there
is a request doing recovery before entering the queue, but it will not check
whether there is a request when the lock is issued. The request is in recovery
mode. If there is a request in recovery, then a read and write request is
initiated at this time, and the conflict between the request and the recovery
request will cause the data to be trampled.

Signed-off-by: Wenchao Chen <wenchao.chen@unisoc.com>
Fixes: 511ce378e1 ("mmc: Add MMC host software queue support")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220916090506.10662-1-wenchao.chen666@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I879d746f578ba7c6f27029d81c980c743c3215ba
(cherry picked from commit e7afa79a3b)

This commit is contained in:

Wenchao Chen

2022-09-16 17:05:06 +08:00

committed by

Tao Huang

parent 567e355611

commit 24ae565a72

1 changed files with 1 additions and 1 deletions

									
										drivers/mmc/host/mmc_hsq.c
									
		+1
		-1
	
												View File
												
				@@ -34,7 +34,7 @@ static void mmc_hsq_pump_requests(struct mmc_hsq *hsq)

					spin_lock_irqsave(&hsq->lock, flags);

					/* Make sure we are not already running a request now */

					if (hsq->mrq) {

					if (hsq->mrq || hsq->recovery_halt) {

						spin_unlock_irqrestore(&hsq->lock, flags);

						return;

					}