Commit 22eb5aa6 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: (74 commits)
  [SCSI] sg: fix q->queue_lock on scsi_error_handler path
  [SCSI] replace __inline with inline
  [SCSI] a2091: make 2 functions static
  [SCSI] a3000: make 2 functions static
  [SCSI] ses: #if 0 the unused ses_match_host()
  [SCSI] use kmem_cache_zalloc instead of kmem_cache_alloc/memset
  [SCSI] sg: fix iovec bugs introduced by the block layer conversion
  [SCSI] qlogicpti: use request_firmware
  [SCSI] advansys: use request_firmware
  [SCSI] qla1280: use request_firmware
  [SCSI] libiscsi: fix iscsi pool error path
  [SCSI] cxgb3i: call ddp release function directly
  [SCSI] cxgb3i: merge cxgb3i_ddp into cxgb3i module
  [SCSI] cxgb3i: close all tcp connections upon chip reset
  [SCSI] cxgb3i: re-read ddp settings information after chip reset
  [SCSI] cxgb3i: re-initialize ddp settings after chip reset
  [SCSI] cxgb3i: subscribe to error notification from cxgb3 driver
  [SCSI] aacraid driver update
  [SCSI] mptsas: remove unneeded check
  [SCSI] config: Make need for SCSI_CDROM clearer
  ...
parents d7ca6f8c 015640ed

Documentation/scsi/aacraid.txt

+4 −11
Original line number Diff line number Diff line
@@ -60,17 +60,9 @@ Supported Cards/Chipsets 
	9005:0285:9005:02d5	Adaptec	ASR-2405 (Voodoo40 Lite)

	9005:0285:9005:02d6	Adaptec	ASR-2445 (Voodoo44 Lite)

	9005:0285:9005:02d7	Adaptec	ASR-2805 (Voodoo80 Lite)

	9005:0285:9005:02d8	Adaptec	5405G (Voodoo40 PM)

	9005:0285:9005:02d9	Adaptec	5445G (Voodoo44 PM)

	9005:0285:9005:02da	Adaptec	5805G (Voodoo80 PM)

	9005:0285:9005:02db	Adaptec	5085G (Voodoo08 PM)

	9005:0285:9005:02dc	Adaptec	51245G (Voodoo124 PM)

	9005:0285:9005:02dd	Adaptec	51645G (Voodoo164 PM)

	9005:0285:9005:02de	Adaptec	52445G (Voodoo244 PM)

	9005:0285:9005:02df	Adaptec	ASR-2045G (Voodoo04 Lite PM)

	9005:0285:9005:02e0	Adaptec	ASR-2405G (Voodoo40 Lite PM)

	9005:0285:9005:02e1	Adaptec	ASR-2445G (Voodoo44 Lite PM)

	9005:0285:9005:02e2	Adaptec	ASR-2805G (Voodoo80 Lite PM)

	9005:0285:9005:02d8	Adaptec	5405Z (Voodoo40 BLBU)

	9005:0285:9005:02d9	Adaptec	5445Z (Voodoo44 BLBU)

	9005:0285:9005:02da	Adaptec	5805Z (Voodoo80 BLBU)

	1011:0046:9005:0364	Adaptec	5400S (Mustang)

	1011:0046:9005:0365	Adaptec	5400S (Mustang)

	9005:0287:9005:0800	Adaptec	Themisto (Jupiter)
@@ -140,6 +132,7 @@ Deanna Bonds (non-DASD support, PAE fibs and 64 bit, 
					 where fibs that go to the hardware are consistently called hw_fibs and

					 not just fibs like the name of the driver tracking structure)

Mark Salyzyn <Mark_Salyzyn@adaptec.com> Fixed panic issues and added some new product ids for upcoming hbas. Performance tuning, card failover and bug mitigations.

Achim Leubner <Achim_Leubner@adaptec.com>



Original Driver

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

drivers/message/fusion/mptsas.c

+2 −3
Original line number Diff line number Diff line
@@ -2279,9 +2279,8 @@ mptsas_delete_expander_phys(MPT_ADAPTER *ioc) 
	mutex_lock(&ioc->sas_topology_mutex);

	list_for_each_entry_safe(port_info, n, &ioc->sas_topology, list) {



		if (port_info->phy_info &&

		    (!(port_info->phy_info[0].identify.device_info &

		    MPI_SAS_DEVICE_INFO_SMP_TARGET)))

		if (!(port_info->phy_info[0].identify.device_info &

		    MPI_SAS_DEVICE_INFO_SMP_TARGET))

			continue;



		if (mptsas_sas_expander_pg0(ioc, &buffer,

drivers/scsi/Kconfig

+12 −5
Original line number Diff line number Diff line
@@ -121,10 +121,11 @@ config BLK_DEV_SR 
	tristate "SCSI CDROM support"

	depends on SCSI

	---help---

	  If you want to use a SCSI or FireWire CD-ROM under Linux,

	  say Y and read the SCSI-HOWTO and the CDROM-HOWTO at

	  <http://www.tldp.org/docs.html#howto>. Also make sure to say

	  Y or M to "ISO 9660 CD-ROM file system support" later.

	  If you want to use a CD or DVD drive attached to your computer

	  by SCSI, FireWire, USB or ATAPI, say Y and read the SCSI-HOWTO

	  and the CDROM-HOWTO at <http://www.tldp.org/docs.html#howto>.



	  Make sure to say Y or M to "ISO 9660 CD-ROM file system support".



	  To compile this driver as a module, choose M here and read

	  <file:Documentation/scsi/scsi.txt>.
@@ -614,10 +615,16 @@ config LIBFC 
	---help---

	  Fibre Channel library module



config LIBFCOE

	tristate "LibFCoE module"

	select LIBFC

	---help---

	  Library for Fibre Channel over Ethernet module



config FCOE

	tristate "FCoE module"

	depends on PCI

	select LIBFC

	select LIBFCOE

	---help---

	  Fibre Channel over Ethernet module

drivers/scsi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ obj-$(CONFIG_SCSI_SRP_ATTRS) += scsi_transport_srp.o 
obj-$(CONFIG_SCSI_DH)		+= device_handler/



obj-$(CONFIG_LIBFC)		+= libfc/

obj-$(CONFIG_LIBFCOE)		+= fcoe/

obj-$(CONFIG_FCOE)		+= fcoe/

obj-$(CONFIG_ISCSI_TCP) 	+= libiscsi.o	libiscsi_tcp.o iscsi_tcp.o

obj-$(CONFIG_INFINIBAND_ISER) 	+= libiscsi.o

drivers/scsi/a2091.c

+4 −2
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ 
#define DMA(ptr) ((a2091_scsiregs *)((ptr)->base))

#define HDATA(ptr) ((struct WD33C93_hostdata *)((ptr)->hostdata))



static int a2091_release(struct Scsi_Host *instance);



static irqreturn_t a2091_intr (int irq, void *_instance)

{

    unsigned long flags;
@@ -144,7 +146,7 @@ static void dma_stop(struct Scsi_Host *instance, struct scsi_cmnd *SCpnt, 
    }

}



int __init a2091_detect(struct scsi_host_template *tpnt)

static int __init a2091_detect(struct scsi_host_template *tpnt)

{

    static unsigned char called = 0;

    struct Scsi_Host *instance;
@@ -233,7 +235,7 @@ static struct scsi_host_template driver_template = { 


#include "scsi_module.c"



int a2091_release(struct Scsi_Host *instance)

static int a2091_release(struct Scsi_Host *instance)

{

#ifdef MODULE

	DMA(instance)->CNTR = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE