kernel/linux.git/drivers/mmc/core, branch master

mmc: core: Simplify with scoped for each OF child loop

2026-04-09T15:51:21+00:00

Use scoped for-each loop when iterating over device nodes to simplify the code, but also to ensure the device node reference is automatically released when the loop scope ends. Signed-off-by: Hans Zhang <18255117159@163.com> Reviewed-by: Shawn Lin Signed-off-by: Ulf Hansson

mmc: core: Optimize size of struct mmc_queue_req

2026-04-09T15:49:54+00:00

ioc_count won't be more than MMC_IOC_MAX_CMDS (255), retries won't be more than MMC_NO_RETRIES (6), flags is newly introduced and uses only 1 bit. Therefore let's change them all to become u8. Signed-off-by: Bin Liu Signed-off-by: Ulf Hansson

mmc: block: Use MQRQ_XFER_SINGLE_BLOCK for both read and write recovery

2026-03-31T10:41:32+00:00

Currently, the code uses the MQRQ_XFER_SINGLE_BLOCK flag to handle write failures by retrying with single-block transfers. However, read failures bypass this mechanism and instead use a dedicated legacy path mmc_blk_read_single() that performs sector-by-sector retries. Extend the MQRQ_XFER_SINGLE_BLOCK logic to cover multi-block read failures as well. By doing so, we can remove the redundant and complex mmc_blk_read_single() function, unifying the retry logic for both read and write operations under a single, consistent, easier-to-maintain mechanism. Signed-off-by: Shawn Lin Signed-off-by: Ulf Hansson

mmc: mmc_test: Replace hard-coded values with macros and consolidate test parameters

2026-03-31T10:41:31+00:00

Replacing hard-coded values with standardized macros to improve code clarity, simplify future maintenance. Meanwhile, introduce global bs and sg_len arrays for block sizes and SG lengths, eliminating redundant local definitions in multiple test functions. Signed-off-by: Shawn Lin Signed-off-by: Ulf Hansson

mmc: block: Convert to use DEFINE_SIMPLE_DEV_PM_OPS()

2026-03-31T10:41:31+00:00

Convert to use DEFINE_SIMPLE_DEV_PM_OPS() and pm_sleep_ptr() to drop the CONFIG_PM_SLEEP to handle the conditional compilation when PM support is disabled. This allows the compiler to automatically optimize away the unused code paths when CONFIG_PM_SLEEP is not selected. Signed-off-by: Shawn Lin Signed-off-by: Ulf Hansson

mmc: core: Replace the hard-coded shift value 9 with SECTOR_SHIFT

2026-03-31T10:41:31+00:00

These shift-by-9 operations are for converting between bytes and sectors. Use the SECTOR_SHIFT macro to improve code readability and maintainability. No functional changes intended. Signed-off-by: Shawn Lin Signed-off-by: Ulf Hansson

mmc: core: Switch to use pm_ptr() for mmc_host_class_dev_pm_ops

2026-03-27T09:25:16+00:00

Currently, the mmc_host_class_dev_pm_ops and its callback functions are wrapped in #ifdef CONFIG_PM_SLEEP to handle the conditional compilation when PM support is disabled. Replace this #ifdef usage with the standard pm_ptr() helpers. This allows the compiler to automatically optimize away the unused code paths when CONFIG_PM_SLEEP is not selected, resulting in cleaner and more maintainable code. Signed-off-by: Shawn Lin Signed-off-by: Ulf Hansson

mmc: core: Remove legacy 'enable-sdio-wakeup' DT property support

2026-03-27T09:24:51+00:00

The 'enable-sdio-wakeup' device tree property was marked as legacy and superseded by the standard 'wakeup-source' property in commit 71a0151c5c82 ("Documentation: devicetree: fix reference to legacy wakeup properties") back in 2015. Since it has been a decade and the migration to the standard property has long been completed, remove this obsolete legacy support. Signed-off-by: Shawn Lin Signed-off-by: Ulf Hansson

mmc: mmc_test: use kzalloc_flex

2026-03-27T09:24:35+00:00

Simplifies allocations by using a flexible array member in these structs. Add __counted_by to get extra runtime analysis. Signed-off-by: Rosen Penev Signed-off-by: Ulf Hansson

mmc: block: use single block write in retry

2026-03-26T10:19:57+00:00

Due to errata i2493[0], multi-block write would still fail in retries. With i2493, the MMC interface has the potential of write failures when issuing multi-block writes operating in HS200 mode with excessive IO supply noise. While the errata provides guidance in hardware design and layout to minimize the IO supply noise, in theory the write failure cannot be resolved in hardware. The software solution to ensure the data integrity is to add minimum 5us delay between block writes. Single-block write is the practical way to introduce the delay. This patch reuses recovery_mode flag, and switches to single-block write in retry when multi-block write fails. It covers both CQE and non-CQE cases. [0] https://www.ti.com/lit/pdf/sprz582 Cc: stable@vger.kernel.org Suggested-by: Jens Axboe Signed-off-by: Bin Liu Signed-off-by: Ulf Hansson