rpms/kernel/FC-5 linux-2.6-ips-softlockup.patch, NONE, 1.1 kernel-2.6.spec, 1.2211, 1.2212

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3919

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-ips-softlockup.patch 
Log Message:
Fix softlockup with ips driver. (#196437)

linux-2.6-ips-softlockup.patch:
 ips.c |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

--- NEW FILE linux-2.6-ips-softlockup.patch ---

From: Andrew Morton <akpm at osdl.org>

Revert 15084a4a63bc300c18b28a8a9afac870c552abce - it caused a
scheduling-inside-spinlock bug.

Cc: Nishanth Aravamudan <nacc at us.ibm.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Jack Hammer <jack_hammer at adaptec.com>
Signed-off-by: Andrew Morton <akpm at osdl.org>
---

 drivers/scsi/ips.c |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff -puN drivers/scsi/ips.c~revert-scsi-ips-soft-lockup-during-reset-initialization drivers/scsi/ips.c
--- a/drivers/scsi/ips.c~revert-scsi-ips-soft-lockup-during-reset-initialization
+++ a/drivers/scsi/ips.c
@@ -5001,7 +5001,7 @@ ips_init_copperhead(ips_ha_t * ha)
 				break;
 
 			/* Delay for 1 Second */
-			msleep(IPS_ONE_SEC);
+			MDELAY(IPS_ONE_SEC);
 		}
 
 		if (j >= 45)
@@ -5027,7 +5027,7 @@ ips_init_copperhead(ips_ha_t * ha)
 				break;
 
 			/* Delay for 1 Second */
-			msleep(IPS_ONE_SEC);
+			MDELAY(IPS_ONE_SEC);
 		}
 
 		if (j >= 240)
@@ -5045,7 +5045,7 @@ ips_init_copperhead(ips_ha_t * ha)
 			break;
 
 		/* Delay for 1 Second */
-		msleep(IPS_ONE_SEC);
+		MDELAY(IPS_ONE_SEC);
 	}
 
 	if (i >= 240)
@@ -5095,7 +5095,7 @@ ips_init_copperhead_memio(ips_ha_t * ha)
 				break;
 
 			/* Delay for 1 Second */
-			msleep(IPS_ONE_SEC);
+			MDELAY(IPS_ONE_SEC);
 		}
 
 		if (j >= 45)
@@ -5121,7 +5121,7 @@ ips_init_copperhead_memio(ips_ha_t * ha)
 				break;
 
 			/* Delay for 1 Second */
-			msleep(IPS_ONE_SEC);
+			MDELAY(IPS_ONE_SEC);
 		}
 
 		if (j >= 240)
@@ -5139,7 +5139,7 @@ ips_init_copperhead_memio(ips_ha_t * ha)
 			break;
 
 		/* Delay for 1 Second */
-		msleep(IPS_ONE_SEC);
+		MDELAY(IPS_ONE_SEC);
 	}
 
 	if (i >= 240)
@@ -5191,7 +5191,7 @@ ips_init_morpheus(ips_ha_t * ha)
 			break;
 
 		/* Delay for 1 Second */
-		msleep(IPS_ONE_SEC);
+		MDELAY(IPS_ONE_SEC);
 	}
 
 	if (i >= 45) {
@@ -5217,7 +5217,7 @@ ips_init_morpheus(ips_ha_t * ha)
 			if (Post != 0x4F00)
 				break;
 			/* Delay for 1 Second */
-			msleep(IPS_ONE_SEC);
+			MDELAY(IPS_ONE_SEC);
 		}
 
 		if (i >= 120) {
@@ -5247,7 +5247,7 @@ ips_init_morpheus(ips_ha_t * ha)
 			break;
 
 		/* Delay for 1 Second */
-		msleep(IPS_ONE_SEC);
+		MDELAY(IPS_ONE_SEC);
 	}
 
 	if (i >= 240) {
@@ -5307,12 +5307,12 @@ ips_reset_copperhead(ips_ha_t * ha)
 		outb(IPS_BIT_RST, ha->io_addr + IPS_REG_SCPR);
 
 		/* Delay for 1 Second */
-		msleep(IPS_ONE_SEC);
+		MDELAY(IPS_ONE_SEC);
 
 		outb(0, ha->io_addr + IPS_REG_SCPR);
 
 		/* Delay for 1 Second */
-		msleep(IPS_ONE_SEC);
+		MDELAY(IPS_ONE_SEC);
 
 		if ((*ha->func.init) (ha))
 			break;
@@ -5352,12 +5352,12 @@ ips_reset_copperhead_memio(ips_ha_t * ha
 		writeb(IPS_BIT_RST, ha->mem_ptr + IPS_REG_SCPR);
 
 		/* Delay for 1 Second */
-		msleep(IPS_ONE_SEC);
+		MDELAY(IPS_ONE_SEC);
 
 		writeb(0, ha->mem_ptr + IPS_REG_SCPR);
 
 		/* Delay for 1 Second */
-		msleep(IPS_ONE_SEC);
+		MDELAY(IPS_ONE_SEC);
 
 		if ((*ha->func.init) (ha))
 			break;
@@ -5398,7 +5398,7 @@ ips_reset_morpheus(ips_ha_t * ha)
 		writel(0x80000000, ha->mem_ptr + IPS_REG_I960_IDR);
 
 		/* Delay for 5 Seconds */
-		msleep(5 * IPS_ONE_SEC);
+		MDELAY(5 * IPS_ONE_SEC);
 
 		/* Do a PCI config read to wait for adapter */
 		pci_read_config_byte(ha->pcidev, 4, &junk);
_


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2211
retrieving revision 1.2212
diff -u -r1.2211 -r1.2212
--- kernel-2.6.spec	20 Oct 2006 22:32:15 -0000	1.2211
+++ kernel-2.6.spec	20 Oct 2006 22:42:27 -0000	1.2212
@@ -336,6 +336,7 @@
 
 # SCSI bits.
 Patch1100: linux-2.6-scsi-aic7xxx-SBLKCTL.patch
+Patch1101: linux-2.6-ips-softlockup.patch
 Patch1102: linux-2.6-scsi-advansys-pcitable.patch
 Patch1106: linux-2.6-scsi-cpqarray-set-master.patch
 
@@ -868,6 +869,8 @@
 #
 # Fix up aic7xxx SBLKCTL register handling
 %patch1100 -p1
+# Fix softlockup with ips driver.
+%patch1101 -p1
 # Add a pci table to advansys driver.
 %patch1102 -p1
 # fix cpqarray pci enable
@@ -1623,6 +1626,7 @@
 %changelog
 * Fri Oct 20 2006 Dave Jones <davej at redhat.com> 
 - Fix autofs creating bad dentries in NFS mount. (#211206, #211207)
+- Fix softlockup with ips driver. (#196437)
 
 * Thu Oct 19 2006 Dave Jones <davej at redhat.com> 
 - Export copy_4K_page for ppc64 (#211410)