diff -r 4746414def65 xen/drivers/passthrough/amd/iommu_init.c --- a/xen/drivers/passthrough/amd/iommu_init.c Mon Sep 03 09:40:38 2012 +0200 +++ b/xen/drivers/passthrough/amd/iommu_init.c Wed Sep 05 16:35:23 2012 +0200 @@ -564,7 +564,7 @@ static hw_irq_controller iommu_msi_type static void parse_event_log_entry(struct amd_iommu *iommu, u32 entry[]) { - u16 domain_id, device_id, bdf, cword; + u16 domain_id, device_id, bdf, cword, flags; u32 code; u64 *addr; int count = 0; @@ -609,11 +609,14 @@ static void parse_event_log_entry(struct domain_id = get_field_from_reg_u32(entry[1], IOMMU_EVENT_DOMAIN_ID_MASK, IOMMU_EVENT_DOMAIN_ID_SHIFT); + flags = get_field_from_reg_u32(entry[1], + IOMMU_EVENT_FLAGS_MASK, + IOMMU_EVENT_FLAGS_SHIFT); addr= (u64*) (entry + 2); printk(XENLOG_ERR "AMD-Vi: " "%s: domain = %d, device id = 0x%04x, " - "fault address = 0x%"PRIx64"\n", - event_str[code-1], domain_id, device_id, *addr); + "fault address = 0x%"PRIx64", flags = 0x%03x\n", + event_str[code-1], domain_id, device_id, *addr, flags); /* Tell the device to stop DMAing; we can't rely on the guest to * control it for us. */ diff -r 4746414def65 xen/include/asm-x86/hvm/svm/amd-iommu-defs.h --- a/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h Mon Sep 03 09:40:38 2012 +0200 +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-defs.h Wed Sep 05 16:35:23 2012 +0200 @@ -283,6 +283,8 @@ #define IOMMU_EVENT_DOMAIN_ID_SHIFT 0 #define IOMMU_EVENT_DEVICE_ID_MASK 0x0000FFFF #define IOMMU_EVENT_DEVICE_ID_SHIFT 0 +#define IOMMU_EVENT_FLAGS_SHIFT 16 +#define IOMMU_EVENT_FLAGS_MASK 0x0FFF0000 /* PPR Log */ #define IOMMU_PPR_LOG_ENTRY_SIZE 16