Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40a2e34a authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Add cond_resched() calls during HBA flash manipulation. 



We're observing soft lockups during HBA FLASH retrieval and
update.  Add cond_resched() each time around the tight-loops
during flash read()s/write()s.

Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent ed677086

drivers/scsi/qla2xxx/qla_sup.c

+5 −0
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@ qla24xx_read_flash_dword(scsi_qla_host_t *ha, uint32_t addr) 
			udelay(10);

		else

			rval = QLA_FUNCTION_TIMEOUT;

		cond_resched();

	}



	/* TODO: What happens if we time out? */
@@ -508,6 +509,7 @@ qla24xx_write_flash_dword(scsi_qla_host_t *ha, uint32_t addr, uint32_t data) 
			udelay(10);

		else

			rval = QLA_FUNCTION_TIMEOUT;

		cond_resched();

	}

	return rval;

}
@@ -1255,6 +1257,7 @@ qla2x00_poll_flash(scsi_qla_host_t *ha, uint32_t addr, uint8_t poll_data, 
		}

		udelay(10);

		barrier();

		cond_resched();

	}

	return status;

}
@@ -1403,6 +1406,7 @@ qla2x00_read_flash_data(scsi_qla_host_t *ha, uint8_t *tmp_buf, uint32_t saddr, 
		if (saddr % 100)

			udelay(10);

		*tmp_buf = data;

		cond_resched();

	}

}
@@ -1689,6 +1693,7 @@ update_flash: 
				rval = QLA_FUNCTION_FAILED;

				break;

			}

			cond_resched();

		}

	} while (0);

	qla2x00_flash_disable(ha);