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

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

scsi: ibmvfc: add FC Class 3 Error Recovery support 



The ibmvfc driver currently doesn't support FC Class 3 Error Recovery.
However, it is simply a matter of informing the VIOS that the payload
expects to use sequence level error recovery via a bit flag in the
ibmvfc_cmd structure.

This patch adds a module parameter to enable error recovery support at
boot time. When enabled the RETRY service parameter bit is set during
PRLI, and ibmvfc_cmd->flags includes the IBMVFC_CLASS_3_ERR bit.

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

drivers/scsi/ibmvscsi/ibmvfc.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -52,6 +52,7 @@ static unsigned int max_requests = IBMVFC_MAX_REQUESTS_DEFAULT; 
static unsigned int disc_threads = IBMVFC_MAX_DISC_THREADS;

static unsigned int disc_threads = IBMVFC_MAX_DISC_THREADS;

static unsigned int ibmvfc_debug = IBMVFC_DEBUG;

static unsigned int ibmvfc_debug = IBMVFC_DEBUG;

static unsigned int log_level = IBMVFC_DEFAULT_LOG_LEVEL;

static unsigned int log_level = IBMVFC_DEFAULT_LOG_LEVEL;

static unsigned int cls3_error = IBMVFC_CLS3_ERROR;

static LIST_HEAD(ibmvfc_head);

static LIST_HEAD(ibmvfc_head);

static DEFINE_SPINLOCK(ibmvfc_driver_lock);

static DEFINE_SPINLOCK(ibmvfc_driver_lock);

static struct scsi_transport_template *ibmvfc_transport_template;

static struct scsi_transport_template *ibmvfc_transport_template;
@@ -86,6 +87,9 @@ MODULE_PARM_DESC(debug, "Enable driver debug information. " 
module_param_named(log_level, log_level, uint, 0);

module_param_named(log_level, log_level, uint, 0);

MODULE_PARM_DESC(log_level, "Set to 0 - 4 for increasing verbosity of device driver. "

MODULE_PARM_DESC(log_level, "Set to 0 - 4 for increasing verbosity of device driver. "

		 "[Default=" __stringify(IBMVFC_DEFAULT_LOG_LEVEL) "]");

		 "[Default=" __stringify(IBMVFC_DEFAULT_LOG_LEVEL) "]");

module_param_named(cls3_error, cls3_error, uint, 0);

MODULE_PARM_DESC(log_level, "Enable FC Class 3 Error Recovery. "

		 "[Default=" __stringify(IBMVFC_CLS3_ERROR) "]");





static const struct {

static const struct {

	u16 status;

	u16 status;
@@ -1335,6 +1339,9 @@ static int ibmvfc_map_sg_data(struct scsi_cmnd *scmd, 
	struct srp_direct_buf *data = &vfc_cmd->ioba;

	struct srp_direct_buf *data = &vfc_cmd->ioba;

	struct ibmvfc_host *vhost = dev_get_drvdata(dev);

	struct ibmvfc_host *vhost = dev_get_drvdata(dev);





	if (cls3_error)

		vfc_cmd->flags |= cpu_to_be16(IBMVFC_CLASS_3_ERR);



	sg_mapped = scsi_dma_map(scmd);

	sg_mapped = scsi_dma_map(scmd);

	if (!sg_mapped) {

	if (!sg_mapped) {

		vfc_cmd->flags |= cpu_to_be16(IBMVFC_NO_MEM_DESC);

		vfc_cmd->flags |= cpu_to_be16(IBMVFC_NO_MEM_DESC);
@@ -3383,6 +3390,9 @@ static void ibmvfc_tgt_send_prli(struct ibmvfc_target *tgt) 
	prli->parms.service_parms = cpu_to_be32(IBMVFC_PRLI_INITIATOR_FUNC);

	prli->parms.service_parms = cpu_to_be32(IBMVFC_PRLI_INITIATOR_FUNC);

	prli->parms.service_parms |= cpu_to_be32(IBMVFC_PRLI_READ_FCP_XFER_RDY_DISABLED);

	prli->parms.service_parms |= cpu_to_be32(IBMVFC_PRLI_READ_FCP_XFER_RDY_DISABLED);





	if (cls3_error)

		prli->parms.service_parms |= cpu_to_be32(IBMVFC_PRLI_RETRY);



	ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_INIT_WAIT);

	ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_INIT_WAIT);

	if (ibmvfc_send_event(evt, vhost, default_timeout)) {

	if (ibmvfc_send_event(evt, vhost, default_timeout)) {

		vhost->discovery_threads--;

		vhost->discovery_threads--;

drivers/scsi/ibmvscsi/ibmvfc.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -54,6 +54,7 @@ 
#define IBMVFC_DEV_LOSS_TMO		(5 * 60)

#define IBMVFC_DEV_LOSS_TMO		(5 * 60)

#define IBMVFC_DEFAULT_LOG_LEVEL	2

#define IBMVFC_DEFAULT_LOG_LEVEL	2

#define IBMVFC_MAX_CDB_LEN		16

#define IBMVFC_MAX_CDB_LEN		16

#define IBMVFC_CLS3_ERROR		0





/*

/*

 * Ensure we have resources for ERP and initialization:

 * Ensure we have resources for ERP and initialization: