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

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

[SCSI] ibmvfc: Improve async event handling 



While doing various error injection testing, such as cable
pulls and target moves, some issues were observed in handling
these events. This patch improves the way these events are handled
by increasing the delay waiting for the fabric to settle and also
changes the behavior of Link Up to break the CRQ to ensure everything
gets cleaned up properly on the VIOS.

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

drivers/scsi/ibmvscsi/ibmvfc.c

+6 −4
Original line number Diff line number Diff line
@@ -2156,15 +2156,17 @@ static void ibmvfc_handle_async(struct ibmvfc_async_crq *crq, 
	case IBMVFC_AE_LINK_UP:

	case IBMVFC_AE_RESUME:

		vhost->events_to_log |= IBMVFC_AE_LINKUP;

		ibmvfc_init_host(vhost, 1);

		vhost->delay_init = 1;

		__ibmvfc_reset_host(vhost);

		break;

	case IBMVFC_AE_SCN_FABRIC:

	case IBMVFC_AE_SCN_DOMAIN:

		vhost->events_to_log |= IBMVFC_AE_RSCN;

		ibmvfc_init_host(vhost, 1);

		vhost->delay_init = 1;

		__ibmvfc_reset_host(vhost);

		break;

	case IBMVFC_AE_SCN_NPORT:

	case IBMVFC_AE_SCN_GROUP:

	case IBMVFC_AE_SCN_DOMAIN:

		vhost->events_to_log |= IBMVFC_AE_RSCN;

	case IBMVFC_AE_ELS_LOGO:

	case IBMVFC_AE_ELS_PRLO:
@@ -3619,7 +3621,7 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost) 
		if (vhost->delay_init) {

			vhost->delay_init = 0;

			spin_unlock_irqrestore(vhost->host->host_lock, flags);

			ssleep(5);

			ssleep(15);

			return;

		} else

			vhost->job_step(vhost);

drivers/scsi/ibmvscsi/ibmvfc.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#define IBMVFC_DRIVER_DATE		"(November 14, 2008)"



#define IBMVFC_DEFAULT_TIMEOUT	15

#define IBMVFC_INIT_TIMEOUT		30

#define IBMVFC_INIT_TIMEOUT		120

#define IBMVFC_MAX_REQUESTS_DEFAULT	100



#define IBMVFC_DEBUG			0