diff options
author | David S. Miller <davem@davemloft.net> | 2019-03-04 13:26:15 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-03-04 13:26:15 -0800 |
commit | 18a4d8bf250a33c015955f0dec27259780ef6448 (patch) | |
tree | 3e380812ac047fef70c0da52ba74705ee62b7130 /drivers/mmc/core/queue.c | |
parent | 096461de96a94c856190ba892ebf62dfba5a38f1 (diff) | |
parent | 822e44b45eb991c63487c5e2ce7d636411870a8d (diff) | |
download | linux-stable-18a4d8bf250a33c015955f0dec27259780ef6448.tar.gz linux-stable-18a4d8bf250a33c015955f0dec27259780ef6448.tar.bz2 linux-stable-18a4d8bf250a33c015955f0dec27259780ef6448.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/mmc/core/queue.c')
-rw-r--r-- | drivers/mmc/core/queue.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/mmc/core/queue.c b/drivers/mmc/core/queue.c index 35cc138b096d..15a45ec6518d 100644 --- a/drivers/mmc/core/queue.c +++ b/drivers/mmc/core/queue.c @@ -355,6 +355,7 @@ static void mmc_setup_queue(struct mmc_queue *mq, struct mmc_card *card) { struct mmc_host *host = card->host; u64 limit = BLK_BOUNCE_HIGH; + unsigned block_size = 512; if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask) limit = (u64)dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT; @@ -368,7 +369,13 @@ static void mmc_setup_queue(struct mmc_queue *mq, struct mmc_card *card) blk_queue_max_hw_sectors(mq->queue, min(host->max_blk_count, host->max_req_size / 512)); blk_queue_max_segments(mq->queue, host->max_segs); - blk_queue_max_segment_size(mq->queue, host->max_seg_size); + + if (mmc_card_mmc(card)) + block_size = card->ext_csd.data_sector_size; + + blk_queue_logical_block_size(mq->queue, block_size); + blk_queue_max_segment_size(mq->queue, + round_down(host->max_seg_size, block_size)); INIT_WORK(&mq->recovery_work, mmc_mq_recovery_handler); INIT_WORK(&mq->complete_work, mmc_blk_mq_complete_work); |