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

Commit 72978245 authored by Eric Moore's avatar Eric Moore Committed by James Bottomley
Browse files

[SCSI] fusion: fix domain validation loops 



After host reset, the device are programmed to default asyn narrow nego.
We need to reprogram the parameter back to previous values.  If the host
reset is called as a result of spi_dv_device() commands timing out, its
possible to get into an infinite loop of dv to host reset.  This will
prevent that case, as we merely program old values.  If host reset is
called outside context of domain validation, then we can  call
spi_dv_device.

Signed-off-by: default avatarEric Moore <Eric.Moore@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 4e08df3f

drivers/message/fusion/mptbase.h

+1 −0
Original line number Diff line number Diff line
@@ -994,6 +994,7 @@ typedef struct _MPT_SCSI_HOST { 
	int			  scandv_wait_done;

	long			  last_queue_full;

	u16			  tm_iocstatus;

	u16			  spi_pending;

	struct list_head	  target_reset_list;

} MPT_SCSI_HOST;

drivers/message/fusion/mptspi.c

+21 −2
Original line number Diff line number Diff line
@@ -676,7 +676,9 @@ static void mptspi_dv_device(struct _MPT_SCSI_HOST *hd, 
		return;

	}



	hd->spi_pending |= (1 << sdev->id);

	spi_dv_device(sdev);

	hd->spi_pending &= ~(1 << sdev->id);



	if (sdev->channel == 1 &&

	    mptscsih_quiesce_raid(hd, 0, vtarget->channel, vtarget->id) < 0)
@@ -1202,12 +1204,28 @@ mptspi_dv_renegotiate_work(struct work_struct *work) 
		container_of(work, struct work_queue_wrapper, work);

	struct _MPT_SCSI_HOST *hd = wqw->hd;

	struct scsi_device *sdev;

	struct scsi_target *starget;

	struct _CONFIG_PAGE_SCSI_DEVICE_1 pg1;

	u32 nego;



	kfree(wqw);



	if (hd->spi_pending) {

		shost_for_each_device(sdev, hd->ioc->sh) {

			if  (hd->spi_pending & (1 << sdev->id))

				continue;

			starget = scsi_target(sdev);

			nego = mptspi_getRP(starget);

			pg1.RequestedParameters = cpu_to_le32(nego);

			pg1.Reserved = 0;

			pg1.Configuration = 0;

			mptspi_write_spi_device_pg1(starget, &pg1);

		}

	} else {

		shost_for_each_device(sdev, hd->ioc->sh)

			mptspi_dv_device(hd, sdev);

	}

}



static void

mptspi_dv_renegotiate(struct _MPT_SCSI_HOST *hd)
@@ -1452,6 +1470,7 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	init_waitqueue_head(&hd->scandv_waitq);

	hd->scandv_wait_done = 0;

	hd->last_queue_full = 0;

	hd->spi_pending = 0;



	/* Some versions of the firmware don't support page 0; without

	 * that we can't get the parameters */