Commit aa2638a2 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:
  [SCSI] aic79xx: make driver respect nvram for IU and QAS settings
  [SCSI] don't attach ULD to Dell Universal Xport
  [SCSI] lpfc 8.3.3 : Update driver version to 8.3.3
  [SCSI] lpfc 8.3.3 : Add support for Target Reset handler entrypoint
  [SCSI] lpfc 8.3.3 : Fix a couple of spin_lock and memory issues and a crash
  [SCSI] lpfc 8.3.3 : FC/FCOE discovery fixes
  [SCSI] lpfc 8.3.3 : Fix various SLI-3 vs SLI-4 differences
  [SCSI] qla2xxx: Resolve a performance issue in interrupt
  [SCSI] cnic, bnx2i: Fix build failure when CONFIG_PCI is not set.
  [SCSI] nsp_cs: time_out reaches -1
  [SCSI] qla2xxx: fix printk format warnings
  [SCSI] ncr53c8xx: div reaches -1
  [SCSI] compat: don't perform unneeded copy in sg_io code
  [SCSI] zfcp: Update FC pass-through support
  [SCSI] zfcp: Add FC pass-through support
  [SCSI] FC Pass Thru support
parents b069e8ed ea443190

Documentation/scsi/scsi_fc_transport.txt

+12 −2
Original line number Diff line number Diff line 
                             SCSI FC Tansport

                 =============================================



Date:  4/12/2007

Date:  11/18/2008

Kernel Revisions for features:

  rports : <<TBS>>

  vports : 2.6.22 (? TBD)

  vports : 2.6.22

  bsg support : 2.6.30 (?TBD?)





Introduction
@@ -15,6 +16,7 @@ The FC transport can be found at: 
  drivers/scsi/scsi_transport_fc.c

  include/scsi/scsi_transport_fc.h

  include/scsi/scsi_netlink_fc.h

  include/scsi/scsi_bsg_fc.h



This file is found at Documentation/scsi/scsi_fc_transport.txt
@@ -472,6 +474,14 @@ int 
fc_vport_terminate(struct fc_vport *vport)





FC BSG support (CT & ELS passthru, and more)

========================================================================

<< To Be Supplied >>











Credits

=======

The following people have contributed to this document:

Documentation/scsi/scsi_mid_low_api.txt

+5 −0
Original line number Diff line number Diff line
@@ -1271,6 +1271,11 @@ of interest: 
    hostdata[0]  - area reserved for LLD at end of struct Scsi_Host. Size

                   is set by the second argument (named 'xtr_bytes') to

                   scsi_host_alloc() or scsi_register().

    vendor_id    - a unique value that identifies the vendor supplying

                   the LLD for the Scsi_Host.  Used most often in validating

                   vendor-specific message requests.  Value consists of an

                   identifier type and a vendor-specific value.

                   See scsi_netlink.h for a description of valid formats.



The scsi_host structure is defined in include/scsi/scsi_host.h

drivers/net/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -2272,8 +2272,9 @@ config BNX2 


config CNIC

	tristate "Broadcom CNIC support"

	depends on BNX2

	depends on UIO

	depends on PCI

	select BNX2

	select UIO

	help

	  This driver supports offload features of Broadcom NetXtremeII

	  gigabit Ethernet cards.

drivers/s390/scsi/zfcp_aux.c

+8 −2
Original line number Diff line number Diff line
@@ -470,6 +470,12 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device) 
	if (!adapter)

		return -ENOMEM;



	adapter->gs = kzalloc(sizeof(struct zfcp_wka_ports), GFP_KERNEL);

	if (!adapter->gs) {

		kfree(adapter);

		return -ENOMEM;

	}



	ccw_device->handler = NULL;

	adapter->ccw_device = ccw_device;

	atomic_set(&adapter->refcount, 0);
@@ -523,8 +529,7 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device) 
		goto sysfs_failed;



	atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &adapter->status);



	zfcp_fc_nameserver_init(adapter);

	zfcp_fc_wka_ports_init(adapter);



	if (!zfcp_adapter_scsi_register(adapter))

		return 0;
@@ -571,6 +576,7 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter) 
	kfree(adapter->req_list);

	kfree(adapter->fc_stats);

	kfree(adapter->stats_reset_data);

	kfree(adapter->gs);

	kfree(adapter);

}

drivers/s390/scsi/zfcp_def.h

+12 −6
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <linux/syscalls.h>

#include <linux/scatterlist.h>

#include <linux/ioctl.h>

#include <scsi/fc/fc_fs.h>

#include <scsi/fc/fc_gs.h>

#include <scsi/scsi.h>

#include <scsi/scsi_tcq.h>

#include <scsi/scsi_cmnd.h>
@@ -29,6 +31,7 @@ 
#include <scsi/scsi_host.h>

#include <scsi/scsi_transport.h>

#include <scsi/scsi_transport_fc.h>

#include <scsi/scsi_bsg_fc.h>

#include <asm/ccwdev.h>

#include <asm/qdio.h>

#include <asm/debug.h>
@@ -228,11 +231,6 @@ struct zfcp_ls_adisc { 


/* FC-PH/FC-GS well-known address identifiers for generic services */

#define ZFCP_DID_WKA				0xFFFFF0

#define ZFCP_DID_MANAGEMENT_SERVICE		0xFFFFFA

#define ZFCP_DID_TIME_SERVICE			0xFFFFFB

#define ZFCP_DID_DIRECTORY_SERVICE		0xFFFFFC

#define ZFCP_DID_ALIAS_SERVICE			0xFFFFF8

#define ZFCP_DID_KEY_DISTRIBUTION_SERVICE	0xFFFFF7



/* remote port status */

#define ZFCP_STATUS_PORT_PHYS_OPEN		0x00000001
@@ -376,6 +374,14 @@ struct zfcp_wka_port { 
	struct delayed_work	work;

};



struct zfcp_wka_ports {

	struct zfcp_wka_port ms; 	/* management service */

	struct zfcp_wka_port ts; 	/* time service */

	struct zfcp_wka_port ds; 	/* directory service */

	struct zfcp_wka_port as; 	/* alias service */

	struct zfcp_wka_port ks; 	/* key distribution service */

};



struct zfcp_qdio_queue {

	struct qdio_buffer *sbal[QDIO_MAX_BUFFERS_PER_Q];

	u8		   first;	/* index of next free bfr in queue */
@@ -461,7 +467,7 @@ struct zfcp_adapter { 
						      actions */

	u32			erp_low_mem_count; /* nr of erp actions waiting

						      for memory */

	struct zfcp_wka_port	nsp;		   /* adapter's nameserver */

	struct zfcp_wka_ports	*gs;		   /* generic services */

	debug_info_t		*rec_dbf;

	debug_info_t		*hba_dbf;

	debug_info_t		*san_dbf;          /* debug feature areas */

CRA Git | Maintained and supported by SUSTech CRA and CCSE