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

Commit 7c7dc196 authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Simplify handling of ct and els requests 



Remove some redundancies in FC related code and trace:
- drop redundant data from SAN trace (local s_id that only changes
  during link down, ls_code that is already part of payload, d_id in
  ct response trace that is always the same as in ct request trace)
- use one common fsf struct to hold zfcp data for ct and els requests
- leverage common fsf struct for FC passthrough job data, allocate it
  with dd_bsg_data for passthrough requests and unify common code for
  ct and els passthrough request
- simplify callback handling in zfcp_fc

Reviewed-by: default avatarSwen Schillig <swen@vnet.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 800c0cad

drivers/s390/scsi/zfcp_dbf.c

+21 −35
Original line number Original line Diff line number Diff line
@@ -179,7 +179,6 @@ void _zfcp_dbf_hba_fsf_response(const char *tag2, int level, 
	case FSF_QTCB_SEND_ELS:

	case FSF_QTCB_SEND_ELS:

		send_els = (struct zfcp_send_els *)fsf_req->data;

		send_els = (struct zfcp_send_els *)fsf_req->data;

		response->u.els.d_id = ntoh24(qtcb->bottom.support.d_id);

		response->u.els.d_id = ntoh24(qtcb->bottom.support.d_id);

		response->u.els.ls_code = send_els->ls_code >> 24;

		break;

		break;





	case FSF_QTCB_ABORT_FCP_CMND:

	case FSF_QTCB_ABORT_FCP_CMND:
@@ -349,7 +348,6 @@ static void zfcp_dbf_hba_view_response(char **p, 




	case FSF_QTCB_SEND_ELS:

	case FSF_QTCB_SEND_ELS:

		zfcp_dbf_out(p, "d_id", "0x%06x", r->u.els.d_id);

		zfcp_dbf_out(p, "d_id", "0x%06x", r->u.els.d_id);

		zfcp_dbf_out(p, "ls_code", "0x%02x", r->u.els.ls_code);

		break;

		break;





	case FSF_QTCB_ABORT_FCP_CMND:

	case FSF_QTCB_ABORT_FCP_CMND:
@@ -678,12 +676,12 @@ void zfcp_dbf_rec_action(char *id2, struct zfcp_erp_action *erp_action) 
/**

/**

 * zfcp_dbf_san_ct_request - trace event for issued CT request

 * zfcp_dbf_san_ct_request - trace event for issued CT request

 * @fsf_req: request containing issued CT data

 * @fsf_req: request containing issued CT data

 * @d_id: destination id where ct request is sent to

 */

 */

void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *fsf_req)

void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *fsf_req, u32 d_id)

{

{

	struct zfcp_send_ct *ct = (struct zfcp_send_ct *)fsf_req->data;

	struct zfcp_fsf_ct_els *ct = (struct zfcp_fsf_ct_els *)fsf_req->data;

	struct zfcp_fc_wka_port *wka_port = ct->wka_port;

	struct zfcp_adapter *adapter = fsf_req->adapter;

	struct zfcp_adapter *adapter = wka_port->adapter;

	struct zfcp_dbf *dbf = adapter->dbf;

	struct zfcp_dbf *dbf = adapter->dbf;

	struct fc_ct_hdr *hdr = sg_virt(ct->req);

	struct fc_ct_hdr *hdr = sg_virt(ct->req);

	struct zfcp_dbf_san_record *r = &dbf->san_buf;

	struct zfcp_dbf_san_record *r = &dbf->san_buf;
@@ -696,8 +694,7 @@ void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *fsf_req) 
	strncpy(r->tag, "octc", ZFCP_DBF_TAG_SIZE);

	strncpy(r->tag, "octc", ZFCP_DBF_TAG_SIZE);

	r->fsf_reqid = fsf_req->req_id;

	r->fsf_reqid = fsf_req->req_id;

	r->fsf_seqno = fsf_req->seq_no;

	r->fsf_seqno = fsf_req->seq_no;

	r->s_id = fc_host_port_id(adapter->scsi_host);

	oct->d_id = d_id;

	r->d_id = wka_port->d_id;

	oct->cmd_req_code = hdr->ct_cmd;

	oct->cmd_req_code = hdr->ct_cmd;

	oct->revision = hdr->ct_rev;

	oct->revision = hdr->ct_rev;

	oct->gs_type = hdr->ct_fs_type;

	oct->gs_type = hdr->ct_fs_type;
@@ -718,9 +715,8 @@ void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *fsf_req) 
 */

 */

void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *fsf_req)

void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *fsf_req)

{

{

	struct zfcp_send_ct *ct = (struct zfcp_send_ct *)fsf_req->data;

	struct zfcp_fsf_ct_els *ct = (struct zfcp_fsf_ct_els *)fsf_req->data;

	struct zfcp_fc_wka_port *wka_port = ct->wka_port;

	struct zfcp_adapter *adapter = fsf_req->adapter;

	struct zfcp_adapter *adapter = wka_port->adapter;

	struct fc_ct_hdr *hdr = sg_virt(ct->resp);

	struct fc_ct_hdr *hdr = sg_virt(ct->resp);

	struct zfcp_dbf *dbf = adapter->dbf;

	struct zfcp_dbf *dbf = adapter->dbf;

	struct zfcp_dbf_san_record *r = &dbf->san_buf;

	struct zfcp_dbf_san_record *r = &dbf->san_buf;
@@ -733,8 +729,6 @@ void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *fsf_req) 
	strncpy(r->tag, "rctc", ZFCP_DBF_TAG_SIZE);

	strncpy(r->tag, "rctc", ZFCP_DBF_TAG_SIZE);

	r->fsf_reqid = fsf_req->req_id;

	r->fsf_reqid = fsf_req->req_id;

	r->fsf_seqno = fsf_req->seq_no;

	r->fsf_seqno = fsf_req->seq_no;

	r->s_id = wka_port->d_id;

	r->d_id = fc_host_port_id(adapter->scsi_host);

	rct->cmd_rsp_code = hdr->ct_cmd;

	rct->cmd_rsp_code = hdr->ct_cmd;

	rct->revision = hdr->ct_rev;

	rct->revision = hdr->ct_rev;

	rct->reason_code = hdr->ct_reason;

	rct->reason_code = hdr->ct_reason;
@@ -750,8 +744,8 @@ void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *fsf_req) 
}

}





static void zfcp_dbf_san_els(const char *tag, int level,

static void zfcp_dbf_san_els(const char *tag, int level,

			     struct zfcp_fsf_req *fsf_req, u32 s_id, u32 d_id,

			     struct zfcp_fsf_req *fsf_req, u32 d_id,

			     u8 ls_code, void *buffer, int buflen)

			     void *buffer, int buflen)

{

{

	struct zfcp_adapter *adapter = fsf_req->adapter;

	struct zfcp_adapter *adapter = fsf_req->adapter;

	struct zfcp_dbf *dbf = adapter->dbf;

	struct zfcp_dbf *dbf = adapter->dbf;
@@ -763,9 +757,7 @@ static void zfcp_dbf_san_els(const char *tag, int level, 
	strncpy(rec->tag, tag, ZFCP_DBF_TAG_SIZE);

	strncpy(rec->tag, tag, ZFCP_DBF_TAG_SIZE);

	rec->fsf_reqid = fsf_req->req_id;

	rec->fsf_reqid = fsf_req->req_id;

	rec->fsf_seqno = fsf_req->seq_no;

	rec->fsf_seqno = fsf_req->seq_no;

	rec->s_id = s_id;

	rec->u.els.d_id = d_id;

	rec->d_id = d_id;

	rec->u.els.ls_code = ls_code;

	debug_event(dbf->san, level, rec, sizeof(*rec));

	debug_event(dbf->san, level, rec, sizeof(*rec));

	zfcp_dbf_hexdump(dbf->san, rec, sizeof(*rec), level,

	zfcp_dbf_hexdump(dbf->san, rec, sizeof(*rec), level,

			 buffer, min(buflen, ZFCP_DBF_SAN_MAX_PAYLOAD));

			 buffer, min(buflen, ZFCP_DBF_SAN_MAX_PAYLOAD));
@@ -778,11 +770,10 @@ static void zfcp_dbf_san_els(const char *tag, int level, 
 */

 */

void zfcp_dbf_san_els_request(struct zfcp_fsf_req *fsf_req)

void zfcp_dbf_san_els_request(struct zfcp_fsf_req *fsf_req)

{

{

	struct zfcp_send_els *els = (struct zfcp_send_els *)fsf_req->data;

	struct zfcp_fsf_ct_els *els = (struct zfcp_fsf_ct_els *)fsf_req->data;

	u32 d_id = ntoh24(fsf_req->qtcb->bottom.support.d_id);





	zfcp_dbf_san_els("oels", 2, fsf_req,

	zfcp_dbf_san_els("oels", 2, fsf_req, d_id,

			       fc_host_port_id(els->adapter->scsi_host),

			       els->d_id, *(u8 *) sg_virt(els->req),

			 sg_virt(els->req), els->req->length);

			 sg_virt(els->req), els->req->length);

}

}
@@ -792,12 +783,11 @@ void zfcp_dbf_san_els_request(struct zfcp_fsf_req *fsf_req) 
 */

 */

void zfcp_dbf_san_els_response(struct zfcp_fsf_req *fsf_req)

void zfcp_dbf_san_els_response(struct zfcp_fsf_req *fsf_req)

{

{

	struct zfcp_send_els *els = (struct zfcp_send_els *)fsf_req->data;

	struct zfcp_fsf_ct_els *els = (struct zfcp_fsf_ct_els *)fsf_req->data;

	u32 d_id = ntoh24(fsf_req->qtcb->bottom.support.d_id);





	zfcp_dbf_san_els("rels", 2, fsf_req, els->d_id,

	zfcp_dbf_san_els("rels", 2, fsf_req, d_id,

			       fc_host_port_id(els->adapter->scsi_host),

			       sg_virt(els->resp), els->resp->length);

			       *(u8 *)sg_virt(els->req), sg_virt(els->resp),

			       els->resp->length);

}

}





/**

/**
@@ -806,16 +796,13 @@ void zfcp_dbf_san_els_response(struct zfcp_fsf_req *fsf_req) 
 */

 */

void zfcp_dbf_san_incoming_els(struct zfcp_fsf_req *fsf_req)

void zfcp_dbf_san_incoming_els(struct zfcp_fsf_req *fsf_req)

{

{

	struct zfcp_adapter *adapter = fsf_req->adapter;

	struct fsf_status_read_buffer *buf =

	struct fsf_status_read_buffer *buf =

			(struct fsf_status_read_buffer *)fsf_req->data;

			(struct fsf_status_read_buffer *)fsf_req->data;

	int length = (int)buf->length -

	int length = (int)buf->length -

		     (int)((void *)&buf->payload - (void *)buf);

		     (int)((void *)&buf->payload - (void *)buf);





	zfcp_dbf_san_els("iels", 1, fsf_req, ntoh24(buf->d_id),

	zfcp_dbf_san_els("iels", 1, fsf_req, ntoh24(buf->d_id),

			       fc_host_port_id(adapter->scsi_host),

			       (void *)buf->payload.data, length);

			       buf->payload.data[0], (void *)buf->payload.data,

			       length);

}

}





static int zfcp_dbf_san_view_format(debug_info_t *id, struct debug_view *view,

static int zfcp_dbf_san_view_format(debug_info_t *id, struct debug_view *view,
@@ -830,11 +817,10 @@ static int zfcp_dbf_san_view_format(debug_info_t *id, struct debug_view *view, 
	zfcp_dbf_tag(&p, "tag", r->tag);

	zfcp_dbf_tag(&p, "tag", r->tag);

	zfcp_dbf_out(&p, "fsf_reqid", "0x%0Lx", r->fsf_reqid);

	zfcp_dbf_out(&p, "fsf_reqid", "0x%0Lx", r->fsf_reqid);

	zfcp_dbf_out(&p, "fsf_seqno", "0x%08x", r->fsf_seqno);

	zfcp_dbf_out(&p, "fsf_seqno", "0x%08x", r->fsf_seqno);

	zfcp_dbf_out(&p, "s_id", "0x%06x", r->s_id);

	zfcp_dbf_out(&p, "d_id", "0x%06x", r->d_id);





	if (strncmp(r->tag, "octc", ZFCP_DBF_TAG_SIZE) == 0) {

	if (strncmp(r->tag, "octc", ZFCP_DBF_TAG_SIZE) == 0) {

		struct zfcp_dbf_san_record_ct_request *ct = &r->u.ct_req;

		struct zfcp_dbf_san_record_ct_request *ct = &r->u.ct_req;

		zfcp_dbf_out(&p, "d_id", "0x%06x", ct->d_id);

		zfcp_dbf_out(&p, "cmd_req_code", "0x%04x", ct->cmd_req_code);

		zfcp_dbf_out(&p, "cmd_req_code", "0x%04x", ct->cmd_req_code);

		zfcp_dbf_out(&p, "revision", "0x%02x", ct->revision);

		zfcp_dbf_out(&p, "revision", "0x%02x", ct->revision);

		zfcp_dbf_out(&p, "gs_type", "0x%02x", ct->gs_type);

		zfcp_dbf_out(&p, "gs_type", "0x%02x", ct->gs_type);
@@ -853,7 +839,7 @@ static int zfcp_dbf_san_view_format(debug_info_t *id, struct debug_view *view, 
		   strncmp(r->tag, "rels", ZFCP_DBF_TAG_SIZE) == 0 ||

		   strncmp(r->tag, "rels", ZFCP_DBF_TAG_SIZE) == 0 ||

		   strncmp(r->tag, "iels", ZFCP_DBF_TAG_SIZE) == 0) {

		   strncmp(r->tag, "iels", ZFCP_DBF_TAG_SIZE) == 0) {

		struct zfcp_dbf_san_record_els *els = &r->u.els;

		struct zfcp_dbf_san_record_els *els = &r->u.els;

		zfcp_dbf_out(&p, "ls_code", "0x%02x", els->ls_code);

		zfcp_dbf_out(&p, "d_id", "0x%06x", els->d_id);

	}

	}

	return p - out_buf;

	return p - out_buf;

}

}

drivers/s390/scsi/zfcp_dbf.h

+2 −5
Original line number Original line Diff line number Diff line
@@ -123,7 +123,6 @@ struct zfcp_dbf_hba_record_response { 
		} unit;

		} unit;

		struct {

		struct {

			u32 d_id;

			u32 d_id;

			u8 ls_code;

		} els;

		} els;

	} u;

	} u;

} __attribute__ ((packed));

} __attribute__ ((packed));
@@ -167,6 +166,7 @@ struct zfcp_dbf_san_record_ct_request { 
	u8 options;

	u8 options;

	u16 max_res_size;

	u16 max_res_size;

	u32 len;

	u32 len;

	u32 d_id;

} __attribute__ ((packed));

} __attribute__ ((packed));





struct zfcp_dbf_san_record_ct_response {

struct zfcp_dbf_san_record_ct_response {
@@ -180,16 +180,13 @@ struct zfcp_dbf_san_record_ct_response { 
} __attribute__ ((packed));

} __attribute__ ((packed));





struct zfcp_dbf_san_record_els {

struct zfcp_dbf_san_record_els {

	u8 ls_code;

	u32 d_id;

	u32 len;

} __attribute__ ((packed));

} __attribute__ ((packed));





struct zfcp_dbf_san_record {

struct zfcp_dbf_san_record {

	u8 tag[ZFCP_DBF_TAG_SIZE];

	u8 tag[ZFCP_DBF_TAG_SIZE];

	u64 fsf_reqid;

	u64 fsf_reqid;

	u32 fsf_seqno;

	u32 fsf_seqno;

	u32 s_id;

	u32 d_id;

	union {

	union {

		struct zfcp_dbf_san_record_ct_request ct_req;

		struct zfcp_dbf_san_record_ct_request ct_req;

		struct zfcp_dbf_san_record_ct_response ct_resp;

		struct zfcp_dbf_san_record_ct_response ct_resp;

drivers/s390/scsi/zfcp_def.h

+0 −46
Original line number Original line Diff line number Diff line
@@ -132,52 +132,6 @@ struct zfcp_adapter_mempool { 
	mempool_t *qtcb_pool;

	mempool_t *qtcb_pool;

};

};





/**

 * struct zfcp_send_ct - used to pass parameters to function zfcp_fsf_send_ct

 * @wka_port: port where the request is sent to

 * @req: scatter-gather list for request

 * @resp: scatter-gather list for response

 * @handler: handler function (called for response to the request)

 * @handler_data: data passed to handler function

 * @completion: completion for synchronization purposes

 * @status: used to pass error status to calling function

 */

struct zfcp_send_ct {

	struct zfcp_fc_wka_port *wka_port;

	struct scatterlist *req;

	struct scatterlist *resp;

	void (*handler)(unsigned long);

	unsigned long handler_data;

	struct completion *completion;

	int status;

};



/**

 * struct zfcp_send_els - used to pass parameters to function zfcp_fsf_send_els

 * @adapter: adapter where request is sent from

 * @port: port where ELS is destinated (port reference count has to be increased)

 * @d_id: destiniation id of port where request is sent to

 * @req: scatter-gather list for request

 * @resp: scatter-gather list for response

 * @handler: handler function (called for response to the request)

 * @handler_data: data passed to handler function

 * @completion: completion for synchronization purposes

 * @ls_code: hex code of ELS command

 * @status: used to pass error status to calling function

 */

struct zfcp_send_els {

	struct zfcp_adapter *adapter;

	struct zfcp_port *port;

	u32 d_id;

	struct scatterlist *req;

	struct scatterlist *resp;

	void (*handler)(unsigned long);

	unsigned long handler_data;

	struct completion *completion;

	int ls_code;

	int status;

};



struct zfcp_qdio_queue {

struct zfcp_qdio_queue {

	struct qdio_buffer *sbal[QDIO_MAX_BUFFERS_PER_Q];

	struct qdio_buffer *sbal[QDIO_MAX_BUFFERS_PER_Q];

	u8		   first;	/* index of next free bfr in queue */

	u8		   first;	/* index of next free bfr in queue */

drivers/s390/scsi/zfcp_ext.h

+7 −5
Original line number Original line Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/types.h>

#include <linux/types.h>

#include <scsi/fc/fc_els.h>

#include <scsi/fc/fc_els.h>

#include "zfcp_def.h"

#include "zfcp_def.h"

#include "zfcp_fc.h"





/* zfcp_aux.c */

/* zfcp_aux.c */

extern struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *, u64);

extern struct zfcp_unit *zfcp_get_unit_by_lun(struct zfcp_port *, u64);
@@ -55,7 +56,7 @@ extern void _zfcp_dbf_hba_fsf_unsol(const char *, int level, struct zfcp_dbf *, 
					  struct fsf_status_read_buffer *);

					  struct fsf_status_read_buffer *);

extern void zfcp_dbf_hba_qdio(struct zfcp_dbf *, unsigned int, int, int);

extern void zfcp_dbf_hba_qdio(struct zfcp_dbf *, unsigned int, int, int);

extern void zfcp_dbf_hba_berr(struct zfcp_dbf *, struct zfcp_fsf_req *);

extern void zfcp_dbf_hba_berr(struct zfcp_dbf *, struct zfcp_fsf_req *);

extern void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *);

extern void zfcp_dbf_san_ct_request(struct zfcp_fsf_req *, u32);

extern void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *);

extern void zfcp_dbf_san_ct_response(struct zfcp_fsf_req *);

extern void zfcp_dbf_san_els_request(struct zfcp_fsf_req *);

extern void zfcp_dbf_san_els_request(struct zfcp_fsf_req *);

extern void zfcp_dbf_san_els_response(struct zfcp_fsf_req *);

extern void zfcp_dbf_san_els_response(struct zfcp_fsf_req *);
@@ -106,8 +107,7 @@ extern void zfcp_fc_link_test_work(struct work_struct *); 
extern void zfcp_fc_wka_ports_force_offline(struct zfcp_fc_wka_ports *);

extern void zfcp_fc_wka_ports_force_offline(struct zfcp_fc_wka_ports *);

extern int zfcp_fc_gs_setup(struct zfcp_adapter *);

extern int zfcp_fc_gs_setup(struct zfcp_adapter *);

extern void zfcp_fc_gs_destroy(struct zfcp_adapter *);

extern void zfcp_fc_gs_destroy(struct zfcp_adapter *);

extern int zfcp_fc_execute_els_fc_job(struct fc_bsg_job *);

extern int zfcp_fc_exec_bsg_job(struct fc_bsg_job *);

extern int zfcp_fc_execute_ct_fc_job(struct fc_bsg_job *);





/* zfcp_fsf.c */

/* zfcp_fsf.c */

extern int zfcp_fsf_open_port(struct zfcp_erp_action *);

extern int zfcp_fsf_open_port(struct zfcp_erp_action *);
@@ -128,8 +128,10 @@ extern struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *, 
extern void zfcp_fsf_req_dismiss_all(struct zfcp_adapter *);

extern void zfcp_fsf_req_dismiss_all(struct zfcp_adapter *);

extern int zfcp_fsf_status_read(struct zfcp_qdio *);

extern int zfcp_fsf_status_read(struct zfcp_qdio *);

extern int zfcp_status_read_refill(struct zfcp_adapter *adapter);

extern int zfcp_status_read_refill(struct zfcp_adapter *adapter);

extern int zfcp_fsf_send_ct(struct zfcp_send_ct *, mempool_t *);

extern int zfcp_fsf_send_ct(struct zfcp_fc_wka_port *, struct zfcp_fsf_ct_els *,

extern int zfcp_fsf_send_els(struct zfcp_send_els *);

			    mempool_t *);

extern int zfcp_fsf_send_els(struct zfcp_adapter *, u32,

			     struct zfcp_fsf_ct_els *);

extern int zfcp_fsf_send_fcp_command_task(struct zfcp_unit *,

extern int zfcp_fsf_send_fcp_command_task(struct zfcp_unit *,

					  struct scsi_cmnd *);

					  struct scsi_cmnd *);

extern void zfcp_fsf_req_free(struct zfcp_fsf_req *);

extern void zfcp_fsf_req_free(struct zfcp_fsf_req *);

drivers/s390/scsi/zfcp_fc.c

+92 −161
Original line number Original line Diff line number Diff line
@@ -22,12 +22,6 @@ static u32 zfcp_fc_rscn_range_mask[] = { 
	[ELS_ADDR_FMT_FAB]		= 0x000000,

	[ELS_ADDR_FMT_FAB]		= 0x000000,

};

};





struct zfcp_fc_ns_handler_data {

	struct completion done;

	void (*handler)(unsigned long);

	unsigned long handler_data;

};



static int zfcp_fc_wka_port_get(struct zfcp_fc_wka_port *wka_port)

static int zfcp_fc_wka_port_get(struct zfcp_fc_wka_port *wka_port)

{

{

	if (mutex_lock_interruptible(&wka_port->mutex))

	if (mutex_lock_interruptible(&wka_port->mutex))
@@ -211,21 +205,10 @@ void zfcp_fc_incoming_els(struct zfcp_fsf_req *fsf_req) 
		zfcp_fc_incoming_rscn(fsf_req);

		zfcp_fc_incoming_rscn(fsf_req);

}

}





static void zfcp_fc_ns_handler(unsigned long data)

static void zfcp_fc_ns_gid_pn_eval(void *data)

{

	struct zfcp_fc_ns_handler_data *compl_rec =

			(struct zfcp_fc_ns_handler_data *) data;



	if (compl_rec->handler)

		compl_rec->handler(compl_rec->handler_data);



	complete(&compl_rec->done);

}



static void zfcp_fc_ns_gid_pn_eval(unsigned long data)

{

{

	struct zfcp_fc_gid_pn *gid_pn = (struct zfcp_fc_gid_pn *) data;

	struct zfcp_fc_gid_pn *gid_pn = data;

	struct zfcp_send_ct *ct = &gid_pn->ct;

	struct zfcp_fsf_ct_els *ct = &gid_pn->ct;

	struct zfcp_fc_gid_pn_req *gid_pn_req = sg_virt(ct->req);

	struct zfcp_fc_gid_pn_req *gid_pn_req = sg_virt(ct->req);

	struct zfcp_fc_gid_pn_resp *gid_pn_resp = sg_virt(ct->resp);

	struct zfcp_fc_gid_pn_resp *gid_pn_resp = sg_virt(ct->resp);

	struct zfcp_port *port = gid_pn->port;

	struct zfcp_port *port = gid_pn->port;
@@ -242,18 +225,22 @@ static void zfcp_fc_ns_gid_pn_eval(unsigned long data) 
	port->d_id = ntoh24(gid_pn_resp->gid_pn.fp_fid);

	port->d_id = ntoh24(gid_pn_resp->gid_pn.fp_fid);

}

}





static void zfcp_fc_complete(void *data)

{

	complete(data);

}



static int zfcp_fc_ns_gid_pn_request(struct zfcp_port *port,

static int zfcp_fc_ns_gid_pn_request(struct zfcp_port *port,

				     struct zfcp_fc_gid_pn *gid_pn)

				     struct zfcp_fc_gid_pn *gid_pn)

{

{

	struct zfcp_adapter *adapter = port->adapter;

	struct zfcp_adapter *adapter = port->adapter;

	struct zfcp_fc_ns_handler_data compl_rec;

	DECLARE_COMPLETION_ONSTACK(completion);

	int ret;

	int ret;





	/* setup parameters for send generic command */

	/* setup parameters for send generic command */

	gid_pn->port = port;

	gid_pn->port = port;

	gid_pn->ct.wka_port = &adapter->gs->ds;

	gid_pn->ct.handler = zfcp_fc_complete;

	gid_pn->ct.handler = zfcp_fc_ns_handler;

	gid_pn->ct.handler_data = &completion;

	gid_pn->ct.handler_data = (unsigned long) &compl_rec;

	gid_pn->ct.req = &gid_pn->sg_req;

	gid_pn->ct.req = &gid_pn->sg_req;

	gid_pn->ct.resp = &gid_pn->sg_resp;

	gid_pn->ct.resp = &gid_pn->sg_resp;

	sg_init_one(&gid_pn->sg_req, &gid_pn->gid_pn_req,

	sg_init_one(&gid_pn->sg_req, &gid_pn->gid_pn_req,
@@ -270,12 +257,12 @@ static int zfcp_fc_ns_gid_pn_request(struct zfcp_port *port, 
	gid_pn->gid_pn_req.ct_hdr.ct_mr_size = ZFCP_FC_CT_SIZE_PAGE / 4;

	gid_pn->gid_pn_req.ct_hdr.ct_mr_size = ZFCP_FC_CT_SIZE_PAGE / 4;

	gid_pn->gid_pn_req.gid_pn.fn_wwpn = port->wwpn;

	gid_pn->gid_pn_req.gid_pn.fn_wwpn = port->wwpn;





	init_completion(&compl_rec.done);

	ret = zfcp_fsf_send_ct(&adapter->gs->ds, &gid_pn->ct,

	compl_rec.handler = zfcp_fc_ns_gid_pn_eval;

			       adapter->pool.gid_pn_req);

	compl_rec.handler_data = (unsigned long) gid_pn;

	if (!ret) {

	ret = zfcp_fsf_send_ct(&gid_pn->ct, adapter->pool.gid_pn_req);

		wait_for_completion(&completion);

	if (!ret)

		zfcp_fc_ns_gid_pn_eval(gid_pn);

		wait_for_completion(&compl_rec.done);

	}

	return ret;

	return ret;

}

}
@@ -374,9 +361,9 @@ void zfcp_fc_plogi_evaluate(struct zfcp_port *port, struct fc_els_flogi *plogi) 
		port->supported_classes |= FC_COS_CLASS4;

		port->supported_classes |= FC_COS_CLASS4;

}

}





static void zfcp_fc_adisc_handler(unsigned long data)

static void zfcp_fc_adisc_handler(void *data)

{

{

	struct zfcp_fc_els_adisc *adisc = (struct zfcp_fc_els_adisc *) data;

	struct zfcp_fc_els_adisc *adisc = data;

	struct zfcp_port *port = adisc->els.port;

	struct zfcp_port *port = adisc->els.port;

	struct fc_els_adisc *adisc_resp = &adisc->adisc_resp;

	struct fc_els_adisc *adisc_resp = &adisc->adisc_resp;
@@ -414,6 +401,7 @@ static int zfcp_fc_adisc(struct zfcp_port *port) 
	if (!adisc)

	if (!adisc)

		return -ENOMEM;

		return -ENOMEM;





	adisc->els.port = port;

	adisc->els.req = &adisc->req;

	adisc->els.req = &adisc->req;

	adisc->els.resp = &adisc->resp;

	adisc->els.resp = &adisc->resp;

	sg_init_one(adisc->els.req, &adisc->adisc_req,

	sg_init_one(adisc->els.req, &adisc->adisc_req,
@@ -421,21 +409,18 @@ static int zfcp_fc_adisc(struct zfcp_port *port) 
	sg_init_one(adisc->els.resp, &adisc->adisc_resp,

	sg_init_one(adisc->els.resp, &adisc->adisc_resp,

		    sizeof(struct fc_els_adisc));

		    sizeof(struct fc_els_adisc));





	adisc->els.adapter = adapter;

	adisc->els.port = port;

	adisc->els.d_id = port->d_id;

	adisc->els.handler = zfcp_fc_adisc_handler;

	adisc->els.handler = zfcp_fc_adisc_handler;

	adisc->els.handler_data = (unsigned long) adisc;

	adisc->els.handler_data = adisc;

	adisc->els.ls_code = adisc->adisc_req.adisc_cmd = ELS_ADISC;





	/* acc. to FC-FS, hard_nport_id in ADISC should not be set for ports

	/* acc. to FC-FS, hard_nport_id in ADISC should not be set for ports

	   without FC-AL-2 capability, so we don't set it */

	   without FC-AL-2 capability, so we don't set it */

	adisc->adisc_req.adisc_wwpn = fc_host_port_name(adapter->scsi_host);

	adisc->adisc_req.adisc_wwpn = fc_host_port_name(adapter->scsi_host);

	adisc->adisc_req.adisc_wwnn = fc_host_node_name(adapter->scsi_host);

	adisc->adisc_req.adisc_wwnn = fc_host_node_name(adapter->scsi_host);

	adisc->adisc_req.adisc_cmd = ELS_ADISC;

	hton24(adisc->adisc_req.adisc_port_id,

	hton24(adisc->adisc_req.adisc_port_id,

	       fc_host_port_id(adapter->scsi_host));

	       fc_host_port_id(adapter->scsi_host));





	return zfcp_fsf_send_els(&adisc->els);

	return zfcp_fsf_send_els(adapter, port->d_id, &adisc->els);

}

}





void zfcp_fc_link_test_work(struct work_struct *work)

void zfcp_fc_link_test_work(struct work_struct *work)
@@ -520,9 +505,9 @@ static struct zfcp_fc_gpn_ft *zfcp_alloc_sg_env(int buf_num) 
static int zfcp_fc_send_gpn_ft(struct zfcp_fc_gpn_ft *gpn_ft,

static int zfcp_fc_send_gpn_ft(struct zfcp_fc_gpn_ft *gpn_ft,

			       struct zfcp_adapter *adapter, int max_bytes)

			       struct zfcp_adapter *adapter, int max_bytes)

{

{

	struct zfcp_send_ct *ct = &gpn_ft->ct;

	struct zfcp_fsf_ct_els *ct = &gpn_ft->ct;

	struct zfcp_fc_gpn_ft_req *req = sg_virt(&gpn_ft->sg_req);

	struct zfcp_fc_gpn_ft_req *req = sg_virt(&gpn_ft->sg_req);

	struct zfcp_fc_ns_handler_data compl_rec;

	DECLARE_COMPLETION_ONSTACK(completion);

	int ret;

	int ret;





	/* prepare CT IU for GPN_FT */

	/* prepare CT IU for GPN_FT */
@@ -537,17 +522,14 @@ static int zfcp_fc_send_gpn_ft(struct zfcp_fc_gpn_ft *gpn_ft, 
	req->gpn_ft.fn_fc4_type = FC_TYPE_FCP;

	req->gpn_ft.fn_fc4_type = FC_TYPE_FCP;





	/* prepare zfcp_send_ct */

	/* prepare zfcp_send_ct */

	ct->wka_port = &adapter->gs->ds;

	ct->handler = zfcp_fc_complete;

	ct->handler = zfcp_fc_ns_handler;

	ct->handler_data = &completion;

	ct->handler_data = (unsigned long)&compl_rec;

	ct->req = &gpn_ft->sg_req;

	ct->req = &gpn_ft->sg_req;

	ct->resp = gpn_ft->sg_resp;

	ct->resp = gpn_ft->sg_resp;





	init_completion(&compl_rec.done);

	ret = zfcp_fsf_send_ct(&adapter->gs->ds, ct, NULL);

	compl_rec.handler = NULL;

	ret = zfcp_fsf_send_ct(ct, NULL);

	if (!ret)

	if (!ret)

		wait_for_completion(&compl_rec.done);

		wait_for_completion(&completion);

	return ret;

	return ret;

}

}
@@ -565,13 +547,13 @@ static void zfcp_fc_validate_port(struct zfcp_port *port, struct list_head *lh) 
	list_move_tail(&port->list, lh);

	list_move_tail(&port->list, lh);

}

}





static int zfcp_fc_eval_gpn_ft(struct zfcp_fc_gpn_ft *gpn_ft, int max_entries)

static int zfcp_fc_eval_gpn_ft(struct zfcp_fc_gpn_ft *gpn_ft,

			       struct zfcp_adapter *adapter, int max_entries)

{

{

	struct zfcp_send_ct *ct = &gpn_ft->ct;

	struct zfcp_fsf_ct_els *ct = &gpn_ft->ct;

	struct scatterlist *sg = gpn_ft->sg_resp;

	struct scatterlist *sg = gpn_ft->sg_resp;

	struct fc_ct_hdr *hdr = sg_virt(sg);

	struct fc_ct_hdr *hdr = sg_virt(sg);

	struct fc_gpn_ft_resp *acc = sg_virt(sg);

	struct fc_gpn_ft_resp *acc = sg_virt(sg);

	struct zfcp_adapter *adapter = ct->wka_port->adapter;

	struct zfcp_port *port, *tmp;

	struct zfcp_port *port, *tmp;

	unsigned long flags;

	unsigned long flags;

	LIST_HEAD(remove_lh);

	LIST_HEAD(remove_lh);
@@ -665,7 +647,7 @@ void zfcp_fc_scan_ports(struct work_struct *work) 
	for (i = 0; i < 3; i++) {

	for (i = 0; i < 3; i++) {

		ret = zfcp_fc_send_gpn_ft(gpn_ft, adapter, max_bytes);

		ret = zfcp_fc_send_gpn_ft(gpn_ft, adapter, max_bytes);

		if (!ret) {

		if (!ret) {

			ret = zfcp_fc_eval_gpn_ft(gpn_ft, max_entries);

			ret = zfcp_fc_eval_gpn_ft(gpn_ft, adapter, max_entries);

			if (ret == -EAGAIN)

			if (ret == -EAGAIN)

				ssleep(1);

				ssleep(1);

			else

			else
@@ -677,158 +659,107 @@ void zfcp_fc_scan_ports(struct work_struct *work) 
	zfcp_fc_wka_port_put(&adapter->gs->ds);

	zfcp_fc_wka_port_put(&adapter->gs->ds);

}

}







static void zfcp_fc_ct_els_job_handler(void *data)

struct zfcp_els_fc_job {

	struct zfcp_send_els els;

	struct fc_bsg_job *job;

};



static void zfcp_fc_generic_els_handler(unsigned long data)

{

{

	struct zfcp_els_fc_job *els_fc_job = (struct zfcp_els_fc_job *) data;

	struct fc_bsg_job *job = data;

	struct fc_bsg_job *job = els_fc_job->job;

	struct zfcp_fsf_ct_els *zfcp_ct_els = job->dd_data;

	struct fc_bsg_reply *reply = job->reply;

	int status = zfcp_ct_els->status;

	int reply_status;





	if (els_fc_job->els.status) {

	reply_status = status ? FC_CTELS_STATUS_REJECT : FC_CTELS_STATUS_OK;

		/* request rejected or timed out */

	job->reply->reply_data.ctels_reply.status = reply_status;

		reply->reply_data.ctels_reply.status = FC_CTELS_STATUS_REJECT;

	job->reply->reply_payload_rcv_len = job->reply_payload.payload_len;

		goto out;

	}



	reply->reply_data.ctels_reply.status = FC_CTELS_STATUS_OK;

	reply->reply_payload_rcv_len = job->reply_payload.payload_len;



out:

	job->state_flags = FC_RQST_STATE_DONE;

	job->job_done(job);

	job->job_done(job);

	kfree(els_fc_job);

}

}





int zfcp_fc_execute_els_fc_job(struct fc_bsg_job *job)

static int zfcp_fc_exec_els_job(struct fc_bsg_job *job,

				struct zfcp_adapter *adapter)

{

{

	struct zfcp_els_fc_job *els_fc_job;

	struct zfcp_fsf_ct_els *els = job->dd_data;

	struct fc_rport *rport = job->rport;

	struct fc_rport *rport = job->rport;

	struct Scsi_Host *shost;

	struct zfcp_adapter *adapter;

	struct zfcp_port *port;

	struct zfcp_port *port;

	u8 *port_did;

	u32 d_id;



	shost = rport ? rport_to_shost(rport) : job->shost;

	adapter = (struct zfcp_adapter *)shost->hostdata[0];



	if (!(atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_OPEN))

		return -EINVAL;



	els_fc_job = kzalloc(sizeof(struct zfcp_els_fc_job), GFP_KERNEL);

	if (!els_fc_job)

		return -ENOMEM;





	els_fc_job->els.adapter = adapter;

	if (rport) {

	if (rport) {

		port = zfcp_get_port_by_wwpn(adapter, rport->port_name);

		port = zfcp_get_port_by_wwpn(adapter, rport->port_name);

		if (!port) {

		if (!port)

			kfree(els_fc_job);

			return -EINVAL;

			return -EINVAL;

		}





		els_fc_job->els.d_id = port->d_id;

		d_id = port->d_id;

		put_device(&port->sysfs_device);

		put_device(&port->sysfs_device);

	} else {

	} else

		port_did = job->request->rqst_data.h_els.port_id;

		d_id = ntoh24(job->request->rqst_data.h_els.port_id);

		els_fc_job->els.d_id = (port_did[0] << 16) +

					(port_did[1] << 8) + port_did[2];

	}



	els_fc_job->els.req = job->request_payload.sg_list;

	els_fc_job->els.resp = job->reply_payload.sg_list;

	els_fc_job->els.handler = zfcp_fc_generic_els_handler;

	els_fc_job->els.handler_data = (unsigned long) els_fc_job;

	els_fc_job->job = job;





	return zfcp_fsf_send_els(&els_fc_job->els);

	return zfcp_fsf_send_els(adapter, d_id, els);

}

}





struct zfcp_ct_fc_job {

static int zfcp_fc_exec_ct_job(struct fc_bsg_job *job,

	struct zfcp_send_ct ct;

			       struct zfcp_adapter *adapter)

	struct fc_bsg_job *job;

};



static void zfcp_fc_generic_ct_handler(unsigned long data)

{

	struct zfcp_ct_fc_job *ct_fc_job = (struct zfcp_ct_fc_job *) data;

	struct fc_bsg_job *job = ct_fc_job->job;



	job->reply->reply_data.ctels_reply.status = ct_fc_job->ct.status ?

				FC_CTELS_STATUS_REJECT : FC_CTELS_STATUS_OK;

	job->reply->reply_payload_rcv_len = job->reply_payload.payload_len;

	job->state_flags = FC_RQST_STATE_DONE;

	job->job_done(job);



	zfcp_fc_wka_port_put(ct_fc_job->ct.wka_port);



	kfree(ct_fc_job);

}



int zfcp_fc_execute_ct_fc_job(struct fc_bsg_job *job)

{

{

	int ret;

	int ret;

	u8 gs_type;

	u8 gs_type;

	struct fc_rport *rport = job->rport;

	struct zfcp_fsf_ct_els *ct = job->dd_data;

	struct Scsi_Host *shost;

	struct zfcp_fc_wka_port *wka_port;

	struct zfcp_adapter *adapter;

	struct zfcp_ct_fc_job *ct_fc_job;

	u32 preamble_word1;

	u32 preamble_word1;





	shost = rport ? rport_to_shost(rport) : job->shost;



	adapter = (struct zfcp_adapter *)shost->hostdata[0];

	if (!(atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_OPEN))

		return -EINVAL;



	ct_fc_job = kzalloc(sizeof(struct zfcp_ct_fc_job), GFP_KERNEL);

	if (!ct_fc_job)

		return -ENOMEM;



	preamble_word1 = job->request->rqst_data.r_ct.preamble_word1;

	preamble_word1 = job->request->rqst_data.r_ct.preamble_word1;

	gs_type = (preamble_word1 & 0xff000000) >> 24;

	gs_type = (preamble_word1 & 0xff000000) >> 24;





	switch (gs_type) {

	switch (gs_type) {

	case FC_FST_ALIAS:

	case FC_FST_ALIAS:

		ct_fc_job->ct.wka_port = &adapter->gs->as;

		wka_port = &adapter->gs->as;

		break;

		break;

	case FC_FST_MGMT:

	case FC_FST_MGMT:

		ct_fc_job->ct.wka_port = &adapter->gs->ms;

		wka_port = &adapter->gs->ms;

		break;

		break;

	case FC_FST_TIME:

	case FC_FST_TIME:

		ct_fc_job->ct.wka_port = &adapter->gs->ts;

		wka_port = &adapter->gs->ts;

		break;

		break;

	case FC_FST_DIR:

	case FC_FST_DIR:

		ct_fc_job->ct.wka_port = &adapter->gs->ds;

		wka_port = &adapter->gs->ds;

		break;

		break;

	default:

	default:

		kfree(ct_fc_job);

		return -EINVAL; /* no such service */

		return -EINVAL; /* no such service */

	}

	}





	ret = zfcp_fc_wka_port_get(ct_fc_job->ct.wka_port);

	ret = zfcp_fc_wka_port_get(wka_port);

	if (ret) {

	if (ret)

		kfree(ct_fc_job);

		return ret;



	ret = zfcp_fsf_send_ct(wka_port, ct, NULL);

	if (ret)

		zfcp_fc_wka_port_put(wka_port);



	return ret;

	return ret;

}

}





	ct_fc_job->ct.req = job->request_payload.sg_list;

int zfcp_fc_exec_bsg_job(struct fc_bsg_job *job)

	ct_fc_job->ct.resp = job->reply_payload.sg_list;

{

	ct_fc_job->ct.handler = zfcp_fc_generic_ct_handler;

	struct Scsi_Host *shost;

	ct_fc_job->ct.handler_data = (unsigned long) ct_fc_job;

	struct zfcp_adapter *adapter;

	ct_fc_job->ct.completion = NULL;

	struct zfcp_fsf_ct_els *ct_els = job->dd_data;

	ct_fc_job->job = job;





	ret = zfcp_fsf_send_ct(&ct_fc_job->ct, NULL);

	shost = job->rport ? rport_to_shost(job->rport) : job->shost;

	if (ret) {

	adapter = (struct zfcp_adapter *)shost->hostdata[0];

		kfree(ct_fc_job);



		zfcp_fc_wka_port_put(ct_fc_job->ct.wka_port);

	if (!(atomic_read(&adapter->status) & ZFCP_STATUS_COMMON_OPEN))

		return -EINVAL;



	ct_els->req = job->request_payload.sg_list;

	ct_els->resp = job->reply_payload.sg_list;

	ct_els->handler = zfcp_fc_ct_els_job_handler;

	ct_els->handler_data = job;



	switch (job->request->msgcode) {

	case FC_BSG_RPT_ELS:

	case FC_BSG_HST_ELS_NOLOGIN:

		return zfcp_fc_exec_els_job(job, adapter);

	case FC_BSG_RPT_CT:

	case FC_BSG_HST_CT:

		return zfcp_fc_exec_ct_job(job, adapter);

	default:

		return -EINVAL;

	}

	}

	return ret;

}

}





int zfcp_fc_gs_setup(struct zfcp_adapter *adapter)

int zfcp_fc_gs_setup(struct zfcp_adapter *adapter)