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

Commit 05455227 authored May 31, 2012 by Linus Torvalds

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

Pull final round of SCSI updates from James Bottomley:
 "This is primarily another round of driver updates (bnx2fc, qla2xxx,
  qla4xxx) including the target mode driver for qla2xxx.  We've also got
  a couple of regression fixes (async scanning, broken this merge window
  and a fix to a long standing break in the scsi_wait_scan module)."

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (45 commits)
  [SCSI] fix scsi_wait_scan
  [SCSI] fix async probe regression
  [SCSI] be2iscsi: fix dma free size mismatch regression
  [SCSI] qla4xxx: Update driver version to 5.02.00-k17
  [SCSI] qla4xxx: Capture minidump for ISP82XX on firmware failure
  [SCSI] qla4xxx: Add change_queue_depth API support
  [SCSI] qla4xxx: Fix clear ddb mbx command failure issue.
  [SCSI] qla4xxx: Fix kernel panic during discovery logout.
  [SCSI] qla4xxx: Correct early completion of pending mbox.
  [SCSI] fcoe, bnx2fc, libfcoe: SW FCoE and bnx2fc use FCoE Syfs
  [SCSI] libfcoe: Add fcoe_sysfs
  [SCSI] bnx2fc: Allocate fcoe_ctlr with bnx2fc_interface, not as a member
  [SCSI] fcoe: Allocate fcoe_ctlr with fcoe_interface, not as a member
  [SCSI] Fix dm-multipath starvation when scsi host is busy
  [SCSI] ufs: fix potential NULL pointer dereferencing error in ufshcd_prove.
  [SCSI] qla2xxx: don't free pool that wasn't allocated
  [SCSI] mptfusion: unlock on error in mpt_config()
  [SCSI] tcm_qla2xxx: Add >= 24xx series fabric module for target-core
  [SCSI] qla2xxx: Add LLD target-mode infrastructure for >= 24xx series
  [SCSI] Revert "qla2xxx: During loopdown perform Diagnostic loopback."
  ...

parents 5b461209 1ff2f403

Documentation/ABI/testing/sysfs-bus-fcoe

0 → 100644

+77 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/fcoe/ctlr_X
		Date: March 2012
		KernelVersion: TBD
		Contact: Robert Love <robert.w.love@intel.com>, devel@open-fcoe.org
		Description: 'FCoE Controller' instances on the fcoe bus
		Attributes:

		fcf_dev_loss_tmo: Device loss timeout peroid (see below). Changing
		this value will change the dev_loss_tmo for all
		FCFs discovered by this controller.

		lesb_link_fail: Link Error Status Block (LESB) link failure count.

		lesb_vlink_fail: Link Error Status Block (LESB) virtual link
		failure count.

		lesb_miss_fka: Link Error Status Block (LESB) missed FCoE
		Initialization Protocol (FIP) Keep-Alives (FKA).

		lesb_symb_err: Link Error Status Block (LESB) symbolic error count.

		lesb_err_block: Link Error Status Block (LESB) block error count.

		lesb_fcs_error: Link Error Status Block (LESB) Fibre Channel
		Serivces error count.

		Notes: ctlr_X (global increment starting at 0)

		What: /sys/bus/fcoe/fcf_X
		Date: March 2012
		KernelVersion: TBD
		Contact: Robert Love <robert.w.love@intel.com>, devel@open-fcoe.org
		Description: 'FCoE FCF' instances on the fcoe bus. A FCF is a Fibre Channel
		Forwarder, which is a FCoE switch that can accept FCoE
		(Ethernet) packets, unpack them, and forward the embedded
		Fibre Channel frames into a FC fabric. It can also take
		outbound FC frames and pack them in Ethernet packets to
		be sent to their destination on the Ethernet segment.
		Attributes:

		fabric_name: Identifies the fabric that the FCF services.

		switch_name: Identifies the FCF.

		priority: The switch's priority amongst other FCFs on the same
		fabric.

		selected: 1 indicates that the switch has been selected for use;
		0 indicates that the swich will not be used.

		fc_map: The Fibre Channel MAP

		vfid: The Virtual Fabric ID

		mac: The FCF's MAC address

		fka_peroid: The FIP Keep-Alive peroid

		fabric_state: The internal kernel state
		"Unknown" - Initialization value
		"Disconnected" - No link to the FCF/fabric
		"Connected" - Host is connected to the FCF
		"Deleted" - FCF is being removed from the system

		dev_loss_tmo: The device loss timeout peroid for this FCF.

		Notes: A device loss infrastructre similar to the FC Transport's
		is present in fcoe_sysfs. It is nice to have so that a
		link flapping adapter doesn't continually advance the count
		used to identify the discovered FCF. FCFs will exist in a
		"Disconnected" state until either the timer expires and the
		FCF becomes "Deleted" or the FCF is rediscovered and becomes
		"Connected."


		Users: The first user of this interface will be the fcoeadm application,
		which is commonly packaged in the fcoe-utils package.

drivers/message/fusion/mptbase.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -6483,6 +6483,7 @@ mpt_config(MPT_ADAPTER ioc, CONFIGPARMS pCfg)
		printk(MYIOC_s_INFO_FMT "%s: host reset in"
		" progress mpt_config timed out.!!\n",
		__func__, ioc->name);
		mutex_unlock(&ioc->mptbase_cmds.mutex);
		return -EFAULT;
		}
		spin_unlock_irqrestore(&ioc->taskmgmt_lock, flags);

drivers/scsi/be2iscsi/be_mgmt.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -571,13 +571,12 @@ free_cmd:
		static int mgmt_alloc_cmd_data(struct beiscsi_hba phba, struct be_dma_mem cmd,
		int iscsi_cmd, int size)
		{
		cmd->va = pci_alloc_consistent(phba->ctrl.pdev, sizeof(size),
		&cmd->dma);
		cmd->va = pci_alloc_consistent(phba->ctrl.pdev, size, &cmd->dma);
		if (!cmd->va) {
		SE_DEBUG(DBG_LVL_1, "Failed to allocate memory for if info\n");
		return -ENOMEM;
		}
		memset(cmd->va, 0, sizeof(size));
		memset(cmd->va, 0, size);
		cmd->size = size;
		be_cmd_hdr_prepare(cmd->va, CMD_SUBSYSTEM_ISCSI, iscsi_cmd, size);
		return 0;

drivers/scsi/bfa/bfad_attr.c

+17 −0

Original line number	Diff line number	Diff line
		@@ -426,6 +426,23 @@ bfad_im_vport_create(struct fc_vport *fc_vport, bool disable)
		vshost = vport->drv_port.im_port->shost;
		fc_host_node_name(vshost) = wwn_to_u64((u8 *)&port_cfg.nwwn);
		fc_host_port_name(vshost) = wwn_to_u64((u8 *)&port_cfg.pwwn);
		fc_host_supported_classes(vshost) = FC_COS_CLASS3;

		memset(fc_host_supported_fc4s(vshost), 0,
		sizeof(fc_host_supported_fc4s(vshost)));

		/* For FCP type 0x08 */
		if (supported_fc4s & BFA_LPORT_ROLE_FCP_IM)
		fc_host_supported_fc4s(vshost)[2] = 1;

		/* For fibre channel services type 0x20 */
		fc_host_supported_fc4s(vshost)[7] = 1;

		fc_host_supported_speeds(vshost) =
		bfad_im_supported_speeds(&bfad->bfa);
		fc_host_maxframe_size(vshost) =
		bfa_fcport_get_maxfrsize(&bfad->bfa);

		fc_vport->dd_data = vport;
		vport->drv_port.im_port->fc_vport = fc_vport;
		} else if (rc == BFA_STATUS_INVALID_WWN)

drivers/scsi/bfa/bfad_im.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -987,7 +987,7 @@ done:
		return 0;
		}

		static u32
		u32
		bfad_im_supported_speeds(struct bfa_s *bfa)
		{
		struct bfa_ioc_attr_s *ioc_attr;