Merge "arm: dma-mapping: set the proper bitmap size" (88488b82) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/mm/dma-mapping.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -2170,6 +2170,9 @@ arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, u64 size)
		if (!bitmap_size)
		return ERR_PTR(-EINVAL);

		WARN(!IS_ALIGNED(size, SZ_128M),
		"size is not aligned to 128M, alignment enforced");

		if (bitmap_size > PAGE_SIZE) {
		extensions = bitmap_size / PAGE_SIZE;
		bitmap_size = PAGE_SIZE;
		@@ -2192,7 +2195,7 @@ arm_iommu_create_mapping(struct bus_type *bus, dma_addr_t base, u64 size)
		mapping->nr_bitmaps = 1;
		mapping->extensions = extensions;
		mapping->base = base;
		mapping->bits = bits;
		mapping->bits = BITS_PER_BYTE * bitmap_size;

		spin_lock_init(&mapping->lock);