r4232 - in dists/sid/linux-2.6/debian: . patches-debian patches-debian/series

[Jurij Smakov]

Author: jurij-guest
Date: 2005-09-17 05:47:30 +0000 (Sat, 17 Sep 2005)
New Revision: 4232

Added:
   dists/sid/linux-2.6/debian/patches-debian/drivers-scsi-dpt_i2o-fixes.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches-debian/series/2.6.12-7
Log:
Backport of 2.6.13 fixes to dpt_i2o SCSI driver to take care
of #328534.


Modified: dists/sid/linux-2.6/debian/changelog
===================================================================
--- dists/sid/linux-2.6/debian/changelog	2005-09-17 01:46:26 UTC (rev 4231)
+++ dists/sid/linux-2.6/debian/changelog	2005-09-17 05:47:30 UTC (rev 4232)
@@ -9,6 +9,11 @@
       powerpc-mv643xx-hotplug-support.patch
     thanks go to Nicolas Det for providing the patch.
 
+  [ Jurij Smakov ]
+  * Backport of dpt_i2o SCSI driver fixes from 2.6.13 to take care
+    of panics with some Adaptec cards: driver-scsi-dpt_i2o-fixes.patch.
+    See patch header for details and references. (closes: #328534)
+  
  -- Sven Luther <luther at debian.org>  Thu, 15 Sep 2005 14:16:19 +0200
 
 linux-2.6 (2.6.12-6) unstable; urgency=high

Added: dists/sid/linux-2.6/debian/patches-debian/drivers-scsi-dpt_i2o-fixes.patch
===================================================================
--- dists/sid/linux-2.6/debian/patches-debian/drivers-scsi-dpt_i2o-fixes.patch	2005-09-17 01:46:26 UTC (rev 4231)
+++ dists/sid/linux-2.6/debian/patches-debian/drivers-scsi-dpt_i2o-fixes.patch	2005-09-17 05:47:30 UTC (rev 4232)
@@ -0,0 +1,57 @@
+# Based on the following commits to Linus' git tree:
+#   [SCSI] Bug 4940 Repeatable Kernel Panic on Adaptec 2015S I20 device on bootup
+#   author	James Bottomley <jejb at mulgrave.(none)>
+#   		Mon, 8 Aug 2005 16:51:38 +0000 (11:51 -0500)
+#   commit	9c472dd9197429a37691e91c938660a062bf20b0
+#
+#   [SCSI] dpt_i2o pci_request_regions fix
+#   author	Salyzyn, Mark <mark_salyzyn at adaptec.com>
+#		Tue, 9 Aug 2005 16:57:58 +0000 (12:57 -0400)
+#   commit	5bb8345db8f2aef367e0fddf99a42b7a6029b31f
+#
+# References:
+#   http://bugzilla.kernel.org/show_bug.cgi?id=4940
+#
+# -- Jurij Smakov <jurij at wooyd.org>  Fri, 16 Sep 2005 22:37:13 -0700
+diff -aur a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
+--- a/drivers/scsi/dpt_i2o.c	2005-06-17 12:48:29.000000000 -0700
++++ b/drivers/scsi/dpt_i2o.c	2005-09-16 22:17:03.000000000 -0700
+@@ -905,9 +905,13 @@
+ 		raptorFlag = TRUE;
+ 	}
+ 
+-
++	if (pci_request_regions(pDev, "dpt_i2o")) {
++		PERROR("dpti: adpt_config_hba: pci request region failed\n");
++		return -EINVAL;
++	}
+ 	base_addr_virt = ioremap(base_addr0_phys,hba_map0_area_size);
+ 	if (!base_addr_virt) {
++		pci_release_regions(pDev);
+ 		PERROR("dpti: adpt_config_hba: io remap failed\n");
+ 		return -EINVAL;
+ 	}
+@@ -917,6 +921,7 @@
+ 		if (!msg_addr_virt) {
+ 			PERROR("dpti: adpt_config_hba: io remap failed on BAR1\n");
+ 			iounmap(base_addr_virt);
++			pci_release_regions(pDev);
+ 			return -EINVAL;
+ 		}
+ 	} else {
+@@ -930,6 +935,7 @@
+ 			iounmap(msg_addr_virt);
+ 		}
+ 		iounmap(base_addr_virt);
++		pci_release_regions(pDev);
+ 		return -ENOMEM;
+ 	}
+ 	memset(pHba, 0, sizeof(adpt_hba));
+@@ -1036,6 +1042,7 @@
+ 	up(&adpt_configuration_lock);
+ 
+ 	iounmap(pHba->base_addr_virt);
++	pci_release_regions(pHba->pDev);
+ 	if(pHba->msg_addr_virt != pHba->base_addr_virt){
+ 		iounmap(pHba->msg_addr_virt);
+ 	}

Modified: dists/sid/linux-2.6/debian/patches-debian/series/2.6.12-7
===================================================================
--- dists/sid/linux-2.6/debian/patches-debian/series/2.6.12-7	2005-09-17 01:46:26 UTC (rev 4231)
+++ dists/sid/linux-2.6/debian/patches-debian/series/2.6.12-7	2005-09-17 05:47:30 UTC (rev 4232)
@@ -1 +1,2 @@
 + powerpc-mv643xx-hotplug-support.patch
++ drivers-scsi-dpt_i2o-fixes.patch