linux-stable.git/drivers/mmc, branch v4.13.2

mmc: sdhci-xenon: add set_power callback

2017-08-30T12:11:47+00:00

Xenon sdh controller requests proper SD bus voltage select
bits programmed even with vmmc power supply. Any reserved
value(100b-000b) programmed in this field will lead to controller
ignore SD bus power bit and keep its value at zero.
Add set_power callback to handle this.

Signed-off-by: Zhoujie Wu 
Acked-by: Adrian Hunter 
Tested-by: Gregory CLEMENT 
Fixes: 3a3748dba881 ("mmc: sdhci-xenon: Add Marvell Xenon SDHC core functionality")
Cc: 
Signed-off-by: Ulf Hansson

mmc: block: Fix block status codes

2017-08-30T11:49:40+00:00

Commit 2a842acab109 ("block: introduce new block status code type") changed
the error type but not in patches merged through the mmc tree, like
commit 0493f6fe5bde ("mmc: block: Move boot partition locking into a driver
op"). Fix one error code that is incorrect and also use BLK_STS_OK in
preference to 0.

Fixes: 17ece345a042 ("Merge tag 'mmc-v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc")
Signed-off-by: Adrian Hunter 
Signed-off-by: Ulf Hansson

mmc: block: prevent propagating R1_OUT_OF_RANGE for open-ending mode

2017-08-21T11:32:31+00:00

We to some extent should tolerate R1_OUT_OF_RANGE for open-ending
mode as it is expected behaviour and most of the backup partition
tables should be located near some of the last blocks which will
always make open-ending read exceed the capacity of cards.

Fixes: 9820a5b11101 ("mmc: core: for data errors, take response of stop cmd into account")
Fixes: a04e6bae9e6f ("mmc: core: check also R1 response for stop commands")
Signed-off-by: Shawn Lin 
Reviewed-by: Wolfram Sang 
Tested-by: Shawn Guo 
Signed-off-by: Ulf Hansson

mmc: block: fix lockdep splat when removing mmc_block module

2017-08-09T11:19:44+00:00

Fix lockdep splat introduced in v4.13-rc4.

[  266.297226] ------------[ cut here ]------------
[  266.300078] WARNING: CPU: 2 PID: 176 at /mnt/src/jaja/git/tf300t/include/linux/blkdev.h:657 mmc_blk_remove_req+0xd0/0xe8 [mmc_block]
[  266.302937] Modules linked in: mmc_block(-) sdhci_tegra sdhci_pltfm sdhci pwrseq_simple pwrseq_emmc mmc_core
[  266.305941] CPU: 2 PID: 176 Comm: rmmod Tainted: G        W       4.13.0-rc4mq-00208-gb691e67724b8-dirty #694
[  266.308852] Hardware name: NVIDIA Tegra SoC (Flattened Device Tree)
[  266.311719] [] (unwind_backtrace) from [] (show_stack+0x18/0x1c)
[  266.314664] [] (show_stack) from [] (dump_stack+0x84/0x98)
[  266.317644] [] (dump_stack) from [] (__warn+0xf4/0x10c)
[  266.320542] [] (__warn) from [] (warn_slowpath_null+0x28/0x30)
[  266.323534] [] (warn_slowpath_null) from [] (mmc_blk_remove_req+0xd0/0xe8 [mmc_block])
[  266.326568] [] (mmc_blk_remove_req [mmc_block]) from [] (mmc_blk_remove_parts.constprop.6+0x50/0x64 [mmc_block])
[  266.329678] [] (mmc_blk_remove_parts.constprop.6 [mmc_block]) from [] (mmc_blk_remove+0x24/0x140 [mmc_block])
[  266.332894] [] (mmc_blk_remove [mmc_block]) from [] (mmc_bus_remove+0x20/0x28 [mmc_core])
[  266.336198] [] (mmc_bus_remove [mmc_core]) from [] (device_release_driver_internal+0x164/0x200)
[  266.339367] [] (device_release_driver_internal) from [] (driver_detach+0x40/0x74)
[  266.342537] [] (driver_detach) from [] (bus_remove_driver+0x68/0xdc)
[  266.345660] [] (bus_remove_driver) from [] (mmc_blk_exit+0xc/0x2cc [mmc_block])
[  266.348875] [] (mmc_blk_exit [mmc_block]) from [] (SyS_delete_module+0x1c4/0x254)
[  266.352068] [] (SyS_delete_module) from [] (ret_fast_syscall+0x0/0x34)
[  266.355308] ---[ end trace f68728a0d3053b72 ]---

Fixes: 7c84b8b43d3d ("mmc: block: bypass the queue even if usage is present for hotplug")
Signed-off-by: Michał Mirosław 
Reviewed-by: Shawn Lin 
Signed-off-by: Ulf Hansson

mmc: mmc: correct the logic for setting HS400ES signal voltage

2017-08-08T16:55:43+00:00

Change the default err value to -EINVAL, make sure the card only
has type EXT_CSD_CARD_TYPE_HS400_1_8V also do the signal voltage
setting when select hs400es mode.

Fixes: commit 1720d3545b77 ("mmc: core: switch to 1V8 or 1V2 for hs400es mode")
Cc: 
Signed-off-by: Haibo Chen 
Reviewed-by: Shawn Lin 
Signed-off-by: Ulf Hansson

mmc: host: omap_hsmmc: Add CMD23 capability to omap_hsmmc driver

2017-08-08T08:11:07+00:00

omap_hsmmc driver always relied on CMD12 to stop transmission.
However if CMD12 is not issued at the correct timing, the card will
indicate a out of range error. With certain cards in some of the
DRA7 based boards, -EIO error is observed. By Adding CMD23 capability,
the MMC core will send MMC_SET_BLOCK_COUNT command before
MMC_READ_MULTIPLE_BLOCK/MMC_WRITE_MULTIPLE_BLOCK commands.

commit a04e6bae9e6f12 ("mmc: core: check also R1 response for
stop commands") exposed this bug in omap_hsmmc driver.

Signed-off-by: Kishon Vijay Abraham I 
Signed-off-by: Ulf Hansson

mmc: block: bypass the queue even if usage is present for hotplug

2017-08-03T09:00:39+00:00

The commit 304419d8a7e9 ("mmc: core: Allocate per-request data using the
block layer core") refactored mechanism of queue handling caused
mmc_init_request() can be called just after mmc_cleanup_queue() caused null
pointer dereference.

Another commit bbdc74dc19e0 ("mmc: block: Prevent new req entering queue
after its cleanup") tried to fix the problem. However it actually miss one
corner case.

We could still reproduce the issue mentioned with these steps:
(1) insert a SD card and mount it
(2) hotplug it, so it will leave md->usage still be counted
(3) reboot the system which will sync data and umount the card

[Unable to handle kernel NULL pointer dereference at virtual address
00000000
[user pgtable: 4k pages, 48-bit VAs, pgd = ffff80007bab3000
[[0000000000000000] *pgd=000000007a828003, *pud=0000000078dce003,
*pmd=000000007aab6003, *pte=0000000000000000
[Internal error: Oops: 96000007 [#1] PREEMPT SMP
[Modules linked in:
[CPU: 3 PID: 3507 Comm: umount Tainted: G        W
4.13.0-rc1-next-20170720-00012-g9d9bf45 #33
[Hardware name: Firefly-RK3399 Board (DT)
[task: ffff80007a1de200 task.stack: ffff80007a01c000
[PC is at mmc_init_request+0x14/0xc4
[LR is at alloc_request_size+0x4c/0x74
[pc : [] lr : [] pstate: 600001c5
[sp : ffff80007a01f8f0

....

[[] mmc_init_request+0x14/0xc4
[[] alloc_request_size+0x4c/0x74
[[] mempool_create_node+0xb8/0x17c
[[] blk_init_rl+0x9c/0x120
[[] blkg_alloc+0x110/0x234
[[] blkg_create+0x424/0x468
[[] blkg_lookup_create+0xd8/0x14c
[[] generic_make_request_checks+0x368/0x3b0
[[] generic_make_request+0x1c/0x240

So mmc_blk_put wouldn't calling blk_cleanup_queue which actually the
QUEUE_FLAG_DYING and QUEUE_FLAG_BYPASS should stay. Block core expect
blk_queue_bypass_{start, end} internally to bypass/drain the queue before
actually dying the queue, so it didn't expose API to set the queue bypass.
I think we should set QUEUE_FLAG_BYPASS whenever queue is removed, although
the md->usage is still counted, as no dispatch queue could be found then.

Fixes: 304419d8a7e9 ("mmc: core: Allocate per-request data using the block layer core")
Signed-off-by: Shawn Lin 
Reviewed-by: Linus Walleij 
Signed-off-by: Ulf Hansson

mmc: sdhci-of-at91: force card detect value for non removable devices

2017-08-03T08:50:55+00:00

When the device is non removable, the card detect signal is often used
for another purpose i.e. muxed to another SoC peripheral or used as a
GPIO. It could lead to wrong behaviors depending the default value of
this signal if not muxed to the SDHCI controller.

Fixes: bb5f8ea4d514 ("mmc: sdhci-of-at91: introduce driver for the Atmel SDMMC")
Signed-off-by: Ludovic Desroches 
Acked-by: Adrian Hunter 
Cc: 
Signed-off-by: Ulf Hansson

mmc: dw_mmc: fix the wrong condition check of getting num-slots from DT

2017-07-27T13:57:30+00:00

Change to print the information about when the deprecated "num-slots" DT
binding is being used, as to avoid confusion when browsing the log:

dwmmc_rockchip fe320000.dwmmc: 'num-slots' was deprecated.

Signed-off-by: Shawn Lin 
Fixes: d30a8f7bdf64 ("mmc: dw_mmc: deprecated the "num-slots" property")
Signed-off-by: Ulf Hansson

mmc: host: omap_hsmmc: remove unused platform callbacks

2017-07-17T13:05:52+00:00

Remove unused callbacks in the omap_hsmmc_platform_data structure

Signed-off-by: Faiz Abbas 
Acked-by: Tony Lindgren 
Signed-off-by: Ulf Hansson