Commit 0604e154 authored by Jan Beulich's avatar Jan Beulich

IOMMU: iommu_snoop is x86-only

In fact it's VT-d specific, but we don't have a way yet to build code
for just one vendor. Provide a #define for the opposite case.
Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarPaul Durrant <paul@xen.org>
parent 0de9500d
......@@ -32,7 +32,6 @@ bool_t __read_mostly iommu_enabled;
bool_t __read_mostly force_iommu;
bool_t __read_mostly iommu_verbose;
bool __read_mostly iommu_quarantine = true;
bool_t __read_mostly iommu_snoop = 1;
bool_t __read_mostly iommu_crash_disable;
static bool __hwdom_initdata iommu_hwdom_none;
......@@ -79,8 +78,10 @@ static int __init parse_iommu_param(const char *s)
#endif
else if ( (val = parse_boolean("verbose", s, ss)) >= 0 )
iommu_verbose = val;
#ifndef iommu_snoop
else if ( (val = parse_boolean("snoop", s, ss)) >= 0 )
iommu_snoop = val;
#endif
#ifndef iommu_intremap
else if ( (val = parse_boolean("intremap", s, ss)) >= 0 )
iommu_intremap = val ? iommu_intremap_full : iommu_intremap_off;
......@@ -488,7 +489,9 @@ int __init iommu_setup(void)
printk("I/O virtualisation %sabled\n", iommu_enabled ? "en" : "dis");
if ( !iommu_enabled )
{
iommu_snoop = 0;
#ifndef iommu_snoop
iommu_snoop = false;
#endif
iommu_hwdom_passthrough = false;
iommu_hwdom_strict = false;
}
......
......@@ -52,6 +52,9 @@ bool __read_mostly untrusted_msi;
bool __read_mostly iommu_igfx = true;
bool __read_mostly iommu_qinval = true;
#ifndef iommu_snoop
bool __read_mostly iommu_snoop = true;
#endif
int nr_iommus;
......@@ -2288,8 +2291,10 @@ static int __init vtd_setup(void)
cap_sps_2mb(iommu->cap) ? ", 2MB" : "",
cap_sps_1gb(iommu->cap) ? ", 1GB" : "");
#ifndef iommu_snoop
if ( iommu_snoop && !ecap_snp_ctl(iommu->ecap) )
iommu_snoop = 0;
iommu_snoop = false;
#endif
if ( iommu_hwdom_passthrough && !ecap_pass_thru(iommu->ecap) )
iommu_hwdom_passthrough = false;
......@@ -2331,7 +2336,9 @@ static int __init vtd_setup(void)
}
#define P(p,s) printk("Intel VT-d %s %senabled.\n", s, (p)? "" : "not ")
#ifndef iommu_snoop
P(iommu_snoop, "Snoop Control");
#endif
P(iommu_hwdom_passthrough, "Dom0 DMA Passthrough");
P(iommu_qinval, "Queued Invalidation");
P(iommu_intremap, "Interrupt Remapping");
......@@ -2351,7 +2358,9 @@ static int __init vtd_setup(void)
error:
iommu_enabled = 0;
iommu_snoop = 0;
#ifndef iommu_snoop
iommu_snoop = false;
#endif
iommu_hwdom_passthrough = false;
iommu_qinval = 0;
iommu_intremap = iommu_intremap_off;
......
......@@ -54,7 +54,6 @@ static inline bool_t dfn_eq(dfn_t x, dfn_t y)
extern bool_t iommu_enable, iommu_enabled;
extern bool force_iommu, iommu_quarantine, iommu_verbose;
extern bool_t iommu_snoop;
#ifdef CONFIG_X86
extern enum __packed iommu_intremap {
......@@ -70,9 +69,10 @@ extern enum __packed iommu_intremap {
iommu_intremap_restricted,
iommu_intremap_full,
} iommu_intremap;
extern bool iommu_igfx, iommu_qinval;
extern bool iommu_igfx, iommu_qinval, iommu_snoop;
#else
# define iommu_intremap false
# define iommu_snoop false
#endif
#if defined(CONFIG_X86) && defined(CONFIG_HVM)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment