[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel-xen-2.6/devel linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch, NONE, 1.1 kernel-xen.spec, 1.25, 1.26



Author: ehabkost

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv457

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch 
Log Message:
Add patch from bug #209429: linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch



linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch:

--- NEW FILE linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch ---
# HG changeset patch
# User chrisw sous-sol org
# Date Tue Oct 03 13:44:38 2006 -0400
# Node ID e5a7f30e1db3f1084f6789d21ea2a6fdaafdb96d
# parent: 6cd0fae5d84c4a4b15546ceaade74b7d7f044404
Make sure no_iommu_init is called when needed on x86_64.  Thanks
to Mark McLoughlin <markmc redhat com> for spotting the issue and
proposing a fix.

Index: linux-2.6.20.i386/arch/i386/kernel/pci-dma-xen.c
===================================================================
--- linux-2.6.20.i386.orig/arch/i386/kernel/pci-dma-xen.c
+++ linux-2.6.20.i386/arch/i386/kernel/pci-dma-xen.c
@@ -21,6 +21,9 @@
 #include <asm/bug.h>
 
 #ifdef __x86_64__
+#include <asm/proto.h>
+#include <asm/calgary.h>
+
 int iommu_merge __read_mostly = 0;
 EXPORT_SYMBOL(iommu_merge);
 
@@ -69,6 +72,22 @@ void __init pci_iommu_alloc(void)
 #endif
 }
 
+static int __init pci_iommu_init(void)
+{
+#ifdef CONFIG_CALGARY_IOMMU
+	calgary_iommu_init();
+#endif
+
+#ifdef CONFIG_IOMMU
+	gart_iommu_init();
+#endif
+
+	no_iommu_init();
+	return 0;
+}
+
+/* Must execute after PCI subsystem */
+fs_initcall(pci_iommu_init);
 #endif
 
 struct dma_coherent_mem {


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- kernel-xen.spec	10 May 2007 21:01:10 -0000	1.25
+++ kernel-xen.spec	22 May 2007 13:00:13 -0000	1.26
@@ -377,6 +377,7 @@
 # smp/vgetcpu fixes (#238015)
 Patch956: linux-2.6-fix-x86_64-smp.patch
 Patch957: linux-2.6-fix-x86_64-vgetcpu.patch
+Patch958: linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch
 
 #
 # Patches 1000 to 5000 are reserved for bugfixes to drivers and filesystems
@@ -897,6 +898,7 @@
 # smp/vgetcpu fixes (#238015)
 %patch956 -p1
 %patch957 -p1
+%patch958 -p1
 %endif
 
 #
@@ -2011,6 +2013,9 @@
 #  - tux.
 
 %changelog
+* Tue May 22 2007 Eduardo Habkost <ehabkost redhat com>
+- Add patch from bug #209429: linux-2.6-xen-iscsi-x86_64-no_iommu_init.patch
+
 * Thu May 10 2007  <quintela redhat com>
 - sync irq/manage.c with upstream (Markus).
 - correctly init smpboot.c for xen (Chris Wright).


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]