Commit a1cffe8c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-mapping-6.14-2025-03-21' of... 

Merge tag 'dma-mapping-6.14-2025-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux

Pull dma-mapping fix from Marek Szyprowski:

 - fix missing clear bdr in check_ram_in_range_map() (Baochen Qiang)

* tag 'dma-mapping-6.14-2025-03-21' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
  dma-mapping: fix missing clear bdr in check_ram_in_range_map()
parents b5329d5a 8324993f

kernel/dma/direct.c

+18 −10
Original line number Diff line number Diff line
@@ -584,6 +584,22 @@ int dma_direct_supported(struct device *dev, u64 mask) 
	return mask >= phys_to_dma_unencrypted(dev, min_mask);

}



static const struct bus_dma_region *dma_find_range(struct device *dev,

						   unsigned long start_pfn)

{

	const struct bus_dma_region *m;



	for (m = dev->dma_range_map; PFN_DOWN(m->size); m++) {

		unsigned long cpu_start_pfn = PFN_DOWN(m->cpu_start);



		if (start_pfn >= cpu_start_pfn &&

		    start_pfn - cpu_start_pfn < PFN_DOWN(m->size))

			return m;

	}



	return NULL;

}



/*

 * To check whether all ram resource ranges are covered by dma range map

 * Returns 0 when further check is needed
@@ -593,20 +609,12 @@ static int check_ram_in_range_map(unsigned long start_pfn, 
				  unsigned long nr_pages, void *data)

{

	unsigned long end_pfn = start_pfn + nr_pages;

	const struct bus_dma_region *bdr = NULL;

	const struct bus_dma_region *m;

	struct device *dev = data;



	while (start_pfn < end_pfn) {

		for (m = dev->dma_range_map; PFN_DOWN(m->size); m++) {

			unsigned long cpu_start_pfn = PFN_DOWN(m->cpu_start);

		const struct bus_dma_region *bdr;



			if (start_pfn >= cpu_start_pfn &&

			    start_pfn - cpu_start_pfn < PFN_DOWN(m->size)) {

				bdr = m;

				break;

			}

		}

		bdr = dma_find_range(dev, start_pfn);

		if (!bdr)

			return 1;