Merge tag 'dma-mapping-4.20-4' of git://git.infradead.org/users/hch/dma-mapping (2dd516ff) · Commits · 戴 / test

Pull dma-mapping fix from Christoph Hellwig: "Fix a regression in dma-direct that didn't take account the magic AMD memory encryption mask in the DMA address" * tag 'dma-mapping-4.20-4' of git://git.infradead.org/users/hch/dma-mapping: dma-direct: do not include SME mask in the DMA supported check

kernel/dma/direct.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -309,7 +309,12 @@ int dma_direct_supported(struct device *dev, u64 mask)

		min_mask = min_t(u64, min_mask, (max_pfn - 1) << PAGE_SHIFT);

		return mask >= phys_to_dma(dev, min_mask);
		/*
		* This check needs to be against the actual bit mask value, so
		* use __phys_to_dma() here so that the SME encryption mask isn't
		* part of the check.
		*/
		return mask >= __phys_to_dma(dev, min_mask);
		}

		int dma_direct_mapping_error(struct device *dev, dma_addr_t dma_addr)

Admin message