summaryrefslogtreecommitdiff
path: root/drivers/xen
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2021-03-01 10:44:31 +0300
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2021-03-17 03:40:49 +0300
commit5d0538b2b884f7fd239f6ab3b667148dc57123f1 (patch)
tree060677a67b91ec06e41b57d387fe35a75d1e4628 /drivers/xen
parentcbce99527ca7c4e98db9890651d5e9dfc2fb89ac (diff)
downloadlinux-5d0538b2b884f7fd239f6ab3b667148dc57123f1.tar.xz
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: Christoph Hellwig <hch@lst.de> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/swiotlb-xen.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 1a31ddf71397..060eeb056486 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -173,12 +173,6 @@ retry:
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.
*/
if (early) {
@@ -232,7 +226,6 @@ retry:
} else
rc = swiotlb_late_init_with_tbl(start, nslabs);
-end:
if (!rc)
swiotlb_set_max_segment(PAGE_SIZE);