diff options
| author | Tim Deegan <Tim.Deegan@citrix.com> | 2011-08-12 11:33:41 +0100 |
|---|---|---|
| committer | Tim Deegan <Tim.Deegan@citrix.com> | 2011-08-12 11:33:41 +0100 |
| commit | b9d432a40a59fa4f8bfe3cebd3dc372357d74339 (patch) | |
| tree | cc25bde46c274f33231b04e05ebdecd8f7b4dd08 | |
| parent | 9856b82852520372b3b5fa7b0664145b4ba6cfdb (diff) | |
| download | xen-b9d432a40a59fa4f8bfe3cebd3dc372357d74339.tar.gz xen-b9d432a40a59fa4f8bfe3cebd3dc372357d74339.tar.bz2 xen-b9d432a40a59fa4f8bfe3cebd3dc372357d74339.zip | |
Passthrough: disable bus-mastering on any card that causes an IOMMU fault.
This stops the card from raising back-to-back faults and live-locking
the CPU that handles them.
Signed-off-by: Tim Deegan <tim@xen.org>
Acked-by: Wei Wang2 <wei.wang2@amd.com>
Acked-by: Allen M Kay <allen.m.kay@intel.com>
| -rw-r--r-- | xen/drivers/passthrough/amd/iommu_init.c | 14 | ||||
| -rw-r--r-- | xen/drivers/passthrough/vtd/iommu.c | 10 |
2 files changed, 22 insertions, 2 deletions
diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c index 1002e44e8d..b6be6e05e5 100644 --- a/xen/drivers/passthrough/amd/iommu_init.c +++ b/xen/drivers/passthrough/amd/iommu_init.c @@ -462,7 +462,7 @@ static hw_irq_controller iommu_msi_type = { static void parse_event_log_entry(u32 entry[]) { - u16 domain_id, device_id; + u16 domain_id, device_id, bdf, cword; u32 code; u64 *addr; char * event_str[] = {"ILLEGAL_DEV_TABLE_ENTRY", @@ -497,6 +497,18 @@ static void parse_event_log_entry(u32 entry[]) "%s: domain = %d, device id = 0x%04x, " "fault address = 0x%"PRIx64"\n", event_str[code-1], domain_id, device_id, *addr); + + /* Tell the device to stop DMAing; we can't rely on the guest to + * control it for us. */ + for ( bdf = 0; bdf < ivrs_bdf_entries; bdf++ ) + if ( get_dma_requestor_id(bdf) == device_id ) + { + cword = pci_conf_read16(PCI_BUS(bdf), PCI_SLOT(bdf), + PCI_FUNC(bdf), PCI_COMMAND); + pci_conf_write16(PCI_BUS(bdf), PCI_SLOT(bdf), + PCI_FUNC(bdf), PCI_COMMAND, + cword & ~PCI_COMMAND_MASTER); + } } else { diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 939ec4a15d..b299495e54 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -893,7 +893,7 @@ static void iommu_page_fault(int irq, void *dev_id, while (1) { u8 fault_reason; - u16 source_id; + u16 source_id, cword; u32 data; u64 guest_addr; int type; @@ -926,6 +926,14 @@ static void iommu_page_fault(int irq, void *dev_id, iommu_page_fault_do_one(iommu, type, fault_reason, source_id, guest_addr); + /* Tell the device to stop DMAing; we can't rely on the guest to + * control it for us. */ + cword = pci_conf_read16(PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), PCI_COMMAND); + pci_conf_write16(PCI_BUS(source_id), PCI_SLOT(source_id), + PCI_FUNC(source_id), PCI_COMMAND, + cword & ~PCI_COMMAND_MASTER); + fault_index++; if ( fault_index > cap_num_fault_regs(iommu->cap) ) fault_index = 0; |