lkml.org 
[lkml]   [2021]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 05/63] ARM: Qualify enabling of swiotlb_init()
    Date
    From: Florian Fainelli <f.fainelli@gmail.com>

    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>
    ---
    arch/arm/mm/init.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    --- 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);

    \
     
     \ /
      Last update: 2021-09-24 15:10    [W:4.030 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site