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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (45 commits)
  [SCSI] Fix block queue and elevator memory leak in scsi_alloc_sdev
  [SCSI] scsi_dh_alua: Fix the time inteval for alua rtpg commands
  [SCSI] scsi_transport_iscsi: Fix documentation os parameter
  [SCSI] mv_sas: OCZ RevoDrive3 & zDrive R4 support
  [SCSI] libfc: improve flogi retries to avoid lport stuck
  [SCSI] libfc: avoid exchanges collision during lport reset
  [SCSI] libfc: fix checking FC_TYPE_BLS
  [SCSI] edd: Treat "XPRS" host bus type the same as "PCI"
  [SCSI] isci: overriding max_concurr_spinup oem parameter by max(oem, user)
  [SCSI] isci: revert bcn filtering
  [SCSI] isci: Fix hard reset timeout conditions.
  [SCSI] isci: No need to manage the pending reset bit on pending requests.
  [SCSI] isci: Remove redundant isci_request.ttype field.
  [SCSI] isci: Fix task management for SMP, SATA and on dev remove.
  [SCSI] isci: No task_done callbacks in error handler paths.
  [SCSI] isci: Handle task request timeouts correctly.
  [SCSI] isci: Fix tag leak in tasks and terminated requests.
  [SCSI] isci: Immediately fail I/O to removed devices.
  [SCSI] isci: Lookup device references through requests in completions.
  [SCSI] ipr: add definitions for additional adapter
  ...
parents dc822e57 f7c9c6bb

drivers/firmware/edd.c

+3 −3
Original line number Diff line number Diff line
@@ -151,7 +151,8 @@ edd_show_host_bus(struct edd_device *edev, char *buf) 
		p += scnprintf(p, left, "\tbase_address: %x\n",

			     info->params.interface_path.isa.base_address);

	} else if (!strncmp(info->params.host_bus_type, "PCIX", 4) ||

		   !strncmp(info->params.host_bus_type, "PCI", 3)) {

		   !strncmp(info->params.host_bus_type, "PCI", 3) ||

		   !strncmp(info->params.host_bus_type, "XPRS", 4)) {

		p += scnprintf(p, left,

			     "\t%02x:%02x.%d  channel: %u\n",

			     info->params.interface_path.pci.bus,
@@ -159,7 +160,6 @@ edd_show_host_bus(struct edd_device *edev, char *buf) 
			     info->params.interface_path.pci.function,

			     info->params.interface_path.pci.channel);

	} else if (!strncmp(info->params.host_bus_type, "IBND", 4) ||

		   !strncmp(info->params.host_bus_type, "XPRS", 4) ||

		   !strncmp(info->params.host_bus_type, "HTPT", 4)) {

		p += scnprintf(p, left,

			     "\tTBD: %llx\n",
@@ -668,7 +668,7 @@ edd_get_pci_dev(struct edd_device *edev) 
{

	struct edd_info *info = edd_dev_get_info(edev);



	if (edd_dev_is_type(edev, "PCI")) {

	if (edd_dev_is_type(edev, "PCI") || edd_dev_is_type(edev, "XPRS")) {

		return pci_get_bus_and_slot(info->params.interface_path.pci.bus,

				     PCI_DEVFN(info->params.interface_path.pci.slot,

					       info->params.interface_path.pci.

drivers/scsi/bnx2fc/bnx2fc.h

+4 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
#include "bnx2fc_constants.h"



#define BNX2FC_NAME		"bnx2fc"

#define BNX2FC_VERSION		"1.0.8"

#define BNX2FC_VERSION		"1.0.9"



#define PFX			"bnx2fc: "
@@ -145,6 +145,9 @@ 
#define REC_RETRY_COUNT			1

#define BNX2FC_NUM_ERR_BITS		63



#define BNX2FC_RELOGIN_WAIT_TIME	200

#define BNX2FC_RELOGIN_WAIT_CNT		10



/* bnx2fc driver uses only one instance of fcoe_percpu_s */

extern struct fcoe_percpu_s bnx2fc_global;

drivers/scsi/bnx2fc/bnx2fc_els.c

+12 −11
Original line number Diff line number Diff line
@@ -268,17 +268,6 @@ void bnx2fc_srr_compl(struct bnx2fc_els_cb_arg *cb_arg) 


	orig_io_req = cb_arg->aborted_io_req;

	srr_req = cb_arg->io_req;

	if (test_bit(BNX2FC_FLAG_IO_COMPL, &orig_io_req->req_flags)) {

		BNX2FC_IO_DBG(srr_req, "srr_compl: xid - 0x%x completed",

			orig_io_req->xid);

		goto srr_compl_done;

	}

	if (test_bit(BNX2FC_FLAG_ISSUE_ABTS, &orig_io_req->req_flags)) {

		BNX2FC_IO_DBG(srr_req, "rec abts in prog "

		       "orig_io - 0x%x\n",

			orig_io_req->xid);

		goto srr_compl_done;

	}

	if (test_and_clear_bit(BNX2FC_FLAG_ELS_TIMEOUT, &srr_req->req_flags)) {

		/* SRR timedout */

		BNX2FC_IO_DBG(srr_req, "srr timed out, abort "
@@ -290,6 +279,12 @@ void bnx2fc_srr_compl(struct bnx2fc_els_cb_arg *cb_arg) 
				"failed. issue cleanup\n");

			bnx2fc_initiate_cleanup(srr_req);

		}

		if (test_bit(BNX2FC_FLAG_IO_COMPL, &orig_io_req->req_flags) ||

		    test_bit(BNX2FC_FLAG_ISSUE_ABTS, &orig_io_req->req_flags)) {

			BNX2FC_IO_DBG(srr_req, "srr_compl:xid 0x%x flags = %lx",

				      orig_io_req->xid, orig_io_req->req_flags);

			goto srr_compl_done;

		}

		orig_io_req->srr_retry++;

		if (orig_io_req->srr_retry <= SRR_RETRY_COUNT) {

			struct bnx2fc_rport *tgt = orig_io_req->tgt;
@@ -311,6 +306,12 @@ void bnx2fc_srr_compl(struct bnx2fc_els_cb_arg *cb_arg) 
		}

		goto srr_compl_done;

	}

	if (test_bit(BNX2FC_FLAG_IO_COMPL, &orig_io_req->req_flags) ||

	    test_bit(BNX2FC_FLAG_ISSUE_ABTS, &orig_io_req->req_flags)) {

		BNX2FC_IO_DBG(srr_req, "srr_compl:xid - 0x%x flags = %lx",

			      orig_io_req->xid, orig_io_req->req_flags);

		goto srr_compl_done;

	}

	mp_req = &(srr_req->mp_req);

	fc_hdr = &(mp_req->resp_fc_hdr);

	resp_len = mp_req->resp_len;

drivers/scsi/bnx2fc/bnx2fc_fcoe.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ DEFINE_PER_CPU(struct bnx2fc_percpu_s, bnx2fc_percpu); 


#define DRV_MODULE_NAME		"bnx2fc"

#define DRV_MODULE_VERSION	BNX2FC_VERSION

#define DRV_MODULE_RELDATE	"Oct 02, 2011"

#define DRV_MODULE_RELDATE	"Oct 21, 2011"





static char version[] __devinitdata =

drivers/scsi/bnx2fc/bnx2fc_io.c

+37 −0
Original line number Diff line number Diff line
@@ -1103,7 +1103,10 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd) 
	struct fc_rport_libfc_priv *rp = rport->dd_data;

	struct bnx2fc_cmd *io_req;

	struct fc_lport *lport;

	struct fc_rport_priv *rdata;

	struct bnx2fc_rport *tgt;

	int logo_issued;

	int wait_cnt = 0;

	int rc = FAILED;
@@ -1192,8 +1195,40 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd) 
	} else {

		printk(KERN_ERR PFX "eh_abort: io_req (xid = 0x%x) "

				"already in abts processing\n", io_req->xid);

		if (cancel_delayed_work(&io_req->timeout_work))

			kref_put(&io_req->refcount,

				 bnx2fc_cmd_release); /* drop timer hold */

		bnx2fc_initiate_cleanup(io_req);



		spin_unlock_bh(&tgt->tgt_lock);



		wait_for_completion(&io_req->tm_done);



		spin_lock_bh(&tgt->tgt_lock);

		io_req->wait_for_comp = 0;

		rdata = io_req->tgt->rdata;

		logo_issued = test_and_set_bit(BNX2FC_FLAG_EXPL_LOGO,

					       &tgt->flags);

		kref_put(&io_req->refcount, bnx2fc_cmd_release);

		spin_unlock_bh(&tgt->tgt_lock);



		if (!logo_issued) {

			BNX2FC_IO_DBG(io_req, "Expl logo - tgt flags = 0x%lx\n",

				      tgt->flags);

			mutex_lock(&lport->disc.disc_mutex);

			lport->tt.rport_logoff(rdata);

			mutex_unlock(&lport->disc.disc_mutex);

			do {

				msleep(BNX2FC_RELOGIN_WAIT_TIME);

				/*

				 * If session not recovered, let SCSI-ml

				 * escalate error recovery.

				 */

				if (wait_cnt++ > BNX2FC_RELOGIN_WAIT_CNT)

					return FAILED;

			} while (!test_bit(BNX2FC_FLAG_SESSION_READY,

					   &tgt->flags));

		}

		return SUCCESS;

	}

	if (rc == FAILED) {
@@ -1275,6 +1310,8 @@ void bnx2fc_process_cleanup_compl(struct bnx2fc_cmd *io_req, 
		   io_req->refcount.refcount.counter, io_req->cmd_type);

	bnx2fc_scsi_done(io_req, DID_ERROR);

	kref_put(&io_req->refcount, bnx2fc_cmd_release);

	if (io_req->wait_for_comp)

		complete(&io_req->tm_done);

}



void bnx2fc_process_abts_compl(struct bnx2fc_cmd *io_req,

CRA Git | Maintained and supported by SUSTech CRA and CCSE