summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorOreoluwa Babatunde <oreoluwa.babatunde@oss.qualcomm.com>2025-08-06 10:24:21 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-09-04 15:31:45 +0200
commit46efab01648a04082266115a8e917c3b26b97fa8 (patch)
tree9a5fa1ba380de01cc25cf24a68b380c1593480d0 /kernel
parent7536b299033444a1c366ddbcf920b160ea351436 (diff)
downloadlinux-46efab01648a04082266115a8e917c3b26b97fa8.tar.gz
linux-46efab01648a04082266115a8e917c3b26b97fa8.tar.bz2
linux-46efab01648a04082266115a8e917c3b26b97fa8.zip
of: reserved_mem: Restructure call site for dma_contiguous_early_fixup()
[ Upstream commit 2c223f7239f376a90d71903ec474ba887cf21d94 ] Restructure the call site for dma_contiguous_early_fixup() to where the reserved_mem nodes are being parsed from the DT so that dma_mmu_remap[] is populated before dma_contiguous_remap() is called. Fixes: 8a6e02d0c00e ("of: reserved_mem: Restructure how the reserved memory regions are processed") Signed-off-by: Oreoluwa Babatunde <oreoluwa.babatunde@oss.qualcomm.com> Tested-by: William Zhang <william.zhang@broadcom.com> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Link: https://lore.kernel.org/r/20250806172421.2748302-1-oreoluwa.babatunde@oss.qualcomm.com Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/dma/contiguous.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
index 8df0dfaaca18..9e5d63efe7c5 100644
--- a/kernel/dma/contiguous.c
+++ b/kernel/dma/contiguous.c
@@ -480,8 +480,6 @@ static int __init rmem_cma_setup(struct reserved_mem *rmem)
pr_err("Reserved memory: unable to setup CMA region\n");
return err;
}
- /* Architecture specific contiguous memory fixup. */
- dma_contiguous_early_fixup(rmem->base, rmem->size);
if (default_cma)
dma_contiguous_default_area = cma;