ARM: dma-mapping: allow larger DMA mask than supported (ab746573) · Commits · 戴 / test

Since the Linux 5.1 merge window we allow drivers to just set the largest DMA mask they support instead of falling back to smaller ones. But I forgot to remove a check that prohibits this behavior in the arm DMA code, as it is rather hidden. There is not reason for this check as the code will do the right thing for a "too large" DMA mask, so just remove it. Fixes: ("Documentation/DMA-API-HOWTO: update dma_mask sections") Signed-off-by:

Christoph Hellwig <hch@lst.de>

arch/arm/mm/dma-mapping.c

+1 −19

Original line number	Diff line number	Diff line
		@@ -219,25 +219,7 @@ EXPORT_SYMBOL(arm_coherent_dma_ops);

		static int __dma_supported(struct device *dev, u64 mask, bool warn)
		{
		unsigned long max_dma_pfn;

		/*
		* If the mask allows for more memory than we can address,
		* and we actually have that much memory, then we must
		* indicate that DMA to this device is not supported.
		*/
		if (sizeof(mask) != sizeof(dma_addr_t) &&
		mask > (dma_addr_t)~0 &&
		dma_to_pfn(dev, ~0) < max_pfn - 1) {
		if (warn) {
		dev_warn(dev, "Coherent DMA mask %#llx is larger than dma_addr_t allows\n",
		mask);
		dev_warn(dev, "Driver did not use or check the return value from dma_set_coherent_mask()?\n");
		}
		return 0;
		}

		max_dma_pfn = min(max_pfn, arm_dma_pfn_limit);
		unsigned long max_dma_pfn = min(max_pfn, arm_dma_pfn_limit);

		/*
		* Translate the device's DMA mask to a PFN limit. This

Admin message