arm/xen: don't check for xen_initial_domain() in xen_create_contiguous_region
authorStefano Stabellini <sstabellini@kernel.org>
Fri, 4 Mar 2022 23:22:54 +0000 (15:22 -0800)
committerChristoph Hellwig <hch@lst.de>
Mon, 18 Apr 2022 05:21:09 +0000 (07:21 +0200)
It used to be that Linux enabled swiotlb-xen when running a dom0 on ARM.
Since f5079a9a2a31 "xen/arm: introduce XENFEAT_direct_mapped and
XENFEAT_not_direct_mapped", Linux detects whether to enable or disable
swiotlb-xen based on the new feature flags: XENFEAT_direct_mapped and
XENFEAT_not_direct_mapped.

However, there is still a leftover xen_initial_domain() check in
xen_create_contiguous_region. Remove the check as
xen_create_contiguous_region is only called by swiotlb-xen during
initialization. If xen_create_contiguous_region is called, we know Linux
is running 1:1 mapped so there is no need for additional checks.

Also update the in-code comment.

Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
arch/arm/xen/mm.c

index a7e54a087b80240a60af284755f45667e0969c54..28c2070602535505210738c01d062fd4c2249502 100644 (file)
@@ -122,10 +122,7 @@ int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order,
                                 unsigned int address_bits,
                                 dma_addr_t *dma_handle)
 {
-       if (!xen_initial_domain())
-               return -EINVAL;
-
-       /* we assume that dom0 is mapped 1:1 for now */
+       /* the domain is 1:1 mapped to use swiotlb-xen */
        *dma_handle = pstart;
        return 0;
 }