diff options
| author | Florian Fainelli <f.fainelli@gmail.com> | 2021-03-18 21:03:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-26 14:08:56 +0200 |
| commit | eb46d7c8ae838b37ad4acee44fa3828af3062ce7 (patch) | |
| tree | fd9ee066140447189959dd37f82c63c070a14ce3 /arch/arm | |
| parent | 79286ea830b3922b38bcefbd150b2010f91a55ce (diff) | |
| download | kernel_replicant_linux-eb46d7c8ae838b37ad4acee44fa3828af3062ce7.tar.gz kernel_replicant_linux-eb46d7c8ae838b37ad4acee44fa3828af3062ce7.tar.bz2 kernel_replicant_linux-eb46d7c8ae838b37ad4acee44fa3828af3062ce7.zip | |
ARM: Qualify enabling of swiotlb_init()
commit fcf044891c84e38fc90eb736b818781bccf94e38 upstream.
We do not need a SWIOTLB unless we have DRAM that is addressable beyond
the arm_dma_limit. Compare max_pfn with arm_dma_pfn_limit to determine
whether we do need a SWIOTLB to be initialized.
Fixes: ad3c7b18c5b3 ("arm: use swiotlb for bounce buffering on LPAE configs")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
| -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 d54d69cf1732..75f3ab531bdf 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -378,7 +378,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); |