Commit d6e2635b authored by Tyrel Datwyler's avatar Tyrel Datwyler Committed by Martin K. Petersen
Browse files

scsi: ibmvfc: Clean up transport events 



No change to functionality. Simply make transport event messages a little
clearer, and rework CRQ format enums such that we have separate enums for
INIT messages and XPORT events.

[mkp: typo]

Signed-off-by: default avatarTyrel Datwyler <tyreld@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3e6f7de4

drivers/scsi/ibmvscsi/ibmvfc.c

+5 −3
Original line number Diff line number Diff line
@@ -2756,16 +2756,18 @@ static void ibmvfc_handle_crq(struct ibmvfc_crq *crq, struct ibmvfc_host *vhost) 
		ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_NONE);

		if (crq->format == IBMVFC_PARTITION_MIGRATED) {

			/* We need to re-setup the interpartition connection */

			dev_info(vhost->dev, "Re-enabling adapter\n");

			dev_info(vhost->dev, "Partition migrated, Re-enabling adapter\n");

			vhost->client_migrated = 1;

			ibmvfc_purge_requests(vhost, DID_REQUEUE);

			ibmvfc_link_down(vhost, IBMVFC_LINK_DOWN);

			ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_REENABLE);

		} else {

			dev_err(vhost->dev, "Virtual adapter failed (rc=%d)\n", crq->format);

		} else if (crq->format == IBMVFC_PARTNER_FAILED || crq->format == IBMVFC_PARTNER_DEREGISTER) {

			dev_err(vhost->dev, "Host partner adapter deregistered or failed (rc=%d)\n", crq->format);

			ibmvfc_purge_requests(vhost, DID_ERROR);

			ibmvfc_link_down(vhost, IBMVFC_LINK_DOWN);

			ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_RESET);

		} else {

			dev_err(vhost->dev, "Received unknown transport event from partner (rc=%d)\n", crq->format);

		}

		return;

	case IBMVFC_CRQ_CMD_RSP:

drivers/scsi/ibmvscsi/ibmvfc.h

+6 −1
Original line number Diff line number Diff line
@@ -78,9 +78,14 @@ enum ibmvfc_crq_valid { 
	IBMVFC_CRQ_XPORT_EVENT		= 0xFF,

};



enum ibmvfc_crq_format {

enum ibmvfc_crq_init_msg {

	IBMVFC_CRQ_INIT			= 0x01,

	IBMVFC_CRQ_INIT_COMPLETE	= 0x02,

};



enum ibmvfc_crq_xport_evts {

	IBMVFC_PARTNER_FAILED		= 0x01,

	IBMVFC_PARTNER_DEREGISTER	= 0x02,

	IBMVFC_PARTITION_MIGRATED	= 0x06,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE