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

Commit 969a6199 authored Jan 27, 2016 by Sawan Chandak Committed by Martin K. Petersen Feb 23, 2016

qla2xxx: Add support for buffer to buffer credit value for ISP27XX.



Signed-off-by: Sawan Chandak <sawan.chandak@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 4243c115

drivers/scsi/qla2xxx/qla_bsg.c

+55 −0

Original line number	Diff line number	Diff line
		@@ -2180,6 +2180,58 @@ qla27xx_set_flash_upd_cap(struct fc_bsg_job *bsg_job)
		return 0;
		}

		static int
		qla27xx_get_bbcr_data(struct fc_bsg_job *bsg_job)
		{
		struct Scsi_Host *host = bsg_job->shost;
		scsi_qla_host_t *vha = shost_priv(host);
		struct qla_hw_data *ha = vha->hw;
		struct qla_bbcr_data bbcr;
		uint16_t loop_id, topo, sw_cap;
		uint8_t domain, area, al_pa, state;
		int rval;

		if (!(IS_QLA27XX(ha)))
		return -EPERM;

		memset(&bbcr, 0, sizeof(bbcr));

		if (vha->flags.bbcr_enable)
		bbcr.status = QLA_BBCR_STATUS_ENABLED;
		else
		bbcr.status = QLA_BBCR_STATUS_DISABLED;

		if (bbcr.status == QLA_BBCR_STATUS_ENABLED) {
		rval = qla2x00_get_adapter_id(vha, &loop_id, &al_pa,
		&area, &domain, &topo, &sw_cap);
		if (rval != QLA_SUCCESS)
		return -EIO;

		state = (vha->bbcr >> 12) & 0x1;

		if (state) {
		bbcr.state = QLA_BBCR_STATE_OFFLINE;
		bbcr.offline_reason_code = QLA_BBCR_REASON_LOGIN_REJECT;
		} else {
		bbcr.state = QLA_BBCR_STATE_ONLINE;
		bbcr.negotiated_bbscn = (vha->bbcr >> 8) & 0xf;
		}

		bbcr.configured_bbscn = vha->bbcr & 0xf;
		}

		sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
		bsg_job->reply_payload.sg_cnt, &bbcr, sizeof(bbcr));
		bsg_job->reply->reply_payload_rcv_len = sizeof(bbcr);

		bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = EXT_STATUS_OK;

		bsg_job->reply_len = sizeof(struct fc_bsg_reply);
		bsg_job->reply->result = DID_OK << 16;
		bsg_job->job_done(bsg_job);
		return 0;
		}

		static int
		qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
		{
		@@ -2241,6 +2293,9 @@ qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
		case QL_VND_SET_FLASH_UPDATE_CAPS:
		return qla27xx_set_flash_upd_cap(bsg_job);

		case QL_VND_GET_BBCR_DATA:
		return qla27xx_get_bbcr_data(bsg_job);

		default:
		return -ENOSYS;
		}

drivers/scsi/qla2xxx/qla_bsg.h

+24 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@
		#define QL_VND_SERDES_OP_EX 0x14
		#define QL_VND_GET_FLASH_UPDATE_CAPS 0x15
		#define QL_VND_SET_FLASH_UPDATE_CAPS 0x16
		#define QL_VND_GET_BBCR_DATA 0x17

		/* BSG Vendor specific subcode returns */
		#define EXT_STATUS_OK 0
		@@ -239,4 +240,27 @@ struct qla_flash_update_caps {
		uint32_t outage_duration;
		uint8_t reserved[20];
		} __packed;

		/* BB_CR Status */
		#define QLA_BBCR_STATUS_DISABLED 0
		#define QLA_BBCR_STATUS_ENABLED 1

		/* BB_CR State */
		#define QLA_BBCR_STATE_OFFLINE 0
		#define QLA_BBCR_STATE_ONLINE 1

		/* BB_CR Offline Reason Code */
		#define QLA_BBCR_REASON_PORT_SPEED 1
		#define QLA_BBCR_REASON_PEER_PORT 2
		#define QLA_BBCR_REASON_SWITCH 3
		#define QLA_BBCR_REASON_LOGIN_REJECT 4

		struct qla_bbcr_data {
		uint8_t status; /* 1 - enabled, 0 - Disabled */
		uint8_t state; /* 1 - online, 0 - offline */
		uint8_t configured_bbscn; /* 0-15 */
		uint8_t negotiated_bbscn; /* 0-15 */
		uint8_t offline_reason_code;
		uint8_t reserved[11];
		} __packed;
		#endif

drivers/scsi/qla2xxx/qla_def.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -3583,6 +3583,7 @@ typedef struct scsi_qla_host {
		uint32_t delete_progress:1;

		uint32_t fw_tgt_reported:1;
		uint32_t bbcr_enable:1;
		} flags;

		atomic_t loop_state;
		@@ -3715,6 +3716,7 @@ typedef struct scsi_qla_host {
		atomic_t vref_count;
		struct qla8044_reset_template reset_tmplt;
		struct qla_tgt_counters tgt_counters;
		uint16_t bbcr;
		} scsi_qla_host_t;

		struct qla27xx_image_status {

drivers/scsi/qla2xxx/qla_fw.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -1288,7 +1288,9 @@ struct vp_rpt_id_entry_24xx {

		uint8_t vp_idx_map[16];

		uint8_t reserved_4[32];
		uint8_t reserved_4[28];
		uint16_t bbcr;
		uint8_t reserved_5[6];
		};

		#define VF_EVFP_IOCB_TYPE 0x26 /* Exchange Virtual Fabric Parameters entry. */

drivers/scsi/qla2xxx/qla_mbx.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1349,6 +1349,8 @@ qla2x00_get_adapter_id(scsi_qla_host_t vha, uint16_t id, uint8_t *al_pa,
		mcp->in_mb \|= MBX_13\|MBX_12\|MBX_11\|MBX_10;
		if (IS_FWI2_CAPABLE(vha->hw))
		mcp->in_mb \|= MBX_19\|MBX_18\|MBX_17\|MBX_16;
		if (IS_QLA27XX(vha->hw))
		mcp->in_mb \|= MBX_15;
		mcp->tov = MBX_TOV_SECONDS;
		mcp->flags = 0;
		rval = qla2x00_mailbox_command(vha, mcp);
		@@ -1400,6 +1402,9 @@ qla2x00_get_adapter_id(scsi_qla_host_t vha, uint16_t id, uint8_t *al_pa,
		wwn_to_u64(vha->port_name));
		}
		}

		if (IS_QLA27XX(vha->hw))
		vha->bbcr = mcp->mb[15];
		}

		return rval;
		@@ -3612,6 +3617,9 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,
		rptid_entry->port_id[2], rptid_entry->port_id[1],
		rptid_entry->port_id[0]);

		/* buffer to buffer credit flag */
		vha->flags.bbcr_enable = (rptid_entry->bbcr & 0xf) != 0;

		/* FA-WWN is only for physical port */
		if (!vp_idx) {
		void *wwpn = ha->init_cb->port_name;