Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b32dc79a authored by Ming Lei's avatar Ming Lei Committed by Greg Kroah-Hartman
Browse files

mmc: core: align max segment size with logical block size 



[ Upstream commit c53336c8f5f29043fded57912cc06c24e12613d7 ]

Logical block size is the lowest possible block size that the storage
device can address. Max segment size is often related with controller's
DMA capability. And it is reasonable to align max segment size with
logical block size.

SDHCI sets un-aligned max segment size, and causes ADMA error, so
fix it by aligning max segment size with logical block size.

Reported-by: default avatarNaresh Kamboju <naresh.kamboju@linaro.org>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Naresh Kamboju <naresh.kamboju@linaro.org>
Cc: Faiz Abbas <faiz_abbas@ti.com>
Cc: linux-block@vger.kernel.org
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 944df7b4

drivers/mmc/core/block.c

+0 −6
Original line number Diff line number Diff line
@@ -2384,12 +2384,6 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, 
	snprintf(md->disk->disk_name, sizeof(md->disk->disk_name),

		 "mmcblk%u%s", card->host->index, subname ? subname : "");



	if (mmc_card_mmc(card))

		blk_queue_logical_block_size(md->queue.queue,

					     card->ext_csd.data_sector_size);

	else

		blk_queue_logical_block_size(md->queue.queue, 512);



	set_capacity(md->disk, size);



	if (mmc_host_cmd23(card->host)) {

drivers/mmc/core/queue.c

+8 −1
Original line number Diff line number Diff line
@@ -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);