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

Commit f66c83d0 authored Sep 03, 2013 by Linus Torvalds

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

Pull first round of SCSI updates from James Bottomley:
 "This patch set is a set of driver updates (ufs, zfcp, lpfc, mpt2/3sas,
  qla4xxx, qla2xxx [adding support for ISP8044 + other things]).

  We also have a new driver: esas2r which has a number of static checker
  problems, but which I expect to resolve over the -rc course of 3.12
  under the new driver exception.

  We also have the error return that were discussed at LSF"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (118 commits)
  [SCSI] sg: push file descriptor list locking down to per-device locking
  [SCSI] sg: checking sdp->detached isn't protected when open
  [SCSI] sg: no need sg_open_exclusive_lock
  [SCSI] sg: use rwsem to solve race during exclusive open
  [SCSI] scsi_debug: fix logical block provisioning support when unmap_alignment != 0
  [SCSI] scsi_debug: fix endianness bug in sdebug_build_parts()
  [SCSI] qla2xxx: Update the driver version to 8.06.00.08-k.
  [SCSI] qla2xxx: print MAC via %pMR.
  [SCSI] qla2xxx: Correction to message ids.
  [SCSI] qla2xxx: Correctly print out/in mailbox registers.
  [SCSI] qla2xxx: Add a new interface to update versions.
  [SCSI] qla2xxx: Move queue depth ramp down message to i/o debug level.
  [SCSI] qla2xxx: Select link initialization option bits from current operating mode.
  [SCSI] qla2xxx: Add loopback IDC-TIME-EXTEND aen handling support.
  [SCSI] qla2xxx: Set default critical temperature value in cases when ISPFX00 firmware doesn't provide it
  [SCSI] qla2xxx: QLAFX00 make over temperature AEN handling informational, add log for normal temperature AEN
  [SCSI] qla2xxx: Correct Interrupt Register offset for ISPFX00
  [SCSI] qla2xxx: Remove handling of Shutdown Requested AEN from qlafx00_process_aen().
  [SCSI] qla2xxx: Send all AENs for ISPFx00 to above layers.
  [SCSI] qla2xxx: Add changes in initialization for ISPFX00 cards with BIOS
  ...

parents d472d9d9 1f962ebc

Documentation/scsi/LICENSE.qla4xxx

+1 −1

Original line number	Diff line number	Diff line
		Copyright (c) 2003-2012 QLogic Corporation
		Copyright (c) 2003-2013 QLogic Corporation
		QLogic Linux iSCSI Driver

		This program includes a device driver for Linux 3.x.

MAINTAINERS

+14 −1

Original line number	Diff line number	Diff line
		@@ -1547,6 +1547,13 @@ W: http://atmelwlandriver.sourceforge.net/
		S: Maintained
		F: drivers/net/wireless/atmel*

		ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
		M: Bradley Grove <linuxdrivers@attotech.com>
		L: linux-scsi@vger.kernel.org
		W: http://www.attotech.com
		S: Supported
		F: drivers/scsi/esas2r

		AUDIT SUBSYSTEM
		M: Al Viro <viro@zeniv.linux.org.uk>
		M: Eric Paris <eparis@redhat.com>
		@@ -1823,6 +1830,12 @@ L: linux-scsi@vger.kernel.org
		S: Supported
		F: drivers/scsi/bnx2fc/

		BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
		M: Eddie Wai <eddie.wai@broadcom.com>
		L: linux-scsi@vger.kernel.org
		S: Supported
		F: drivers/scsi/bnx2i/

		BROADCOM SPECIFIC AMBA DRIVER (BCMA)
		M: Rafał Miłecki <zajec5@gmail.com>
		L: linux-wireless@vger.kernel.org
		@@ -6676,11 +6689,11 @@ F: Documentation/scsi/LICENSE.qla2xxx
		F: drivers/scsi/qla2xxx/

		QLOGIC QLA4XXX iSCSI DRIVER
		M: Ravi Anand <ravi.anand@qlogic.com>
		M: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
		M: iscsi-driver@qlogic.com
		L: linux-scsi@vger.kernel.org
		S: Supported
		F: Documentation/scsi/LICENSE.qla4xxx
		F: drivers/scsi/qla4xxx/

		QLOGIC QLA3XXX NETWORK DRIVER

block/blk-core.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -2318,6 +2318,12 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
		case -ETIMEDOUT:
		error_type = "timeout";
		break;
		case -ENOSPC:
		error_type = "critical space allocation";
		break;
		case -ENODATA:
		error_type = "critical medium";
		break;
		case -EIO:
		default:
		error_type = "I/O";

drivers/infiniband/ulp/iser/iscsi_iser.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -672,6 +672,7 @@ static umode_t iser_attr_is_visible(int param_type, int param)
		case ISCSI_PARAM_TGT_RESET_TMO:
		case ISCSI_PARAM_IFACE_NAME:
		case ISCSI_PARAM_INITIATOR_NAME:
		case ISCSI_PARAM_DISCOVERY_SESS:
		return S_IRUGO;
		default:
		return 0;
		@@ -701,7 +702,7 @@ static struct scsi_host_template iscsi_iser_sht = {
		static struct iscsi_transport iscsi_iser_transport = {
		.owner = THIS_MODULE,
		.name = "iser",
		.caps = CAP_RECOVERY_L0 \| CAP_MULTI_R2T,
		.caps = CAP_RECOVERY_L0 \| CAP_MULTI_R2T \| CAP_TEXT_NEGO,
		/* session management */
		.create_session = iscsi_iser_session_create,
		.destroy_session = iscsi_iser_session_destroy,

drivers/infiniband/ulp/iser/iser_initiator.c

+10 −1

Original line number	Diff line number	Diff line
		@@ -234,6 +234,7 @@ void iser_free_rx_descriptors(struct iser_conn *ib_conn)
		static int iser_post_rx_bufs(struct iscsi_conn conn, struct iscsi_hdr req)
		{
		struct iscsi_iser_conn *iser_conn = conn->dd_data;
		struct iscsi_session *session = conn->session;

		iser_dbg("req op %x flags %x\n", req->opcode, req->flags);
		/* check if this is the last login - going to full feature phase */
		@@ -248,7 +249,13 @@ static int iser_post_rx_bufs(struct iscsi_conn conn, struct iscsi_hdr req)
		WARN_ON(iser_conn->ib_conn->post_recv_buf_count != 1);
		WARN_ON(atomic_read(&iser_conn->ib_conn->post_send_buf_count) != 0);

		iser_dbg("Initially post: %d\n", ISER_MIN_POSTED_RX);
		if (session->discovery_sess) {
		iser_info("Discovery session, re-using login RX buffer\n");
		return 0;
		} else
		iser_info("Normal session, posting batch of RX %d buffers\n",
		ISER_MIN_POSTED_RX);

		/* Initial post receive buffers */
		if (iser_post_recvm(iser_conn->ib_conn, ISER_MIN_POSTED_RX))
		return -ENOMEM;
		@@ -425,6 +432,8 @@ int iser_send_control(struct iscsi_conn *conn,
		}

		if (task == conn->login_task) {
		iser_dbg("op %x dsl %lx, posting login rx buffer\n",
		task->hdr->opcode, data_seg_len);
		err = iser_post_recvl(iser_conn->ib_conn);
		if (err)
		goto send_control_error;