linux.git/drivers/mmc/core/block.c, branch v4.16

mmc: block: fix updating ext_csd caches on ioctl call

2018-03-15T09:31:38+00:00

PARTITION_CONFIG is cached in mmc_card->ext_csd.part_config and the
currently active partition in mmc_blk_data->part_curr. These caches do
not always reflect changes if the ioctl call modifies the
PARTITION_CONFIG registers, e.g. by changing BOOT_PARTITION_ENABLE.

Write the PARTITION_CONFIG value extracted from the ioctl call to the
cache and update the currently active partition accordingly. This
ensures that the user space cannot change the values behind the
kernel's back. The next call to mmc_blk_part_switch() will operate on
the data set by the ioctl and reflect the changes appropriately.

Signed-off-by: Bastian Stender 
Signed-off-by: Jan Luebbe 
Cc: stable@vger.kernel.org
Signed-off-by: Ulf Hansson

mmc: block: fix logical error to avoid memory leak

2017-12-18T13:02:16+00:00

If the MMC_DRV_OP_GET_EXT_CSD request completes successfully, then
ext_csd must be freed, but in one case it was not. Fix that.

Signed-off-by: Liu Changcheng 
Acked-by: Adrian Hunter 
Acked-by: Linus Walleij 
Signed-off-by: Ulf Hansson

mmc: block: blk-mq: Potential NULL deref on mmc_blk_alloc_req() failure

2017-12-11T12:13:38+00:00

mmc_blk_alloc_req() is supposed to return error pointers but there is
one path where we forget to set the error code and accidentally return
NULL.  The callers are not expecting that and will have a NULL pointer
dereference.

Fixes: 41e3efd07d5a ("mmc: block: Simplify cleaning up the queue")
Signed-off-by: Dan Carpenter 
Acked-by: Adrian Hunter 
Signed-off-by: Ulf Hansson

mmc: block: Remove code no longer needed after the switch to blk-mq

2017-12-11T12:02:22+00:00

Remove code no longer needed after the switch to blk-mq.

Signed-off-by: Adrian Hunter 
Acked-by: Linus Walleij 
Tested-by: Linus Walleij 
Signed-off-by: Ulf Hansson

mmc: block: blk-mq: fix boolreturn.cocci warnings

2017-12-11T11:47:25+00:00

drivers/mmc/core/block.c:2106:9-10: WARNING: return of 0/1 in function 'mmc_blk_status_error' with return type bool

 Return statements in functions returning bool should use
 true/false instead of 1/0.
Generated by: scripts/coccinelle/misc/boolreturn.cocci

Fixes:7eb43d537166 ("mmc: block: blk-mq: Stop using legacy recovery")
CC: Adrian Hunter 
Signed-off-by: Fengguang Wu 
Acked-by: Adrian Hunter 
Signed-off-by: Ulf Hansson

mmc: block: blk-mq: Stop using legacy recovery

2017-12-11T11:44:39+00:00

There are only a few things the recovery needs to do. Primarily, it just
needs to:
	Determine the number of bytes transferred
	Get the card back to transfer state
	Determine whether to retry

There are also a couple of additional features:
	Reset the card before the last retry
	Read one sector at a time

The legacy code spent much effort analyzing command errors, but commands
fail fast, so it is simpler just to give all command errors the same number
of retries.

Signed-off-by: Adrian Hunter 
Acked-by: Linus Walleij 
Signed-off-by: Ulf Hansson 
Tested-by: Linus Walleij

mmc: block: Reduce polling timeout from 10 minutes to 10 seconds

2017-12-11T11:44:38+00:00

Set a 10 second timeout for polling write request busy state. Note, mmc
core is setting a 3 second timeout for SD cards, and SDHCI has long had a
10 second software timer to timeout the whole request, so 10 seconds should
be ample.

Signed-off-by: Adrian Hunter 
Signed-off-by: Ulf Hansson 
Acked-by: Linus Walleij 
Tested-by: Linus Walleij

mmc: block: Add timeout_clks when calculating timeout

2017-12-11T11:44:38+00:00

According to the specification, total access time is derived from both TAAC
and NSAC, which means the timeout should add both timeout_ns and
timeout_clks. Host drivers do that, so make the block driver do that too.

Signed-off-by: Adrian Hunter 
Signed-off-by: Ulf Hansson 
Acked-by: Linus Walleij 
Tested-by: Linus Walleij

mmc: block: Check for transfer state in card_busy_detect()

2017-12-11T11:44:38+00:00

The card is required to return to transfer state. Since that is the state
required to start another transfer, check for that state instead of
programming state.

Signed-off-by: Adrian Hunter 
Acked-by: Linus Walleij 
Signed-off-by: Ulf Hansson 
Tested-by: Linus Walleij

mmc: block: Check the timeout correctly in card_busy_detect()

2017-12-11T11:44:37+00:00

Pedantically, ensure the status is checked for the last time after the full
timeout has passed.

Signed-off-by: Adrian Hunter 
Signed-off-by: Ulf Hansson 
Acked-by: Linus Walleij 
Tested-by: Linus Walleij