Merge "drivers: of: of_reserved_mem: fixup the alignment with CMA setup" (ea00ed24) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/of/of_reserved_mem.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -127,6 +127,10 @@ static int __init __reserved_mem_alloc_size(unsigned long node,
		align = dt_mem_next_cell(dt_root_addr_cells, &prop);
		}

		/* Need adjust the alignment to satisfy the CMA requirement */
		if (IS_ENABLED(CONFIG_CMA) && of_flat_dt_is_compatible(node, "shared-dma-pool"))
		align = max(align, (phys_addr_t)PAGE_SIZE << max(MAX_ORDER - 1, pageblock_order));

		prop = of_get_flat_dt_prop(node, "alloc-ranges", &len);
		if (prop) {