Skip to content

Commit 901084c

Browse files
pgeng-nvstorulf
authored andcommitted
mmc: core: Avoid bitfield RMW for claim/retune flags
Move claimed and retune control flags out of the bitfield word to avoid unrelated RMW side effects in asynchronous contexts. The host->claimed bit shared a word with retune flags. Writes to claimed in __mmc_claim_host() or retune_now in mmc_mq_queue_rq() can overwrite other bits when concurrent updates happen in other contexts, triggering spurious WARN_ON(!host->claimed). Convert claimed, can_retune, retune_now and retune_paused to bool to remove shared-word coupling. Fixes: 6c0cedd ("mmc: core: Introduce host claiming by context") Fixes: 1e8e55b ("mmc: block: Add CQE support") Cc: stable@vger.kernel.org Suggested-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Penghe Geng <pgeng@nvidia.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 79ad471 commit 901084c

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

include/linux/mmc/host.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -486,14 +486,12 @@ struct mmc_host {
486486

487487
struct mmc_ios ios; /* current io bus settings */
488488

489+
bool claimed; /* host exclusively claimed */
490+
489491
/* group bitfields together to minimize padding */
490492
unsigned int use_spi_crc:1;
491-
unsigned int claimed:1; /* host exclusively claimed */
492493
unsigned int doing_init_tune:1; /* initial tuning in progress */
493-
unsigned int can_retune:1; /* re-tuning can be used */
494494
unsigned int doing_retune:1; /* re-tuning in progress */
495-
unsigned int retune_now:1; /* do re-tuning at next req */
496-
unsigned int retune_paused:1; /* re-tuning is temporarily disabled */
497495
unsigned int retune_crc_disable:1; /* don't trigger retune upon crc */
498496
unsigned int can_dma_map_merge:1; /* merging can be used */
499497
unsigned int vqmmc_enabled:1; /* vqmmc regulator is enabled */
@@ -508,6 +506,9 @@ struct mmc_host {
508506
int rescan_disable; /* disable card detection */
509507
int rescan_entered; /* used with nonremovable devices */
510508

509+
bool can_retune; /* re-tuning can be used */
510+
bool retune_now; /* do re-tuning at next req */
511+
bool retune_paused; /* re-tuning is temporarily disabled */
511512
int need_retune; /* re-tuning is needed */
512513
int hold_retune; /* hold off re-tuning */
513514
unsigned int retune_period; /* re-tuning period in secs */

0 commit comments

Comments
 (0)