Commit 5d0538b2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Konrad Rzeszutek Wilk
Browse files

swiotlb: lift the double initialization protection from xen-swiotlb 



Lift the double initialization protection from xen-swiotlb to the core
code to avoid exposing too many swiotlb internals.  Also upgrade the
check to a warning as it should not happen.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent cbce9952

drivers/xen/swiotlb-xen.c

+0 −7
Original line number Diff line number Diff line
@@ -172,12 +172,6 @@ int __ref xen_swiotlb_init(int verbose, bool early) 
	bytes = nslabs << IO_TLB_SHIFT;

	order = get_order(bytes);



	/*

	 * IO TLB memory already allocated. Just use it.

	 */

	if (io_tlb_start != 0)

		goto end;



	/*

	 * Get IO TLB memory from any location.

	 */
@@ -232,7 +226,6 @@ int __ref xen_swiotlb_init(int verbose, bool early) 
	} else

		rc = swiotlb_late_init_with_tbl(start, nslabs);



end:

	if (!rc)

		swiotlb_set_max_segment(PAGE_SIZE);

kernel/dma/swiotlb.c

+8 −0
Original line number Diff line number Diff line
@@ -229,6 +229,10 @@ int __init swiotlb_init_with_tbl(char *tlb, unsigned long nslabs, int verbose) 
	unsigned long i, bytes;

	size_t alloc_size;



	/* protect against double initialization */

	if (WARN_ON_ONCE(io_tlb_start))

		return -ENOMEM;



	bytes = nslabs << IO_TLB_SHIFT;



	io_tlb_nslabs = nslabs;
@@ -367,6 +371,10 @@ swiotlb_late_init_with_tbl(char *tlb, unsigned long nslabs) 
{

	unsigned long i, bytes;



	/* protect against double initialization */

	if (WARN_ON_ONCE(io_tlb_start))

		return -ENOMEM;



	bytes = nslabs << IO_TLB_SHIFT;



	io_tlb_nslabs = nslabs;