Skip to content

Commit

Permalink
xen/arm: move xen_swiotlb_detect to arm/swiotlb-xen.h
Browse files Browse the repository at this point in the history
Move xen_swiotlb_detect to a static inline function to make it available
to !CONFIG_XEN builds.

CC: boris.ostrovsky@oracle.com
CC: jgross@suse.com
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20210512201823.1963-1-sstabellini@kernel.org
Signed-off-by: Juergen Gross <jgross@suse.com>
  • Loading branch information
Stefano Stabellini authored and Juergen Gross committed May 14, 2021
1 parent dbc03e8 commit cb6f6b3
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
12 changes: 0 additions & 12 deletions arch/arm/xen/mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,18 +135,6 @@ void xen_destroy_contiguous_region(phys_addr_t pstart, unsigned int order)
return;
}

int xen_swiotlb_detect(void)
{
if (!xen_domain())
return 0;
if (xen_feature(XENFEAT_direct_mapped))
return 1;
/* legacy case */
if (!xen_feature(XENFEAT_not_direct_mapped) && xen_initial_domain())
return 1;
return 0;
}

static int __init xen_mm_init(void)
{
struct gnttab_cache_flush cflush;
Expand Down
15 changes: 14 additions & 1 deletion include/xen/arm/swiotlb-xen.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@
#ifndef _ASM_ARM_SWIOTLB_XEN_H
#define _ASM_ARM_SWIOTLB_XEN_H

extern int xen_swiotlb_detect(void);
#include <xen/features.h>
#include <xen/xen.h>

static inline int xen_swiotlb_detect(void)
{
if (!xen_domain())
return 0;
if (xen_feature(XENFEAT_direct_mapped))
return 1;
/* legacy case */
if (!xen_feature(XENFEAT_not_direct_mapped) && xen_initial_domain())
return 1;
return 0;
}

#endif /* _ASM_ARM_SWIOTLB_XEN_H */

0 comments on commit cb6f6b3

Please sign in to comment.