19d8f590f0
xen.spec - bsc#945167 - Running command ’ xl pci-assignable-add 03:10.1’ secondly show errors 55f7f9d2-libxl-slightly-refine-pci-assignable-add-remove-handling.patch - Upstream patches from Jan 55f2e438-x86-hvm-fix-saved-pmtimer-and-hpet-values.patch 55f9345b-x86-MSI-fail-if-no-hardware-support.patch 5604f239-x86-PV-properly-populate-descriptor-tables.patch 5604f2e6-vt-d-fix-IM-bit-mask-and-unmask-of-FECTL_REG.patch 560a4af9-x86-EPT-tighten-conditions-of-IOMMU-mapping-updates.patch 560a7c36-x86-p2m-pt-delay-freeing-of-intermediate-page-tables.patch 560a7c53-x86-p2m-pt-ignore-pt-share-flag-for-shadow-mode-guests.patch 560bd926-credit1-fix-tickling-when-it-happens-from-a-remote-pCPU.patch 560e6d34-x86-p2m-pt-tighten-conditions-of-IOMMU-mapping-updates.patch - bsc#941074 - VmError: Device 51728 (vbd) could not be connected. Hotplug scripts not working. hotplug-Linux-block-performance-fix.patch - bsc#947165 - VUL-0: CVE-2015-7311: xen: libxl fails to honour readonly flag on disks with qemu-xen (xsa-142) CVE-2015-7311-xsa142.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=378
78 lines
2.7 KiB
Diff
78 lines
2.7 KiB
Diff
# Commit 86f3ff9fc4cc3cb69b96c1de74bcc51f738fe2b9
|
|
# Date 2015-09-25 09:08:22 +0200
|
|
# Author Quan Xu <quan.xu@intel.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
vt-d: fix IM bit mask and unmask of Fault Event Control Register
|
|
|
|
Bit 0:29 in Fault Event Control Register are 'Reserved and Preserved',
|
|
software cannot write 0 to it unconditionally. Software must preserve
|
|
the value read for writes.
|
|
|
|
Signed-off-by: Quan Xu <quan.xu@intel.com>
|
|
Acked-by: Yang Zhang <yang.z.zhang@intel.com>
|
|
|
|
# Commit 26b300bd727ef00a8f60329212a83c3b027a48f7
|
|
# Date 2015-09-25 18:03:04 +0200
|
|
# Author Quan Xu <quan.xu@intel.com>
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
|
vt-d: fix IM bit unmask of Fault Event Control Register in init_vtd_hw()
|
|
|
|
Bit 0:29 in Fault Event Control Register are 'Reserved and Preserved',
|
|
software cannot write 0 to it unconditionally. Software must preserve
|
|
the value read for writes.
|
|
|
|
Suggested-by: Jan Beulich <jbeulich@suse.com>
|
|
Signed-off-by: Quan Xu <quan.xu@intel.com>
|
|
|
|
--- a/xen/drivers/passthrough/vtd/iommu.c
|
|
+++ b/xen/drivers/passthrough/vtd/iommu.c
|
|
@@ -991,10 +991,13 @@ static void dma_msi_unmask(struct irq_de
|
|
{
|
|
struct iommu *iommu = desc->action->dev_id;
|
|
unsigned long flags;
|
|
+ u32 sts;
|
|
|
|
/* unmask it */
|
|
spin_lock_irqsave(&iommu->register_lock, flags);
|
|
- dmar_writel(iommu->reg, DMAR_FECTL_REG, 0);
|
|
+ sts = dmar_readl(iommu->reg, DMAR_FECTL_REG);
|
|
+ sts &= ~DMA_FECTL_IM;
|
|
+ dmar_writel(iommu->reg, DMAR_FECTL_REG, sts);
|
|
spin_unlock_irqrestore(&iommu->register_lock, flags);
|
|
iommu->msi.msi_attrib.masked = 0;
|
|
}
|
|
@@ -1003,10 +1006,13 @@ static void dma_msi_mask(struct irq_desc
|
|
{
|
|
unsigned long flags;
|
|
struct iommu *iommu = desc->action->dev_id;
|
|
+ u32 sts;
|
|
|
|
/* mask it */
|
|
spin_lock_irqsave(&iommu->register_lock, flags);
|
|
- dmar_writel(iommu->reg, DMAR_FECTL_REG, DMA_FECTL_IM);
|
|
+ sts = dmar_readl(iommu->reg, DMAR_FECTL_REG);
|
|
+ sts |= DMA_FECTL_IM;
|
|
+ dmar_writel(iommu->reg, DMAR_FECTL_REG, sts);
|
|
spin_unlock_irqrestore(&iommu->register_lock, flags);
|
|
iommu->msi.msi_attrib.masked = 1;
|
|
}
|
|
@@ -2002,6 +2008,7 @@ static int init_vtd_hw(void)
|
|
struct iommu_flush *flush = NULL;
|
|
int ret;
|
|
unsigned long flags;
|
|
+ u32 sts;
|
|
|
|
/*
|
|
* Basic VT-d HW init: set VT-d interrupt, clear VT-d faults.
|
|
@@ -2015,7 +2022,9 @@ static int init_vtd_hw(void)
|
|
clear_fault_bits(iommu);
|
|
|
|
spin_lock_irqsave(&iommu->register_lock, flags);
|
|
- dmar_writel(iommu->reg, DMAR_FECTL_REG, 0);
|
|
+ sts = dmar_readl(iommu->reg, DMAR_FECTL_REG);
|
|
+ sts &= ~DMA_FECTL_IM;
|
|
+ dmar_writel(iommu->reg, DMAR_FECTL_REG, sts);
|
|
spin_unlock_irqrestore(&iommu->register_lock, flags);
|
|
}
|
|
|