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
This commit is contained in:
Linus Torvalds
4
include/scsi/Kbuild
Normal file
4
include/scsi/Kbuild
Normal file
@@ -0,0 +1,4 @@
|
||||
header-y += scsi.h
|
||||
header-y += scsi_netlink.h
|
||||
header-y += scsi_netlink_fc.h
|
||||
header-y += scsi_bsg_fc.h
|
||||
322
include/scsi/scsi_bsg_fc.h
Normal file
322
include/scsi/scsi_bsg_fc.h
Normal file
@@ -0,0 +1,322 @@
|
||||
/*
|
||||
* FC Transport BSG Interface
|
||||
*
|
||||
* Copyright (C) 2008 James Smart, Emulex Corporation
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef SCSI_BSG_FC_H
|
||||
#define SCSI_BSG_FC_H
|
||||
|
||||
/*
|
||||
* This file intended to be included by both kernel and user space
|
||||
*/
|
||||
|
||||
#include <scsi/scsi.h>
|
||||
|
||||
/*
|
||||
* FC Transport SGIO v4 BSG Message Support
|
||||
*/
|
||||
|
||||
/* Default BSG request timeout (in seconds) */
|
||||
#define FC_DEFAULT_BSG_TIMEOUT (10 * HZ)
|
||||
|
||||
|
||||
/*
|
||||
* Request Message Codes supported by the FC Transport
|
||||
*/
|
||||
|
||||
/* define the class masks for the message codes */
|
||||
#define FC_BSG_CLS_MASK 0xF0000000 /* find object class */
|
||||
#define FC_BSG_HST_MASK 0x80000000 /* fc host class */
|
||||
#define FC_BSG_RPT_MASK 0x40000000 /* fc rport class */
|
||||
|
||||
/* fc_host Message Codes */
|
||||
#define FC_BSG_HST_ADD_RPORT (FC_BSG_HST_MASK | 0x00000001)
|
||||
#define FC_BSG_HST_DEL_RPORT (FC_BSG_HST_MASK | 0x00000002)
|
||||
#define FC_BSG_HST_ELS_NOLOGIN (FC_BSG_HST_MASK | 0x00000003)
|
||||
#define FC_BSG_HST_CT (FC_BSG_HST_MASK | 0x00000004)
|
||||
#define FC_BSG_HST_VENDOR (FC_BSG_HST_MASK | 0x000000FF)
|
||||
|
||||
/* fc_rport Message Codes */
|
||||
#define FC_BSG_RPT_ELS (FC_BSG_RPT_MASK | 0x00000001)
|
||||
#define FC_BSG_RPT_CT (FC_BSG_RPT_MASK | 0x00000002)
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* FC Address Identifiers in Message Structures :
|
||||
*
|
||||
* Whenever a command payload contains a FC Address Identifier
|
||||
* (aka port_id), the value is effectively in big-endian
|
||||
* order, thus the array elements are decoded as follows:
|
||||
* element [0] is bits 23:16 of the FC Address Identifier
|
||||
* element [1] is bits 15:8 of the FC Address Identifier
|
||||
* element [2] is bits 7:0 of the FC Address Identifier
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* FC Host Messages
|
||||
*/
|
||||
|
||||
/* FC_BSG_HST_ADDR_PORT : */
|
||||
|
||||
/* Request:
|
||||
* This message requests the FC host to login to the remote port
|
||||
* at the specified N_Port_Id. The remote port is to be enumerated
|
||||
* with the transport upon completion of the login.
|
||||
*/
|
||||
struct fc_bsg_host_add_rport {
|
||||
uint8_t reserved;
|
||||
|
||||
/* FC Address Identier of the remote port to login to */
|
||||
uint8_t port_id[3];
|
||||
};
|
||||
|
||||
/* Response:
|
||||
* There is no additional response data - fc_bsg_reply->result is sufficient
|
||||
*/
|
||||
|
||||
|
||||
/* FC_BSG_HST_DEL_RPORT : */
|
||||
|
||||
/* Request:
|
||||
* This message requests the FC host to remove an enumerated
|
||||
* remote port and to terminate the login to it.
|
||||
*
|
||||
* Note: The driver is free to reject this request if it desires to
|
||||
* remain logged in with the remote port.
|
||||
*/
|
||||
struct fc_bsg_host_del_rport {
|
||||
uint8_t reserved;
|
||||
|
||||
/* FC Address Identier of the remote port to logout of */
|
||||
uint8_t port_id[3];
|
||||
};
|
||||
|
||||
/* Response:
|
||||
* There is no additional response data - fc_bsg_reply->result is sufficient
|
||||
*/
|
||||
|
||||
|
||||
/* FC_BSG_HST_ELS_NOLOGIN : */
|
||||
|
||||
/* Request:
|
||||
* This message requests the FC_Host to send an ELS to a specific
|
||||
* N_Port_ID. The host does not need to log into the remote port,
|
||||
* nor does it need to enumerate the rport for further traffic
|
||||
* (although, the FC host is free to do so if it desires).
|
||||
*/
|
||||
struct fc_bsg_host_els {
|
||||
/*
|
||||
* ELS Command Code being sent (must be the same as byte 0
|
||||
* of the payload)
|
||||
*/
|
||||
uint8_t command_code;
|
||||
|
||||
/* FC Address Identier of the remote port to send the ELS to */
|
||||
uint8_t port_id[3];
|
||||
};
|
||||
|
||||
/* Response:
|
||||
*/
|
||||
/* fc_bsg_ctels_reply->status values */
|
||||
#define FC_CTELS_STATUS_OK 0x00000000
|
||||
#define FC_CTELS_STATUS_REJECT 0x00000001
|
||||
#define FC_CTELS_STATUS_P_RJT 0x00000002
|
||||
#define FC_CTELS_STATUS_F_RJT 0x00000003
|
||||
#define FC_CTELS_STATUS_P_BSY 0x00000004
|
||||
#define FC_CTELS_STATUS_F_BSY 0x00000006
|
||||
struct fc_bsg_ctels_reply {
|
||||
/*
|
||||
* Note: An ELS LS_RJT may be reported in 2 ways:
|
||||
* a) A status of FC_CTELS_STATUS_OK is returned. The caller
|
||||
* is to look into the ELS receive payload to determine
|
||||
* LS_ACC or LS_RJT (by contents of word 0). The reject
|
||||
* data will be in word 1.
|
||||
* b) A status of FC_CTELS_STATUS_REJECT is returned, The
|
||||
* rjt_data field will contain valid data.
|
||||
*
|
||||
* Note: ELS LS_ACC is determined by an FC_CTELS_STATUS_OK, and
|
||||
* the receive payload word 0 indicates LS_ACC
|
||||
* (e.g. value is 0x02xxxxxx).
|
||||
*
|
||||
* Note: Similarly, a CT Reject may be reported in 2 ways:
|
||||
* a) A status of FC_CTELS_STATUS_OK is returned. The caller
|
||||
* is to look into the CT receive payload to determine
|
||||
* Accept or Reject (by contents of word 2). The reject
|
||||
* data will be in word 3.
|
||||
* b) A status of FC_CTELS_STATUS_REJECT is returned, The
|
||||
* rjt_data field will contain valid data.
|
||||
*
|
||||
* Note: x_RJT/BSY status will indicae that the rjt_data field
|
||||
* is valid and contains the reason/explanation values.
|
||||
*/
|
||||
uint32_t status; /* See FC_CTELS_STATUS_xxx */
|
||||
|
||||
/* valid if status is not FC_CTELS_STATUS_OK */
|
||||
struct {
|
||||
uint8_t action; /* fragment_id for CT REJECT */
|
||||
uint8_t reason_code;
|
||||
uint8_t reason_explanation;
|
||||
uint8_t vendor_unique;
|
||||
} rjt_data;
|
||||
};
|
||||
|
||||
|
||||
/* FC_BSG_HST_CT : */
|
||||
|
||||
/* Request:
|
||||
* This message requests that a CT Request be performed with the
|
||||
* indicated N_Port_ID. The driver is responsible for logging in with
|
||||
* the fabric and/or N_Port_ID, etc as per FC rules. This request does
|
||||
* not mandate that the driver must enumerate the destination in the
|
||||
* transport. The driver is allowed to decide whether to enumerate it,
|
||||
* and whether to tear it down after the request.
|
||||
*/
|
||||
struct fc_bsg_host_ct {
|
||||
uint8_t reserved;
|
||||
|
||||
/* FC Address Identier of the remote port to send the ELS to */
|
||||
uint8_t port_id[3];
|
||||
|
||||
/*
|
||||
* We need words 0-2 of the generic preamble for the LLD's
|
||||
*/
|
||||
uint32_t preamble_word0; /* revision & IN_ID */
|
||||
uint32_t preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
|
||||
uint32_t preamble_word2; /* Cmd Code, Max Size */
|
||||
|
||||
};
|
||||
/* Response:
|
||||
*
|
||||
* The reply structure is an fc_bsg_ctels_reply structure
|
||||
*/
|
||||
|
||||
|
||||
/* FC_BSG_HST_VENDOR : */
|
||||
|
||||
/* Request:
|
||||
* Note: When specifying vendor_id, be sure to read the Vendor Type and ID
|
||||
* formatting requirements specified in scsi_netlink.h
|
||||
*/
|
||||
struct fc_bsg_host_vendor {
|
||||
/*
|
||||
* Identifies the vendor that the message is formatted for. This
|
||||
* should be the recipient of the message.
|
||||
*/
|
||||
uint64_t vendor_id;
|
||||
|
||||
/* start of vendor command area */
|
||||
uint32_t vendor_cmd[0];
|
||||
};
|
||||
|
||||
/* Response:
|
||||
*/
|
||||
struct fc_bsg_host_vendor_reply {
|
||||
/* start of vendor response area */
|
||||
uint32_t vendor_rsp[0];
|
||||
};
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* FC Remote Port Messages
|
||||
*/
|
||||
|
||||
/* FC_BSG_RPT_ELS : */
|
||||
|
||||
/* Request:
|
||||
* This message requests that an ELS be performed with the rport.
|
||||
*/
|
||||
struct fc_bsg_rport_els {
|
||||
/*
|
||||
* ELS Command Code being sent (must be the same as
|
||||
* byte 0 of the payload)
|
||||
*/
|
||||
uint8_t els_code;
|
||||
};
|
||||
|
||||
/* Response:
|
||||
*
|
||||
* The reply structure is an fc_bsg_ctels_reply structure
|
||||
*/
|
||||
|
||||
|
||||
/* FC_BSG_RPT_CT : */
|
||||
|
||||
/* Request:
|
||||
* This message requests that a CT Request be performed with the rport.
|
||||
*/
|
||||
struct fc_bsg_rport_ct {
|
||||
/*
|
||||
* We need words 0-2 of the generic preamble for the LLD's
|
||||
*/
|
||||
uint32_t preamble_word0; /* revision & IN_ID */
|
||||
uint32_t preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
|
||||
uint32_t preamble_word2; /* Cmd Code, Max Size */
|
||||
};
|
||||
/* Response:
|
||||
*
|
||||
* The reply structure is an fc_bsg_ctels_reply structure
|
||||
*/
|
||||
|
||||
|
||||
|
||||
|
||||
/* request (CDB) structure of the sg_io_v4 */
|
||||
struct fc_bsg_request {
|
||||
uint32_t msgcode;
|
||||
union {
|
||||
struct fc_bsg_host_add_rport h_addrport;
|
||||
struct fc_bsg_host_del_rport h_delrport;
|
||||
struct fc_bsg_host_els h_els;
|
||||
struct fc_bsg_host_ct h_ct;
|
||||
struct fc_bsg_host_vendor h_vendor;
|
||||
|
||||
struct fc_bsg_rport_els r_els;
|
||||
struct fc_bsg_rport_ct r_ct;
|
||||
} rqst_data;
|
||||
};
|
||||
|
||||
|
||||
/* response (request sense data) structure of the sg_io_v4 */
|
||||
struct fc_bsg_reply {
|
||||
/*
|
||||
* The completion result. Result exists in two forms:
|
||||
* if negative, it is an -Exxx system errno value. There will
|
||||
* be no further reply information supplied.
|
||||
* else, it's the 4-byte scsi error result, with driver, host,
|
||||
* msg and status fields. The per-msgcode reply structure
|
||||
* will contain valid data.
|
||||
*/
|
||||
uint32_t result;
|
||||
|
||||
/* If there was reply_payload, how much was recevied ? */
|
||||
uint32_t reply_payload_rcv_len;
|
||||
|
||||
union {
|
||||
struct fc_bsg_host_vendor_reply vendor_reply;
|
||||
|
||||
struct fc_bsg_ctels_reply ctels_reply;
|
||||
} reply_data;
|
||||
};
|
||||
|
||||
|
||||
#endif /* SCSI_BSG_FC_H */
|
||||
|
||||
@@ -478,6 +478,15 @@ struct scsi_host_template {
|
||||
* module_init/module_exit.
|
||||
*/
|
||||
struct list_head legacy_hosts;
|
||||
|
||||
/*
|
||||
* Vendor Identifier associated with the host
|
||||
*
|
||||
* Note: When specifying vendor_id, be sure to read the
|
||||
* Vendor Type and ID formatting requirements specified in
|
||||
* scsi_netlink.h
|
||||
*/
|
||||
u64 vendor_id;
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
|
||||
struct scsi_transport_template;
|
||||
|
||||
|
||||
/*
|
||||
* FC Port definitions - Following FC HBAAPI guidelines
|
||||
*
|
||||
@@ -352,6 +351,7 @@ struct fc_rport { /* aka fc_starget_attrs */
|
||||
struct delayed_work fail_io_work;
|
||||
struct work_struct stgt_delete_work;
|
||||
struct work_struct rport_delete_work;
|
||||
struct request_queue *rqst_q; /* bsg support */
|
||||
} __attribute__((aligned(sizeof(unsigned long))));
|
||||
|
||||
/* bit field values for struct fc_rport "flags" field: */
|
||||
@@ -514,6 +514,9 @@ struct fc_host_attrs {
|
||||
struct workqueue_struct *work_q;
|
||||
char devloss_work_q_name[20];
|
||||
struct workqueue_struct *devloss_work_q;
|
||||
|
||||
/* bsg support */
|
||||
struct request_queue *rqst_q;
|
||||
};
|
||||
|
||||
#define shost_to_fc_host(x) \
|
||||
@@ -579,6 +582,47 @@ struct fc_host_attrs {
|
||||
(((struct fc_host_attrs *)(x)->shost_data)->devloss_work_q)
|
||||
|
||||
|
||||
struct fc_bsg_buffer {
|
||||
unsigned int payload_len;
|
||||
int sg_cnt;
|
||||
struct scatterlist *sg_list;
|
||||
};
|
||||
|
||||
/* Values for fc_bsg_job->state_flags (bitflags) */
|
||||
#define FC_RQST_STATE_INPROGRESS 0
|
||||
#define FC_RQST_STATE_DONE 1
|
||||
|
||||
struct fc_bsg_job {
|
||||
struct Scsi_Host *shost;
|
||||
struct fc_rport *rport;
|
||||
struct device *dev;
|
||||
struct request *req;
|
||||
spinlock_t job_lock;
|
||||
unsigned int state_flags;
|
||||
unsigned int ref_cnt;
|
||||
void (*job_done)(struct fc_bsg_job *);
|
||||
|
||||
struct fc_bsg_request *request;
|
||||
struct fc_bsg_reply *reply;
|
||||
unsigned int request_len;
|
||||
unsigned int reply_len;
|
||||
/*
|
||||
* On entry : reply_len indicates the buffer size allocated for
|
||||
* the reply.
|
||||
*
|
||||
* Upon completion : the message handler must set reply_len
|
||||
* to indicates the size of the reply to be returned to the
|
||||
* caller.
|
||||
*/
|
||||
|
||||
/* DMA payloads for the request/response */
|
||||
struct fc_bsg_buffer request_payload;
|
||||
struct fc_bsg_buffer reply_payload;
|
||||
|
||||
void *dd_data; /* Used for driver-specific storage */
|
||||
};
|
||||
|
||||
|
||||
/* The functions by which the transport class and the driver communicate */
|
||||
struct fc_function_template {
|
||||
void (*get_rport_dev_loss_tmo)(struct fc_rport *);
|
||||
@@ -614,9 +658,14 @@ struct fc_function_template {
|
||||
int (* tsk_mgmt_response)(struct Scsi_Host *, u64, u64, int);
|
||||
int (* it_nexus_response)(struct Scsi_Host *, u64, int);
|
||||
|
||||
/* bsg support */
|
||||
int (*bsg_request)(struct fc_bsg_job *);
|
||||
int (*bsg_timeout)(struct fc_bsg_job *);
|
||||
|
||||
/* allocation lengths for host-specific data */
|
||||
u32 dd_fcrport_size;
|
||||
u32 dd_fcvport_size;
|
||||
u32 dd_bsg_size;
|
||||
|
||||
/*
|
||||
* The driver sets these to tell the transport class it
|
||||
@@ -737,7 +786,6 @@ fc_vport_set_state(struct fc_vport *vport, enum fc_vport_state new_state)
|
||||
vport->vport_state = new_state;
|
||||
}
|
||||
|
||||
|
||||
struct scsi_transport_template *fc_attach_transport(
|
||||
struct fc_function_template *);
|
||||
void fc_release_transport(struct scsi_transport_template *);
|
||||
|
||||
@@ -36,8 +36,10 @@ struct spi_transport_attrs {
|
||||
unsigned int width:1; /* 0 - narrow, 1 - wide */
|
||||
unsigned int max_width:1;
|
||||
unsigned int iu:1; /* Information Units enabled */
|
||||
unsigned int max_iu:1;
|
||||
unsigned int dt:1; /* DT clocking enabled */
|
||||
unsigned int qas:1; /* Quick Arbitration and Selection enabled */
|
||||
unsigned int max_qas:1;
|
||||
unsigned int wr_flow:1; /* Write Flow control enabled */
|
||||
unsigned int rd_strm:1; /* Read streaming enabled */
|
||||
unsigned int rti:1; /* Retain Training Information */
|
||||
@@ -77,8 +79,10 @@ struct spi_host_attrs {
|
||||
#define spi_width(x) (((struct spi_transport_attrs *)&(x)->starget_data)->width)
|
||||
#define spi_max_width(x) (((struct spi_transport_attrs *)&(x)->starget_data)->max_width)
|
||||
#define spi_iu(x) (((struct spi_transport_attrs *)&(x)->starget_data)->iu)
|
||||
#define spi_max_iu(x) (((struct spi_transport_attrs *)&(x)->starget_data)->max_iu)
|
||||
#define spi_dt(x) (((struct spi_transport_attrs *)&(x)->starget_data)->dt)
|
||||
#define spi_qas(x) (((struct spi_transport_attrs *)&(x)->starget_data)->qas)
|
||||
#define spi_max_qas(x) (((struct spi_transport_attrs *)&(x)->starget_data)->max_qas)
|
||||
#define spi_wr_flow(x) (((struct spi_transport_attrs *)&(x)->starget_data)->wr_flow)
|
||||
#define spi_rd_strm(x) (((struct spi_transport_attrs *)&(x)->starget_data)->rd_strm)
|
||||
#define spi_rti(x) (((struct spi_transport_attrs *)&(x)->starget_data)->rti)
|
||||
|
||||
Reference in New Issue
Block a user