aboutsummaryrefslogtreecommitdiffstats
path: root/xen/drivers
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@suse.com>2013-08-21 16:44:58 +0200
committerJan Beulich <jbeulich@suse.com>2013-08-21 16:44:58 +0200
commitc9c6abab583d27fdca1d979a7f1d18ae30f54e9b (patch)
tree03429b2bfcae11fd2d6ea3356635deef47e030a3 /xen/drivers
parent71b9ff99e174e422270d5dadc30021009d4c8699 (diff)
downloadxen-c9c6abab583d27fdca1d979a7f1d18ae30f54e9b.tar.gz
xen-c9c6abab583d27fdca1d979a7f1d18ae30f54e9b.tar.bz2
xen-c9c6abab583d27fdca1d979a7f1d18ae30f54e9b.zip
VT-d: warn about Compatibility Format Interrupts being enabled by firmware
... as being insecure. Also drop the second (redundant) read DMAR_GSTS_REG from enable_intremap(). Signed-off-by: Jan Beulich <jbeulich@suse.com> Acked-by Xiantao Zhang <xiantao.zhang@intel.com>
Diffstat (limited to 'xen/drivers')
-rw-r--r--xen/drivers/passthrough/vtd/intremap.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/xen/drivers/passthrough/vtd/intremap.c b/xen/drivers/passthrough/vtd/intremap.c
index 5248d4897b..f3bb31b4b2 100644
--- a/xen/drivers/passthrough/vtd/intremap.c
+++ b/xen/drivers/passthrough/vtd/intremap.c
@@ -712,8 +712,8 @@ int enable_intremap(struct iommu *iommu, int eim)
if ( !platform_supports_intremap() )
{
- dprintk(XENLOG_ERR VTDPREFIX,
- "Platform firmware does not support interrupt remapping\n");
+ printk(XENLOG_ERR VTDPREFIX
+ " Platform firmware does not support interrupt remapping\n");
return -EINVAL;
}
@@ -724,15 +724,19 @@ int enable_intremap(struct iommu *iommu, int eim)
if ( (sts & DMA_GSTS_IRES) && ir_ctrl->iremap_maddr )
return 0;
- sts = dmar_readl(iommu->reg, DMAR_GSTS_REG);
if ( !(sts & DMA_GSTS_QIES) )
{
- dprintk(XENLOG_ERR VTDPREFIX,
- "Queued invalidation is not enabled, should not enable "
- "interrupt remapping\n");
+ printk(XENLOG_ERR VTDPREFIX
+ " Queued invalidation is not enabled on IOMMU #%u:"
+ " Should not enable interrupt remapping\n", iommu->index);
return -EINVAL;
}
+ if ( !eim && (sts & DMA_GSTS_CFIS) )
+ printk(XENLOG_WARNING VTDPREFIX
+ " Compatibility Format Interrupts permitted on IOMMU #%u:"
+ " Device pass-through will be insecure\n", iommu->index);
+
if ( ir_ctrl->iremap_maddr == 0 )
{
drhd = iommu_to_drhd(iommu);