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

Commit 424a6f6e 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-misc-2.6 

SCSI updates from James Bottomley:
 "The update includes the usual assortment of driver updates (lpfc,
  qla2xxx, qla4xxx, bfa, bnx2fc, bnx2i, isci, fcoe, hpsa) plus a huge
  amount of infrastructure work in the SAS library and transport class
  as well as an iSCSI update.  There's also a new SCSI based virtio
  driver."

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (177 commits)
  [SCSI] qla4xxx: Update driver version to 5.02.00-k15
  [SCSI] qla4xxx: trivial cleanup
  [SCSI] qla4xxx: Fix sparse warning
  [SCSI] qla4xxx: Add support for multiple session per host.
  [SCSI] qla4xxx: Export CHAP index as sysfs attribute
  [SCSI] scsi_transport: Export CHAP index as sysfs attribute
  [SCSI] qla4xxx: Add support to display CHAP list and delete CHAP entry
  [SCSI] iscsi_transport: Add support to display CHAP list and delete CHAP entry
  [SCSI] pm8001: fix endian issue with code optimization.
  [SCSI] pm8001: Fix possible racing condition.
  [SCSI] pm8001: Fix bogus interrupt state flag issue.
  [SCSI] ipr: update PCI ID definitions for new adapters
  [SCSI] qla2xxx: handle default case in qla2x00_request_firmware()
  [SCSI] isci: improvements in driver unloading routine
  [SCSI] isci: improve phy event warnings
  [SCSI] isci: debug, provide state-enum-to-string conversions
  [SCSI] scsi_transport_sas: 'enable' phys on reset
  [SCSI] libsas: don't recover end devices attached to disabled phys
  [SCSI] libsas: fixup target_port_protocols for expanders that don't report sata
  [SCSI] libsas: set attached device type and target protocols for local phys
  ...
parents 1ab142d4 cd8df932

Documentation/scsi/LICENSE.qla2xxx

+2 −39
Original line number Diff line number Diff line 
Copyright (c) 2003-2011 QLogic Corporation

QLogic Linux/ESX Fibre Channel HBA Driver

QLogic Linux FC-FCoE Driver



This program includes a device driver for Linux 2.6/ESX that may be

distributed with QLogic hardware specific firmware binary file.

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

You may modify and redistribute the device driver code under the

GNU General Public License (a copy of which is attached hereto as

Exhibit A) published by the Free Software Foundation (version 2).



You may redistribute the hardware specific firmware binary file

under the following terms:



	1. Redistribution of source code (only if applicable),

	   must retain the above copyright notice, this list of

	   conditions and the following disclaimer.



	2. Redistribution in binary form must reproduce the above

	   copyright notice, this list of conditions and the

	   following disclaimer in the documentation and/or other

	   materials provided with the distribution.



	3. The name of QLogic Corporation may not be used to

	   endorse or promote products derived from this software

	   without specific prior written permission



REGARDLESS OF WHAT LICENSING MECHANISM IS USED OR APPLICABLE,

THIS PROGRAM IS PROVIDED BY QLOGIC CORPORATION "AS IS'' AND ANY

EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A

PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR

BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED

TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,

OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

POSSIBILITY OF SUCH DAMAGE.



USER ACKNOWLEDGES AND AGREES THAT USE OF THIS PROGRAM WILL NOT

CREATE OR GIVE GROUNDS FOR A LICENSE BY IMPLICATION, ESTOPPEL, OR

OTHERWISE IN ANY INTELLECTUAL PROPERTY RIGHTS (PATENT, COPYRIGHT,

TRADE SECRET, MASK WORK, OR OTHER PROPRIETARY RIGHT) EMBODIED IN

ANY OTHER QLOGIC HARDWARE OR SOFTWARE EITHER SOLELY OR IN

COMBINATION WITH THIS PROGRAM.





EXHIBIT A

Documentation/scsi/bfa.txt

0 → 100644
+82 −0
Original line number Diff line number Diff line 
Linux driver for Brocade FC/FCOE adapters





Supported Hardware

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



bfa 3.0.2.2 driver supports all Brocade FC/FCOE adapters. Below is a list of

adapter models with corresponding PCIIDs.



	PCIID		  	Model



	1657:0013:1657:0014	425 4Gbps dual port FC HBA

	1657:0013:1657:0014	825 8Gbps PCIe dual port FC HBA

	1657:0013:103c:1742	HP 82B 8Gbps PCIedual port FC HBA

	1657:0013:103c:1744	HP 42B 4Gbps dual port FC HBA

	1657:0017:1657:0014	415 4Gbps single port FC HBA

	1657:0017:1657:0014	815 8Gbps single port FC HBA

	1657:0017:103c:1741	HP 41B 4Gbps single port FC HBA

	1657:0017:103c 1743	HP 81B 8Gbps single port FC HBA

	1657:0021:103c:1779	804 8Gbps FC HBA for HP Bladesystem c-class



	1657:0014:1657:0014	1010 10Gbps single port CNA - FCOE

	1657:0014:1657:0014	1020 10Gbps dual port CNA - FCOE

	1657:0014:1657:0014	1007 10Gbps dual port CNA - FCOE

	1657:0014:1657:0014	1741 10Gbps dual port CNA - FCOE



	1657:0022:1657:0024	1860 16Gbps FC HBA

	1657:0022:1657:0022	1860 10Gbps CNA - FCOE





Firmware download

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



The latest Firmware package for 3.0.2.2 bfa driver can be found at:



http://www.brocade.com/services-support/drivers-downloads/adapters/Linux.page



and then click following respective util package link:



	Version			Link



	v3.0.0.0	Linux Adapter Firmware package for RHEL 6.2, SLES 11SP2





Configuration & Management utility download

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



The latest driver configuration & management utility for 3.0.2.2 bfa driver can

be found at:



http://www.brocade.com/services-support/drivers-downloads/adapters/Linux.page



and then click following respective util pacakge link



	Version			Link



	v3.0.2.0	Linux Adapter Firmware package for RHEL 6.2, SLES 11SP2





Documentation

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



The latest Administration's Guide, Installation and Reference Manual,

Troubleshooting Guide, and Release Notes for the corresponding out-of-box

driver can be found at:



http://www.brocade.com/services-support/drivers-downloads/adapters/Linux.page



and use the following inbox and out-of-box driver version mapping to find

the corresponding documentation:



	Inbox Version		Out-of-box Version



	v3.0.2.2		v3.0.0.0





Support

-------



For general product and support info, go to the Brocade website at:



http://www.brocade.com/services-support/index.page

Documentation/scsi/libsas.txt

+0 −15
Original line number Diff line number Diff line
@@ -398,21 +398,6 @@ struct sas_task { 
	task_done -- callback when the task has finished execution

};



When an external entity, entity other than the LLDD or the

SAS Layer, wants to work with a struct domain_device, it

_must_ call kobject_get() when getting a handle on the

device and kobject_put() when it is done with the device.



This does two things:

     A) implements proper kfree() for the device;

     B) increments/decrements the kref for all players:

     domain_device

	all domain_device's ... (if past an expander)

	    port

		host adapter

		     pci device

			 and up the ladder, etc.



DISCOVERY

---------

drivers/ata/libata-core.c

+18 −16
Original line number Diff line number Diff line
@@ -5936,12 +5936,8 @@ void ata_host_init(struct ata_host *host, struct device *dev, 
	host->ops = ops;

}



int ata_port_probe(struct ata_port *ap)

void __ata_port_probe(struct ata_port *ap)

{

	int rc = 0;



	/* probe */

	if (ap->ops->error_handler) {

	struct ata_eh_info *ehi = &ap->link.eh_info;

	unsigned long flags;
@@ -5957,8 +5953,14 @@ int ata_port_probe(struct ata_port *ap) 
	ata_port_schedule_eh(ap);



	spin_unlock_irqrestore(ap->lock, flags);

}



		/* wait for EH to finish */

int ata_port_probe(struct ata_port *ap)

{

	int rc = 0;



	if (ap->ops->error_handler) {

		__ata_port_probe(ap);

		ata_port_wait_eh(ap);

	} else {

		DPRINTK("ata%u: bus probe begin\n", ap->print_id);

drivers/ata/libata-eh.c

+1 −0
Original line number Diff line number Diff line
@@ -863,6 +863,7 @@ void ata_port_wait_eh(struct ata_port *ap) 
		goto retry;

	}

}

EXPORT_SYMBOL_GPL(ata_port_wait_eh);



static int ata_eh_nr_in_flight(struct ata_port *ap)

{