34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Keir Fraser <keir@xen.org>
|
||
|
|
# Date 1289906913 0
|
||
|
|
# Node ID 9b2ca938cfe6c0639471e24634bc4a48d889b412
|
||
|
|
# Parent 87f248de52304bc96a80dc093250fed0197f37e0
|
||
|
|
amd iommu: Fix HV crash with 32bit pv_ops kernel
|
||
|
|
|
||
|
|
Signed-off-by: Wei Wang <wei.wang2@amd.com>
|
||
|
|
Tested-by: Conny Seidel <conny.seidel@amd.com>
|
||
|
|
|
||
|
|
--- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
|
||
|
|
+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
|
||
|
|
@@ -32,9 +32,6 @@
|
||
|
|
#define DMA_32BIT_MASK 0x00000000ffffffffULL
|
||
|
|
#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
|
||
|
|
|
||
|
|
-extern int amd_iommu_debug;
|
||
|
|
-extern int amd_iommu_perdev_intremap;
|
||
|
|
-
|
||
|
|
#define AMD_IOMMU_DEBUG(fmt, args...) \
|
||
|
|
do \
|
||
|
|
{ \
|
||
|
|
--- a/xen/include/xen/iommu.h
|
||
|
|
+++ b/xen/include/xen/iommu.h
|
||
|
|
@@ -30,6 +30,8 @@ extern bool_t iommu_enabled;
|
||
|
|
extern bool_t force_iommu, iommu_verbose;
|
||
|
|
extern bool_t iommu_workaround_bios_bug, iommu_passthrough;
|
||
|
|
extern bool_t iommu_snoop, iommu_qinval, iommu_intremap;
|
||
|
|
+extern bool_t amd_iommu_debug;
|
||
|
|
+extern bool_t amd_iommu_perdev_intremap;
|
||
|
|
|
||
|
|
#define domain_hvm_iommu(d) (&d->arch.hvm_domain.hvm_iommu)
|
||
|
|
|