Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'stable/for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb
Pull swiotlb fix from Konrad Rzeszutek Wilk:
"One tiny fix for ARM64 where we could allocate the SWIOTLB twice"
* 'stable/for-linus-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb:
xen/swiotlb: don't initialize swiotlb twice on arm64
+11
-1
+11
-1
drivers/xen/swiotlb-xen.c
+11
-1
drivers/xen/swiotlb-xen.c
···
202
202
retry:
203
203
bytes = xen_set_nslabs(xen_io_tlb_nslabs);
204
204
order = get_order(xen_io_tlb_nslabs << IO_TLB_SHIFT);
205
+
206
+
/*
207
+
* IO TLB memory already allocated. Just use it.
208
+
*/
209
+
if (io_tlb_start != 0) {
210
+
xen_io_tlb_start = phys_to_virt(io_tlb_start);
211
+
goto end;
212
+
}
213
+
205
214
/*
206
215
* Get IO TLB memory from any location.
207
216
*/
···
240
231
m_ret = XEN_SWIOTLB_ENOMEM;
241
232
goto error;
242
233
}
243
-
xen_io_tlb_end = xen_io_tlb_start + bytes;
244
234
/*
245
235
* And replace that memory with pages under 4GB.
246
236
*/
···
266
258
} else
267
259
rc = swiotlb_late_init_with_tbl(xen_io_tlb_start, xen_io_tlb_nslabs);
268
260
261
+
end:
262
+
xen_io_tlb_end = xen_io_tlb_start + bytes;
269
263
if (!rc)
270
264
swiotlb_set_max_segment(PAGE_SIZE);
271
265