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

Commit 1a0b6aba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 consists of the usual driver updates (megaraid_sas,
  scsi_debug, qla2xxx, qla4xxx, lpfc, bnx2fc, be2iscsi, hpsa, ipr) plus
  an assortment of minor fixes and the first precursors of SCSI-MQ (the
  code path simplifications) and the bug fix for the USB oops on remove
  (which involves an infrastructure change, so is sent via the main tree
  with a delayed backport after a cycle in which it is shown to
  introduce no new bugs)"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (196 commits)
  [SCSI] sd: Quiesce mode sense error messages
  [SCSI] add support for per-host cmd pools
  [SCSI] simplify command allocation and freeing a bit
  [SCSI] megaraid: simplify internal command handling
  [SCSI] ses: Use vpd information from scsi_device
  [SCSI] Add EVPD page 0x83 and 0x80 to sysfs
  [SCSI] Return VPD page length in scsi_vpd_inquiry()
  [SCSI] scsi_sysfs: Implement 'is_visible' callback
  [SCSI] hpsa: update driver version to 3.4.4-1
  [SCSI] hpsa: fix bad endif placement in RAID 5 mapper code
  [SCSI] qla2xxx: Fix build errors related to invalid print fields on some architectures.
  [SCSI] bfa: Replace large udelay() with mdelay()
  [SCSI] vmw_pvscsi: Some improvements in pvscsi driver.
  [SCSI] vmw_pvscsi: Add support for I/O requests coalescing.
  [SCSI] vmw_pvscsi: Fix pvscsi_abort() function.
  [SCSI] remove deprecated IRQF_DISABLED from SCSI
  [SCSI] bfa: Updating Maintainers email ids
  [SCSI] ipr: Add new CCIN definition for Grand Canyon support
  [SCSI] ipr: Format HCAM overlay ID 0x21
  [SCSI] ipr: Use pci_enable_msi_range() and pci_enable_msix_range()
  ...
parents 3e75c6de b2bff6ce

Documentation/ABI/testing/sysfs-class-scsi_host

+16 −0
Original line number Diff line number Diff line
@@ -11,3 +11,19 @@ Description: 
		guaranteed.  The 'isci_id' attribute unambiguously identifies

		the controller index: '0' for the first controller,

		'1' for the second.



What:		/sys/class/scsi_host/hostX/acciopath_status

Date:		November 2013

Contact:	Stephen M. Cameron <scameron@beardog.cce.hp.com>

Description:	This file contains the current status of the "SSD Smart Path"

		feature of HP Smart Array RAID controllers using the hpsa

		driver.  SSD Smart Path, when enabled permits the driver to

		send i/o requests directly to physical devices that are part

		of a logical drive, bypassing the controllers firmware RAID

		stack for a performance advantage when possible.  A value of

		'1' indicates the feature is enabled, and the controller may

		use the direct i/o path to physical devices.  A value of zero

		means the feature is disabled and the controller may not use

		the direct i/o path to physical devices.  This setting is

		controller wide, affecting all configured logical drives on the

		controller.  This file is readable and writable.

Documentation/scsi/ChangeLog.megaraid_sas

+13 −0
Original line number Diff line number Diff line 
Release Date    : Mon. Mar 10, 2014 17:00:00 PST 2014 -

			(emaild-id:megaraidlinux@lsi.com)

			Adam Radford

			Kashyap Desai

			Sumit Saxena

Current Version : 06.803.01.00-rc1

Old Version     : 06.700.06.00-rc1

    1. Load correct raid context timeout value for multipathing & clustering.

    2. Fix megasas_ioc_init_fusion to use local stack variable.

    3. Return leaked MPT frames to MPT command pool.

    4. Add Dell PowerEdge VRTX SR-IOV VF device support.

    5. Version and Changelog update.

-------------------------------------------------------------------------------

Release Date    : Sat. Aug 31, 2013 17:00:00 PST 2013 -

			(emaild-id:megaraidlinux@lsi.com)

			Adam Radford

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -1921,8 +1921,8 @@ F: drivers/bcma/ 
F:	include/linux/bcma/



BROCADE BFA FC SCSI DRIVER

M:	Anil Gurumurthy <agurumur@brocade.com>

M:	Vijaya Mohan Guvva <vmohan@brocade.com>

M:	Anil Gurumurthy <anil.gurumurthy@qlogic.com>

M:	Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>

L:	linux-scsi@vger.kernel.org

S:	Supported

F:	drivers/scsi/bfa/

drivers/scsi/NCR5380.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ static int __init __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, 
	NCR5380_setup(instance);



	for (trying_irqs = i = 0, mask = 1; i < 16; ++i, mask <<= 1)

		if ((mask & possible) && (request_irq(i, &probe_intr, IRQF_DISABLED, "NCR-probe", NULL) == 0))

		if ((mask & possible) && (request_irq(i, &probe_intr, 0, "NCR-probe", NULL) == 0))

			trying_irqs |= mask;



	timeout = jiffies + (250 * HZ / 1000);

drivers/scsi/aacraid/aacraid.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 *----------------------------------------------------------------------------*/



#ifndef AAC_DRIVER_BUILD

# define AAC_DRIVER_BUILD 30200

# define AAC_DRIVER_BUILD 30300

# define AAC_DRIVER_BRANCH "-ms"

#endif

#define MAXIMUM_NUM_CONTAINERS	32