Skip to content

Commit 9bbe7a7

Browse files
sstabelliniChristoph Hellwig
authored andcommitted
arm/xen: don't check for xen_initial_domain() in xen_create_contiguous_region
It used to be that Linux enabled swiotlb-xen when running a dom0 on ARM. Since f5079a9 "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>
1 parent 0d5ffd9 commit 9bbe7a7

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

arch/arm/xen/mm.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,7 @@ int xen_create_contiguous_region(phys_addr_t pstart, unsigned int order,
122122
unsigned int address_bits,
123123
dma_addr_t *dma_handle)
124124
{
125-
if (!xen_initial_domain())
126-
return -EINVAL;
127-
128-
/* we assume that dom0 is mapped 1:1 for now */
125+
/* the domain is 1:1 mapped to use swiotlb-xen */
129126
*dma_handle = pstart;
130127
return 0;
131128
}

0 commit comments

Comments
 (0)