swiotlb: use the calculated number of areas

rosslagerwall · Christoph Hellwig · commit a6a241764f69 · 2023-09-13T09:13:15.000-03:00
Commit 8ac0406 ("swiotlb: reduce the number of areas to match actual memory pool size") calculated the reduced number of areas in swiotlb_init_remap() but didn't actually use the value. Replace usage of default_nareas accordingly. Fixes: 8ac0406 ("swiotlb: reduce the number of areas to match actual memory pool size") Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
@@ -399,14 +399,13 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags,
 	}
 
 	mem->areas = memblock_alloc(array_size(sizeof(struct io_tlb_area),
-		default_nareas), SMP_CACHE_BYTES);
+		nareas), SMP_CACHE_BYTES);
 	if (!mem->areas) {
 		pr_warn("%s: Failed to allocate mem->areas.\n", __func__);
 		return;
 	}
 
-	swiotlb_init_io_tlb_pool(mem, __pa(tlb), nslabs, false,
-				 default_nareas);
+	swiotlb_init_io_tlb_pool(mem, __pa(tlb), nslabs, false, nareas);
 	add_mem_pool(&io_tlb_default_mem, mem);
 
 	if (flags & SWIOTLB_VERBOSE)

Original file line number	Diff line number	Diff line change
`@@ -399,14 +399,13 @@ void __init swiotlb_init_remap(bool addressing_limit, unsigned int flags,`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`mem->areas = memblock_alloc(array_size(sizeof(struct io_tlb_area),`
`402`		`- default_nareas), SMP_CACHE_BYTES);`
	`402`	`+ nareas), SMP_CACHE_BYTES);`
`403`	`403`	`if (!mem->areas) {`
`404`	`404`	`pr_warn("%s: Failed to allocate mem->areas.\n", __func__);`
`405`	`405`	`return;`
`406`	`406`	`}`
`407`	`407`
`408`		`- swiotlb_init_io_tlb_pool(mem, __pa(tlb), nslabs, false,`
`409`		`- default_nareas);`
	`408`	`+ swiotlb_init_io_tlb_pool(mem, __pa(tlb), nslabs, false, nareas);`
`410`	`409`	`add_mem_pool(&io_tlb_default_mem, mem);`
`411`	`410`
`412`	`411`	`if (flags & SWIOTLB_VERBOSE)`