These 4 commits from upstream allow us to have more fine grained control over the MMC command timeouts and this solves the following timeouts that we have seen on our systems across suspend/resume cycles: [ 14.907496] usb usb2: root hub lost power or was reset [ 15.216232] usb 1-1: reset high-speed USB device number 2 using xhci-hcd [ 15.485812] bcmgenet 8f00000.ethernet eth0: Link is Down [ 15.525328] mmc1: error -110 doing runtime resume [ 15.531864] OOM killer enabled. Thanks! Changes in v2: - back port "mmc: core: Cleanup BKOPS support" to remove the unused timeout variable in mmc_run_bkops Ulf Hansson (4): mmc: core: Cleanup BKOPS support mmc: core: Specify timeouts for BKOPS and CACHE_FLUSH for eMMC mmc: block: Use generic_cmd6_time when modifying INAND_CMD38_ARG_EXT_CSD mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch() drivers/mmc/core/block.c | 8 +-- drivers/mmc/core/card.h | 6 +- drivers/mmc/core/mmc.c | 6 -- drivers/mmc/core/mmc_ops.c | 110 ++++++++++--------------------------- drivers/mmc/core/mmc_ops.h | 3 +- 5 files changed, 36 insertions(+), 97 deletions(-) -- 2.25.1