From e4c9df05d81af2bfc7aee38a5b20361b356b70d3 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 5 Nov 2026 22:54:11 +0100 Subject: of: reserved_mem: Drop node_fixup, CMA can handle it internally again The separate fixup step was needed because node initialization used to run too late, after paging_init(). Since commit aa05faf81583 ("of: reserved_mem: allocate and map the reserved_mem array early") node_init runs early enough again, so dma_contiguous_early_fixup() can be called directly from rmem_cma_setup() once the CMA region has been successfully initialized, as it was before commit 2c223f7239f37 ("of: reserved_mem: Restructure call site for dma_contiguous_early_fixup()"). Drop the now unused node_fixup callback and its helper. This also fixes the premature call to fixup when region fails to initialize. Closes: https://sashiko.dev/#/bug/linux-61818eaa-5dc1-4457-bd21-3a9be2ed4d6d Signed-off-by: Marek Szyprowski Link: https://patch.msgid.link/20261105215413.1439745-1-m.szyprowski@samsung.com Signed-off-by: Rob Herring (Arm) --- include/linux/of_reserved_mem.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h index 49da515859f2..7a940d1815b6 100644 --- a/include/linux/of_reserved_mem.h +++ b/include/linux/of_reserved_mem.h @@ -19,8 +19,6 @@ struct reserved_mem { struct reserved_mem_ops { int (*node_validate)(unsigned long fdt_node, phys_addr_t *align); - int (*node_fixup)(unsigned long fdt_node, phys_addr_t base, - phys_addr_t size); int (*node_init)(unsigned long fdt_node, struct reserved_mem *rmem); int (*device_init)(struct reserved_mem *rmem, struct device *dev); -- cgit v1.2.3