Fix uses of dma_max_pfn() when converting to a limiting address (e83b3664) · Commits · 戴 / test

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: ("ARM: 7797/1: mmc: Use dma_max_pfn(dev) helper for bounce_limit calculations") Fixes: ("ARM: 7796/1: scsi: Use dma_max_pfn(dev) helper for bounce_limit calculations") Tested-Acked-by:

Santosh Shilimkar <santosh.shilimkar@ti.com> Reviewed-by:

Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by:

Russell King <rmk+kernel@arm.linux.org.uk>

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;
		}

Admin message