Merge tag 'mmc-v5.9-rc4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

torvalds · torvalds · commit f318052ef2f0 · 2020-10-09T10:10:52.000-07:00
Pull MMC fix from Ulf Hansson:
 "Assign a proper discard granularity rather than incorrectly set it to
  zero"

* tag 'mmc-v5.9-rc4-4' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: core: don't set limits.discard_granularity as 0
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c
@@ -190,7 +190,7 @@ static void mmc_queue_setup_discard(struct request_queue *q,
 	q->limits.discard_granularity = card->pref_erase << 9;
 	/* granularity must not be greater than max. discard */
 	if (card->pref_erase > max_discard)
-		q->limits.discard_granularity = 0;
+		q->limits.discard_granularity = SECTOR_SIZE;
 	if (mmc_can_secure_erase_trim(card))
 		blk_queue_flag_set(QUEUE_FLAG_SECERASE, q);
 }

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ static void mmc_queue_setup_discard(struct request_queue *q,`
`190`	`190`	`q->limits.discard_granularity = card->pref_erase << 9;`
`191`	`191`	`/* granularity must not be greater than max. discard */`
`192`	`192`	`if (card->pref_erase > max_discard)`
`193`		`- q->limits.discard_granularity = 0;`
	`193`	`+ q->limits.discard_granularity = SECTOR_SIZE;`
`194`	`194`	`if (mmc_can_secure_erase_trim(card))`
`195`	`195`	`blk_queue_flag_set(QUEUE_FLAG_SECERASE, q);`
`196`	`196`	`}`