Commit 27222a3d authored by Catalin Marinas's avatar Catalin Marinas

arm64: Call swiotlb_init() instead of swiotlb_init_with_default_size()

Following commit 74838b75 (swiotlb: add the late swiotlb initialization
function with iotlb memory) the swiotlb_init_with_default_size() is a
static function. This patch changes the arm64 code to call
swiotlb_init() instead and use the default size of 64MB. It is assumed
that AArch64 platforms have enough RAM to afford the pre-allocated
swiotlb memory. It also removes the #ifdef around this call since
CONFIG_SWIOTLB is always enabled.
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent e9eca4de
...@@ -61,12 +61,10 @@ static struct dma_map_ops arm64_swiotlb_dma_ops = { ...@@ -61,12 +61,10 @@ static struct dma_map_ops arm64_swiotlb_dma_ops = {
.mapping_error = swiotlb_dma_mapping_error, .mapping_error = swiotlb_dma_mapping_error,
}; };
void __init swiotlb_init_with_default_size(size_t default_size, int verbose); void __init arm64_swiotlb_init(void)
void __init arm64_swiotlb_init(size_t max_size)
{ {
dma_ops = &arm64_swiotlb_dma_ops; dma_ops = &arm64_swiotlb_dma_ops;
swiotlb_init_with_default_size(min((size_t)SZ_64M, max_size), 1); swiotlb_init(1);
} }
#define PREALLOC_DMA_DEBUG_ENTRIES 4096 #define PREALLOC_DMA_DEBUG_ENTRIES 4096
......
...@@ -301,10 +301,7 @@ void __init mem_init(void) ...@@ -301,10 +301,7 @@ void __init mem_init(void)
unsigned long reserved_pages, free_pages; unsigned long reserved_pages, free_pages;
struct memblock_region *reg; struct memblock_region *reg;
#if CONFIG_SWIOTLB arm64_swiotlb_init();
extern void __init arm64_swiotlb_init(size_t max_size);
arm64_swiotlb_init(max_pfn << (PAGE_SHIFT - 1));
#endif
max_mapnr = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map; max_mapnr = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map;
......
extern void __flush_dcache_page(struct page *page); extern void __flush_dcache_page(struct page *page);
extern void __init bootmem_init(void); extern void __init bootmem_init(void);
extern void __init arm64_swiotlb_init(void);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment