[PATCH] amd iommu: Fix HV crach with 32bit pv_ops kernel

[PATCH] amd iommu: Fix HV crach with 32bit pv_ops kernel

[Wei Wang2]

[-- Attachment #1: Type: text/plain, Size: 434 bytes --]

Hi Keir,
Attached patch should have fixed this issue:
http://lists.xensource.com/archives/html/xen-devel/2010-11/msg00374.html

Thanks,
Wei

Signed-off-by: Wei Wang <wei.wang2@amd.com>
Tested-by: Conny Seidel <conny.seidel@amd.com>

Legal Information:
Advanced Micro Devices GmbH
Sitz: Dornach, Gemeinde Aschheim, 
Landkreis München Registergericht München, 
HRB Nr. 43632
Geschäftsführer:
Alberto Bozzo, Andrew Bowd

[-- Attachment #2: fix_pv_32b.patch --]
[-- Type: text/x-diff, Size: 498 bytes --]

diff -r 388c44a63613 xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
--- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h	Wed Nov 10 14:56:06 2010 +0000
+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h	Fri Nov 12 17:10:31 2010 +0100
@@ -31,8 +31,8 @@
 
 #define DMA_32BIT_MASK  0x00000000ffffffffULL
 
-extern int amd_iommu_debug;
-extern int amd_iommu_perdev_intremap;
+extern bool_t amd_iommu_debug;
+extern bool_t amd_iommu_perdev_intremap;
 
 #define AMD_IOMMU_DEBUG(fmt, args...) \
     do  \

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [PATCH] amd iommu: Fix HV crach with 32bit pv_ops kernel

[Jan Beulich]

>>> On 15.11.10 at 11:18, Wei Wang2 <wei.wang2@amd.com> wrote:
>--- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h	Wed Nov 10 14:56:06 2010 +0000
>+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h	Fri Nov 12 17:10:31 2010 +0100
>@@ -31,8 +31,8 @@
> 
> #define DMA_32BIT_MASK  0x00000000ffffffffULL
> 
>-extern int amd_iommu_debug;
>-extern int amd_iommu_perdev_intremap;
>+extern bool_t amd_iommu_debug;
>+extern bool_t amd_iommu_perdev_intremap;
> 
> #define AMD_IOMMU_DEBUG(fmt, args...) \
>     do  \

This surely can't be complete: If you had a type mismatch between
declaration and definition, the defining code is clearly missing an
#include of the #define-ing header.

Jan

[PATCH] amd iommu: Fix HV crash with 32bit pv_ops kernel (V2)

[Wei Wang2]

[-- Attachment #1: Type: text/plain, Size: 893 bytes --]

Hi Jan
Could this new version be a little more clear?
Thanks,
Wei

Signed-off-by: Wei Wang <wei.wang2@amd.com>

On Monday 15 November 2010 13:37:27 Jan Beulich wrote:
> >>> On 15.11.10 at 11:18, Wei Wang2 <wei.wang2@amd.com> wrote:
> >
> >--- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h	Wed Nov 10 14:56:06
> > 2010 +0000 +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h	Fri Nov 12
> > 17:10:31 2010 +0100 @@ -31,8 +31,8 @@
> >
> > #define DMA_32BIT_MASK  0x00000000ffffffffULL
> >
> >-extern int amd_iommu_debug;
> >-extern int amd_iommu_perdev_intremap;
> >+extern bool_t amd_iommu_debug;
> >+extern bool_t amd_iommu_perdev_intremap;
> >
> > #define AMD_IOMMU_DEBUG(fmt, args...) \
> >     do  \
>
> This surely can't be complete: If you had a type mismatch between
> declaration and definition, the defining code is clearly missing an
> #include of the #define-ing header.
>
> Jan



[-- Attachment #2: fix_pv_ops_32_v2.patch --]
[-- Type: text/x-diff, Size: 963 bytes --]

diff -r 388c44a63613 xen/include/asm-x86/hvm/svm/amd-iommu-proto.h
--- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h	Wed Nov 10 14:56:06 2010 +0000
+++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h	Mon Nov 15 14:49:52 2010 +0100
@@ -30,9 +30,6 @@
         &amd_iommu_head, list)
 
 #define DMA_32BIT_MASK  0x00000000ffffffffULL
-
-extern int amd_iommu_debug;
-extern int amd_iommu_perdev_intremap;
 
 #define AMD_IOMMU_DEBUG(fmt, args...) \
     do  \
diff -r 388c44a63613 xen/include/xen/iommu.h
--- a/xen/include/xen/iommu.h	Wed Nov 10 14:56:06 2010 +0000
+++ b/xen/include/xen/iommu.h	Mon Nov 15 14:49:52 2010 +0100
@@ -30,6 +30,8 @@ extern bool_t force_iommu, iommu_verbose
 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;
 
 extern struct rangeset *mmio_ro_ranges;
 

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [PATCH] amd iommu: Fix HV crash with 32bit pv_ops kernel(V2)

[Jan Beulich]

>>> On 15.11.10 at 14:58, Wei Wang2 <wei.wang2@amd.com> wrote:
> Hi Jan
> Could this new version be a little more clear?
> Thanks,
> Wei

Yes (assuming the header you moved the decl-s to is included by
the producer).

Jan

> On Monday 15 November 2010 13:37:27 Jan Beulich wrote:
>> >>> On 15.11.10 at 11:18, Wei Wang2 <wei.wang2@amd.com> wrote:
>> >
>> >--- a/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h	Wed Nov 10 14:56:06
>> > 2010 +0000 +++ b/xen/include/asm-x86/hvm/svm/amd-iommu-proto.h	Fri Nov 12
>> > 17:10:31 2010 +0100 @@ -31,8 +31,8 @@
>> >
>> > #define DMA_32BIT_MASK  0x00000000ffffffffULL
>> >
>> >-extern int amd_iommu_debug;
>> >-extern int amd_iommu_perdev_intremap;
>> >+extern bool_t amd_iommu_debug;
>> >+extern bool_t amd_iommu_perdev_intremap;
>> >
>> > #define AMD_IOMMU_DEBUG(fmt, args...) \
>> >     do  \
>>
>> This surely can't be complete: If you had a type mismatch between
>> declaration and definition, the defining code is clearly missing an
>> #include of the #define-ing header.
>>
>> Jan