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

Commit e83b3664 authored by Russell King's avatar Russell King
Browse files

Fix uses of dma_max_pfn() when converting to a limiting address 



We must use a 64-bit for this, otherwise overflowed bits get lost, and
that can result in a lower than intended value set.

Fixes: 8e0cb8a1 ("ARM: 7797/1: mmc: Use dma_max_pfn(dev) helper for bounce_limit calculations")
Fixes: 7d35496d ("ARM: 7796/1: scsi: Use dma_max_pfn(dev) helper for bounce_limit calculations")
Tested-Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 7c8746a9

drivers/mmc/card/queue.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ int mmc_init_queue(struct mmc_queue *mq, struct mmc_card *card, 
	struct mmc_queue_req *mqrq_prev = &mq->mqrq[1];



	if (mmc_dev(host)->dma_mask && *mmc_dev(host)->dma_mask)

		limit = dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT;

		limit = (u64)dma_max_pfn(mmc_dev(host)) << PAGE_SHIFT;



	mq->card = card;

	mq->queue = blk_init_queue(mmc_request_fn, lock);

drivers/scsi/scsi_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -1684,7 +1684,7 @@ u64 scsi_calculate_bounce_limit(struct Scsi_Host *shost) 


	host_dev = scsi_get_device(shost);

	if (host_dev && host_dev->dma_mask)

		bounce_limit = dma_max_pfn(host_dev) << PAGE_SHIFT;

		bounce_limit = (u64)dma_max_pfn(host_dev) << PAGE_SHIFT;



	return bounce_limit;

}