diff options
author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-09-27 12:34:19 +0000 |
---|---|---|
committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-09-27 12:34:19 +0000 |
commit | 913880358f41e59f87e72ec9bb2601a6a4f5d589 (patch) | |
tree | 0a01a572a28a0e1a74a29d6c0dfbe33ddf6a03d8 /arch/arm/mm | |
parent | 5e2f889a8a3a0b326eb96497906bc7bcb6bcb743 (diff) | |
parent | e74e2950a0d6f800858e54860d7124c86e494f62 (diff) |
Merge tag 'v5.4.149' into 5.4-2.3.x-imx
This is the 5.4.149 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/init.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 0804a6af4a3b..5a3641b5ec2c 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -469,7 +469,11 @@ static void __init free_highpages(void) void __init mem_init(void) { #ifdef CONFIG_ARM_LPAE - swiotlb_init(1); + if (swiotlb_force == SWIOTLB_FORCE || + max_pfn > arm_dma_pfn_limit) + swiotlb_init(1); + else + swiotlb_force = SWIOTLB_NO_FORCE; #endif set_max_mapnr(pfn_to_page(max_pfn) - mem_map); |