ips soft lockup during reset/initialization
Subsystems (3)
Resetting the adapter causes the ServeRAID driver to exceed the max time allowed by the softlock watchdog. Resetting the hardware can easily require 30 or more seconds. To avoid the
"BUG: soft lockup detected on CPU#0!"
result, this patch replaces the mdelay() calls in the initialization/reset routines with msleep().
Signed-off-by Jack Hammer <[email protected]>
drivers/scsi/ips.c +14 -14
@@ -5009,7 +5009,7 @@break ;/* Delay for 1 Second */ -MDELAY (IPS_ONE_SEC ); +msleep (IPS_ONE_SEC ); }if (j >=45 )
@@ -5035,7 +5035,7 @@break ;/* Delay for 1 Second */ -MDELAY (IPS_ONE_SEC ); +msleep (IPS_ONE_SEC ); }if (j >=240 )
@@ -5053,7 +5053,7 @@break ;/* Delay for 1 Second */ -MDELAY (IPS_ONE_SEC ); +msleep (IPS_ONE_SEC ); }if (i >=240 )
@@ -5103,7 +5103,7 @@break ;/* Delay for 1 Second */ -MDELAY (IPS_ONE_SEC ); +msleep (IPS_ONE_SEC ); }if (j >=45 )
@@ -5129,7 +5129,7 @@break ;/* Delay for 1 Second */ -MDELAY (IPS_ONE_SEC ); +msleep (IPS_ONE_SEC ); }if (j >=240 )
@@ -5147,7 +5147,7 @@break ;/* Delay for 1 Second */ -MDELAY (IPS_ONE_SEC ); +msleep (IPS_ONE_SEC ); }if (i >=240 )
@@ -5199,7 +5199,7 @@break ;/* Delay for 1 Second */ -MDELAY (IPS_ONE_SEC ); +msleep (IPS_ONE_SEC ); }if (i >=45 ) {
@@ -5225,7 +5225,7 @@if (Post !=0x4F00 )break ;/* Delay for 1 Second */ -MDELAY (IPS_ONE_SEC ); +msleep (IPS_ONE_SEC ); }if (i >=120 ) {
@@ -5255,7 +5255,7 @@break ;/* Delay for 1 Second */ -MDELAY (IPS_ONE_SEC ); +msleep (IPS_ONE_SEC ); }if (i >=240 ) {
@@ -5315,12 +5315,12 @@outb (IPS_BIT_RST , ha->io_addr +IPS_REG_SCPR );/* Delay for 1 Second */ -MDELAY (IPS_ONE_SEC ); +msleep (IPS_ONE_SEC );outb (0 , ha->io_addr +IPS_REG_SCPR );/* Delay for 1 Second */ -MDELAY (IPS_ONE_SEC ); +msleep (IPS_ONE_SEC );if ((*ha->func.init) (ha))break ;
@@ -5360,12 +5360,12 @@writeb (IPS_BIT_RST , ha->mem_ptr +IPS_REG_SCPR );/* Delay for 1 Second */ -MDELAY (IPS_ONE_SEC ); +msleep (IPS_ONE_SEC );writeb (0 , ha->mem_ptr +IPS_REG_SCPR );/* Delay for 1 Second */ -MDELAY (IPS_ONE_SEC ); +msleep (IPS_ONE_SEC );if ((*ha->func.init) (ha))break ;
@@ -5406,7 +5406,7 @@writel (0x80000000 , ha->mem_ptr +IPS_REG_I960_IDR );/* Delay for 5 Seconds */ -MDELAY (5 *IPS_ONE_SEC ); +msleep (5 *IPS_ONE_SEC );/* Do a PCI config read to wait for adapter */ pci_read_config_byte (ha->pcidev,4 , &junk);