Commit a763d5a5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "Four fixes, all in drivers.

  Three are small and obvious, the qedi one is a bit larger but also
  pretty obvious"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: qla2xxx: Format log strings only if needed
  scsi: scsi_debug: Fix buffer size of REPORT ZONES command
  scsi: qedi: Fix cmd_cleanup_cmpl counter mismatch issue
  scsi: pm80xx: Do not call scsi_remove_host() in pm8001_alloc()
parents e034d9cb 69002c8c

drivers/scsi/pm8001/pm8001_init.c

+2 −4
Original line number Diff line number Diff line
@@ -282,12 +282,12 @@ static int pm8001_alloc(struct pm8001_hba_info *pm8001_ha, 
	if (rc) {

		pm8001_dbg(pm8001_ha, FAIL,

			   "pm8001_setup_irq failed [ret: %d]\n", rc);

		goto err_out_shost;

		goto err_out;

	}

	/* Request Interrupt */

	rc = pm8001_request_irq(pm8001_ha);

	if (rc)

		goto err_out_shost;

		goto err_out;



	count = pm8001_ha->max_q_num;

	/* Queues are chosen based on the number of cores/msix availability */
@@ -423,8 +423,6 @@ static int pm8001_alloc(struct pm8001_hba_info *pm8001_ha, 
	pm8001_tag_init(pm8001_ha);

	return 0;



err_out_shost:

	scsi_remove_host(pm8001_ha->shost);

err_out_nodev:

	for (i = 0; i < pm8001_ha->max_memcnt; i++) {

		if (pm8001_ha->memoryMap.region[i].virt_ptr != NULL) {

drivers/scsi/qedi/qedi_fw.c

+15 −22
Original line number Diff line number Diff line
@@ -732,7 +732,6 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi, 
{

	struct qedi_work_map *work, *work_tmp;

	u32 proto_itt = cqe->itid;

	itt_t protoitt = 0;

	int found = 0;

	struct qedi_cmd *qedi_cmd = NULL;

	u32 iscsi_cid;
@@ -812,16 +811,12 @@ static void qedi_process_cmd_cleanup_resp(struct qedi_ctx *qedi, 
	return;



check_cleanup_reqs:

	if (qedi_conn->cmd_cleanup_req > 0) {

		QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_TID,

	if (atomic_inc_return(&qedi_conn->cmd_cleanup_cmpl) ==

	    qedi_conn->cmd_cleanup_req) {

		QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_SCSI_TM,

			  "Freeing tid=0x%x for cid=0x%x\n",

			  cqe->itid, qedi_conn->iscsi_conn_id);

		qedi_conn->cmd_cleanup_cmpl++;

		wake_up(&qedi_conn->wait_queue);

	} else {

		QEDI_ERR(&qedi->dbg_ctx,

			 "Delayed or untracked cleanup response, itt=0x%x, tid=0x%x, cid=0x%x\n",

			 protoitt, cqe->itid, qedi_conn->iscsi_conn_id);

	}

}
@@ -1163,7 +1158,7 @@ int qedi_cleanup_all_io(struct qedi_ctx *qedi, struct qedi_conn *qedi_conn, 
	}



	qedi_conn->cmd_cleanup_req = 0;

	qedi_conn->cmd_cleanup_cmpl = 0;

	atomic_set(&qedi_conn->cmd_cleanup_cmpl, 0);



	QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_SCSI_TM,

		  "active_cmd_count=%d, cid=0x%x, in_recovery=%d, lun_reset=%d\n",
@@ -1215,16 +1210,15 @@ int qedi_cleanup_all_io(struct qedi_ctx *qedi, struct qedi_conn *qedi_conn, 
		  qedi_conn->iscsi_conn_id);



	rval  = wait_event_interruptible_timeout(qedi_conn->wait_queue,

						 ((qedi_conn->cmd_cleanup_req ==

						 qedi_conn->cmd_cleanup_cmpl) ||

						 test_bit(QEDI_IN_RECOVERY,

							  &qedi->flags)),

				(qedi_conn->cmd_cleanup_req ==

				 atomic_read(&qedi_conn->cmd_cleanup_cmpl)) ||

				test_bit(QEDI_IN_RECOVERY, &qedi->flags),

				5 * HZ);

	if (rval) {

		QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_SCSI_TM,

			  "i/o cmd_cleanup_req=%d, equal to cmd_cleanup_cmpl=%d, cid=0x%x\n",

			  qedi_conn->cmd_cleanup_req,

			  qedi_conn->cmd_cleanup_cmpl,

			  atomic_read(&qedi_conn->cmd_cleanup_cmpl),

			  qedi_conn->iscsi_conn_id);



		return 0;
@@ -1233,7 +1227,7 @@ int qedi_cleanup_all_io(struct qedi_ctx *qedi, struct qedi_conn *qedi_conn, 
	QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_SCSI_TM,

		  "i/o cmd_cleanup_req=%d, not equal to cmd_cleanup_cmpl=%d, cid=0x%x\n",

		  qedi_conn->cmd_cleanup_req,

		  qedi_conn->cmd_cleanup_cmpl,

		  atomic_read(&qedi_conn->cmd_cleanup_cmpl),

		  qedi_conn->iscsi_conn_id);



	iscsi_host_for_each_session(qedi->shost,
@@ -1243,9 +1237,8 @@ int qedi_cleanup_all_io(struct qedi_ctx *qedi, struct qedi_conn *qedi_conn, 
	/* Enable IOs for all other sessions except current.*/

	if (!wait_event_interruptible_timeout(qedi_conn->wait_queue,

				(qedi_conn->cmd_cleanup_req ==

					       qedi_conn->cmd_cleanup_cmpl) ||

					       test_bit(QEDI_IN_RECOVERY,

							&qedi->flags),

				 atomic_read(&qedi_conn->cmd_cleanup_cmpl)) ||

				test_bit(QEDI_IN_RECOVERY, &qedi->flags),

				5 * HZ)) {

		iscsi_host_for_each_session(qedi->shost,

					    qedi_mark_device_available);
@@ -1266,7 +1259,7 @@ void qedi_clearsq(struct qedi_ctx *qedi, struct qedi_conn *qedi_conn, 


	qedi_ep = qedi_conn->ep;

	qedi_conn->cmd_cleanup_req = 0;

	qedi_conn->cmd_cleanup_cmpl = 0;

	atomic_set(&qedi_conn->cmd_cleanup_cmpl, 0);



	if (!qedi_ep) {

		QEDI_WARN(&qedi->dbg_ctx,

drivers/scsi/qedi/qedi_iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static int qedi_conn_bind(struct iscsi_cls_session *cls_session, 
	qedi_conn->iscsi_conn_id = qedi_ep->iscsi_cid;

	qedi_conn->fw_cid = qedi_ep->fw_cid;

	qedi_conn->cmd_cleanup_req = 0;

	qedi_conn->cmd_cleanup_cmpl = 0;

	atomic_set(&qedi_conn->cmd_cleanup_cmpl, 0);



	if (qedi_bind_conn_to_iscsi_cid(qedi, qedi_conn)) {

		rc = -EINVAL;

drivers/scsi/qedi/qedi_iscsi.h

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ struct qedi_conn { 
	spinlock_t list_lock;		/* internal conn lock */

	u32 active_cmd_count;

	u32 cmd_cleanup_req;

	u32 cmd_cleanup_cmpl;

	atomic_t cmd_cleanup_cmpl;



	u32 iscsi_conn_id;

	int itt;

drivers/scsi/qla2xxx/qla_dbg.c

+3 −0
Original line number Diff line number Diff line
@@ -2491,6 +2491,9 @@ ql_dbg(uint level, scsi_qla_host_t *vha, uint id, const char *fmt, ...) 
	struct va_format vaf;

	char pbuf[64];



	if (!ql_mask_match(level) && !trace_ql_dbg_log_enabled())

		return;



	va_start(va, fmt);



	vaf.fmt = fmt;