Commit abbceff7 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Konrad Rzeszutek Wilk
Browse files

swiotlb: add the swiotlb initialization function with iotlb memory 



This enables the caller to initialize swiotlb with its own iotlb
memory.

See "swiotlb: swiotlb: add swiotlb_tbl_map_single library function" for
full description of patchset.

[v2: changed ..with_tlb to ..with_tbl]

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tested-by: default avatarAlbert Herranz <albert_herranz@yahoo.es>
parent eb605a57

include/linux/swiotlb.h

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ extern int swiotlb_force; 
#define IO_TLB_SHIFT 11



extern void swiotlb_init(int verbose);

extern void swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose);



extern void

*swiotlb_alloc_coherent(struct device *hwdev, size_t size,

lib/swiotlb.c

+30 −18
Original line number Diff line number Diff line
@@ -140,28 +140,14 @@ void swiotlb_print_info(void) 
	       (unsigned long long)pend);

}



/*

 * Statically reserve bounce buffer space and initialize bounce buffer data

 * structures for the software IO TLB used to implement the DMA API.

 */

void __init

swiotlb_init_with_default_size(size_t default_size, int verbose)

void __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose)

{

	unsigned long i, bytes;



	if (!io_tlb_nslabs) {

		io_tlb_nslabs = (default_size >> IO_TLB_SHIFT);

		io_tlb_nslabs = ALIGN(io_tlb_nslabs, IO_TLB_SEGSIZE);

	}

	bytes = nslabs << IO_TLB_SHIFT;



	bytes = io_tlb_nslabs << IO_TLB_SHIFT;



	/*

	 * Get IO TLB memory from the low pages

	 */

	io_tlb_start = alloc_bootmem_low_pages(bytes);

	if (!io_tlb_start)

		panic("Cannot allocate SWIOTLB buffer");

	io_tlb_nslabs = nslabs;

	io_tlb_start = tlb;

	io_tlb_end = io_tlb_start + bytes;



	/*
@@ -185,6 +171,32 @@ swiotlb_init_with_default_size(size_t default_size, int verbose) 
		swiotlb_print_info();

}



/*

 * Statically reserve bounce buffer space and initialize bounce buffer data

 * structures for the software IO TLB used to implement the DMA API.

 */

void __init

swiotlb_init_with_default_size(size_t default_size, int verbose)

{

	unsigned long bytes;



	if (!io_tlb_nslabs) {

		io_tlb_nslabs = (default_size >> IO_TLB_SHIFT);

		io_tlb_nslabs = ALIGN(io_tlb_nslabs, IO_TLB_SEGSIZE);

	}



	bytes = io_tlb_nslabs << IO_TLB_SHIFT;



	/*

	 * Get IO TLB memory from the low pages

	 */

	io_tlb_start = alloc_bootmem_low_pages(bytes);

	if (!io_tlb_start)

		panic("Cannot allocate SWIOTLB buffer");



	swiotlb_init_with_tbl(io_tlb_start, io_tlb_nslabs, verbose);

}



void __init

swiotlb_init(int verbose)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE