leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm64: Call swiotlb_init() instead of swiotlb_init_with_default_size()

Browse Source 
Following commit 74838b7 (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: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Catalin Marinas 2012-10-03 14:35:18 +01:00
parent e9eca4de95
commit 27222a3d2b
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm64/mm/dma-mapping.c
View File

@ -61,12 +61,10 @@ static struct dma_map_ops arm64_swiotlb_dma_ops = {
.mapping_error = swiotlb_dma_mapping_error,
};
void __init swiotlb_init_with_default_size(size_t default_size, int verbose);
void __init arm64_swiotlb_init(size_t max_size)
void __init arm64_swiotlb_init(void)
{
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

5
arch/arm64/mm/init.c
View File

@ -301,10 +301,7 @@ void __init mem_init(void)
unsigned long reserved_pages, free_pages;
struct memblock_region *reg;
#if CONFIG_SWIOTLB
extern void __init arm64_swiotlb_init(size_t max_size);
arm64_swiotlb_init(max_pfn << (PAGE_SHIFT - 1));
#endif
arm64_swiotlb_init();
max_mapnr = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map;

1
arch/arm64/mm/mm.h
View File

@ -1,2 +1,3 @@
extern void __flush_dcache_page(struct page *page);
extern void __init bootmem_init(void);
extern void __init arm64_swiotlb_init(void);