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

swiotlb: don't override user specified size in swiotlb_adjust_size 



If the user already specified a swiotlb size on the command line,
swiotlb_adjust_size should not overwrite it.

Fixes: 2cbc2776 ("swiotlb: remove swiotlb_nr_tbl")
Reported-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Tested-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 95b079d8

kernel/dma/swiotlb.c

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ void __init swiotlb_adjust_size(unsigned long size) 
	 * architectures such as those supporting memory encryption to

	 * adjust/expand SWIOTLB size for their use.

	 */

	if (default_nslabs != IO_TLB_DEFAULT_SIZE >> IO_TLB_SHIFT)

		return;

	size = ALIGN(size, IO_TLB_SIZE);

	default_nslabs = ALIGN(size >> IO_TLB_SHIFT, IO_TLB_SEGSIZE);

	pr_info("SWIOTLB bounce buffer size adjusted to %luMB", size >> 20);