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
  ...
This commit is contained in:
Linus Torvalds
2012-03-22 12:55:29 -07:00
154 changed files with 10279 additions and 4382 deletions

213
include/scsi/fc/fc_ms.h Normal file
View File

@@ -0,0 +1,213 @@
/* * Copyright(c) 2011 Intel Corporation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
*
* Maintained at www.Open-FCoE.org
*/
#ifndef _FC_MS_H_
#define _FC_MS_H_
#include <linux/types.h>
/*
* Fibre Channel Services - Management Service (MS)
* From T11.org FC-GS-4 Rev 7.91 February 4, 2004
*/
/*
* Fabric Device Management Interface
*/
/*
* Common-transport sub-type for FDMI
*/
#define FC_FDMI_SUBTYPE 0x10 /* fs_ct_hdr.ct_fs_subtype */
/*
* Management server FDMI Requests.
*/
enum fc_fdmi_req {
FC_FDMI_GRHL = 0x0100, /* Get Registered HBA List */
FC_FDMI_GHAT = 0x0101, /* Get HBA Attributes */
FC_FDMI_GRPL = 0x0102, /* Get Registered Port List */
FC_FDMI_GPAT = 0x0110, /* Get Port Attributes */
FC_FDMI_RHBA = 0x0200, /* Register HBA */
FC_FDMI_RHAT = 0x0201, /* Register HBA Attributes */
FC_FDMI_RPRT = 0x0210, /* Register Port */
FC_FDMI_RPA = 0x0211, /* Register Port Attributes */
FC_FDMI_DHBA = 0x0300, /* Deregister HBA */
FC_FDMI_DHAT = 0x0301, /* Deregister HBA Attributes */
FC_FDMI_DPRT = 0x0310, /* Deregister Port */
FC_FDMI_DPA = 0x0311, /* Deregister Port Attributes */
};
/*
* HBA Attribute Entry Type
*/
enum fc_fdmi_hba_attr_type {
FC_FDMI_HBA_ATTR_NODENAME = 0x0001,
FC_FDMI_HBA_ATTR_MANUFACTURER = 0x0002,
FC_FDMI_HBA_ATTR_SERIALNUMBER = 0x0003,
FC_FDMI_HBA_ATTR_MODEL = 0x0004,
FC_FDMI_HBA_ATTR_MODELDESCRIPTION = 0x0005,
FC_FDMI_HBA_ATTR_HARDWAREVERSION = 0x0006,
FC_FDMI_HBA_ATTR_DRIVERVERSION = 0x0007,
FC_FDMI_HBA_ATTR_OPTIONROMVERSION = 0x0008,
FC_FDMI_HBA_ATTR_FIRMWAREVERSION = 0x0009,
FC_FDMI_HBA_ATTR_OSNAMEVERSION = 0x000A,
FC_FDMI_HBA_ATTR_MAXCTPAYLOAD = 0x000B,
};
/*
* HBA Attribute Length
*/
#define FC_FDMI_HBA_ATTR_NODENAME_LEN 8
#define FC_FDMI_HBA_ATTR_MANUFACTURER_LEN 64
#define FC_FDMI_HBA_ATTR_SERIALNUMBER_LEN 64
#define FC_FDMI_HBA_ATTR_MODEL_LEN 256
#define FC_FDMI_HBA_ATTR_MODELDESCR_LEN 256
#define FC_FDMI_HBA_ATTR_HARDWAREVERSION_LEN 256
#define FC_FDMI_HBA_ATTR_DRIVERVERSION_LEN 256
#define FC_FDMI_HBA_ATTR_OPTIONROMVERSION_LEN 256
#define FC_FDMI_HBA_ATTR_FIRMWAREVERSION_LEN 256
#define FC_FDMI_HBA_ATTR_OSNAMEVERSION_LEN 256
#define FC_FDMI_HBA_ATTR_MAXCTPAYLOAD_LEN 4
/*
* Port Attribute Type
*/
enum fc_fdmi_port_attr_type {
FC_FDMI_PORT_ATTR_FC4TYPES = 0x0001,
FC_FDMI_PORT_ATTR_SUPPORTEDSPEED = 0x0002,
FC_FDMI_PORT_ATTR_CURRENTPORTSPEED = 0x0003,
FC_FDMI_PORT_ATTR_MAXFRAMESIZE = 0x0004,
FC_FDMI_PORT_ATTR_OSDEVICENAME = 0x0005,
FC_FDMI_PORT_ATTR_HOSTNAME = 0x0006,
};
/*
* Port Attribute Length
*/
#define FC_FDMI_PORT_ATTR_FC4TYPES_LEN 32
#define FC_FDMI_PORT_ATTR_SUPPORTEDSPEED_LEN 4
#define FC_FDMI_PORT_ATTR_CURRENTPORTSPEED_LEN 4
#define FC_FDMI_PORT_ATTR_MAXFRAMESIZE_LEN 4
#define FC_FDMI_PORT_ATTR_OSDEVICENAME_LEN 256
#define FC_FDMI_PORT_ATTR_HOSTNAME_LEN 256
/*
* HBA Attribute ID
*/
struct fc_fdmi_hba_identifier {
__be64 id;
};
/*
* Port Name
*/
struct fc_fdmi_port_name {
__be64 portname;
};
/*
* Attribute Entry Block for HBA/Port Attributes
*/
#define FC_FDMI_ATTR_ENTRY_HEADER_LEN 4
struct fc_fdmi_attr_entry {
__be16 type;
__be16 len;
__u8 value[1];
} __attribute__((__packed__));
/*
* Common for HBA/Port Attributes
*/
struct fs_fdmi_attrs {
__be32 numattrs;
struct fc_fdmi_attr_entry attr[1];
} __attribute__((__packed__));
/*
* Registered Port List
*/
struct fc_fdmi_rpl {
__be32 numport;
struct fc_fdmi_port_name port[1];
} __attribute__((__packed__));
/*
* Register HBA (RHBA)
*/
struct fc_fdmi_rhba {
struct fc_fdmi_hba_identifier hbaid;
struct fc_fdmi_rpl port;
struct fs_fdmi_attrs hba_attrs;
} __attribute__((__packed__));
/*
* Register HBA Attributes (RHAT)
*/
struct fc_fdmi_rhat {
struct fc_fdmi_hba_identifier hbaid;
struct fs_fdmi_attrs hba_attrs;
} __attribute__((__packed__));
/*
* Register Port (RPRT)
*/
struct fc_fdmi_rprt {
struct fc_fdmi_hba_identifier hbaid;
struct fc_fdmi_port_name port;
struct fs_fdmi_attrs hba_attrs;
} __attribute__((__packed__));
/*
* Register Port Attributes (RPA)
*/
struct fc_fdmi_rpa {
struct fc_fdmi_port_name port;
struct fs_fdmi_attrs hba_attrs;
} __attribute__((__packed__));
/*
* Deregister Port (DPRT)
*/
struct fc_fdmi_dprt {
struct fc_fdmi_port_name port;
} __attribute__((__packed__));
/*
* Deregister Port Attributes (DPA)
*/
struct fc_fdmi_dpa {
struct fc_fdmi_port_name port;
struct fs_fdmi_attrs hba_attrs;
} __attribute__((__packed__));
/*
* Deregister HBA Attributes (DHAT)
*/
struct fc_fdmi_dhat {
struct fc_fdmi_hba_identifier hbaid;
} __attribute__((__packed__));
/*
* Deregister HBA (DHBA)
*/
struct fc_fdmi_dhba {
struct fc_fdmi_hba_identifier hbaid;
} __attribute__((__packed__));
#endif /* _FC_MS_H_ */