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

Commit 970ea294 authored by Brian King's avatar Brian King Committed by James Bottomley
Browse files

[SCSI] ipr: Prevent overlapped adapter resets 



This patch fixes some scenarios where an ipr adapter
could get reset overlapped, which could cause very
long timeouts to occur, or PCI bus errors.

Signed-off-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent d7a54e30

drivers/scsi/ipr.c

+23 −1
Original line number Diff line number Diff line
@@ -2635,8 +2635,13 @@ static ssize_t ipr_store_diagnostics(struct class_device *class_dev, 
	if (!capable(CAP_SYS_ADMIN))

		return -EACCES;



	spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);

	while(ioa_cfg->in_reset_reload) {

		spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);

		wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);

		spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);

	}



	ioa_cfg->errors_logged = 0;

	ipr_initiate_ioa_reset(ioa_cfg, IPR_SHUTDOWN_NORMAL);
@@ -2958,6 +2963,11 @@ static int ipr_update_ioa_ucode(struct ipr_ioa_cfg *ioa_cfg, 
	unsigned long lock_flags;



	spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);

	while(ioa_cfg->in_reset_reload) {

		spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);

		wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);

		spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);

	}



	if (ioa_cfg->ucode_sglist) {

		spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);
@@ -7428,6 +7438,12 @@ static void __ipr_remove(struct pci_dev *pdev) 
	ENTER;



	spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);

	while(ioa_cfg->in_reset_reload) {

		spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);

		wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);

		spin_lock_irqsave(ioa_cfg->host->host_lock, host_lock_flags);

	}



	ipr_initiate_ioa_bringdown(ioa_cfg, IPR_SHUTDOWN_NORMAL);



	spin_unlock_irqrestore(ioa_cfg->host->host_lock, host_lock_flags);
@@ -7551,6 +7567,12 @@ static void ipr_shutdown(struct pci_dev *pdev) 
	unsigned long lock_flags = 0;



	spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);

	while(ioa_cfg->in_reset_reload) {

		spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);

		wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);

		spin_lock_irqsave(ioa_cfg->host->host_lock, lock_flags);

	}



	ipr_initiate_ioa_bringdown(ioa_cfg, IPR_SHUTDOWN_NORMAL);

	spin_unlock_irqrestore(ioa_cfg->host->host_lock, lock_flags);

	wait_event(ioa_cfg->reset_wait_q, !ioa_cfg->in_reset_reload);