Skip to content

L
linux-davinci
Commit 9fb9d328 authored by Joe Eykholt's avatar Joe Eykholt Committed by James Bottomley
Browse files
Options

[SCSI] libfc: make fc_rport_priv the primary rport interface. 

The rport and discovery modules deal with remote ports
before fc_remote_port_add() can be done, because the
full set of rport identifiers is not known at early stages.

In preparation for splitting the fc_rport/fc_rport_priv allocation,
make fc_rport_priv the primary interface for the remote port and
discovery engines.

The FCP / SCSI layers still deal with fc_rport and
fc_rport_libfc_priv, however.
Signed-off-by: default avatarJoe Eykholt <jeykholt@cisco.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 922aa210
Hide whitespace changes
Inline Side-by-side
Showing with 245 additions and 279 deletions
drivers/scsi/libfc/fc_disc.c
View file @ 9fb9d328
...@@ -49,7 +49,6 @@ static void fc_disc_gpn_ft_req(struct fc_disc *); ...@@ -49,7 +49,6 @@ static void fc_disc_gpn_ft_req(struct fc_disc *);
static void fc_disc_gpn_ft_resp(struct fc_seq *, struct fc_frame *, void *); static void fc_disc_gpn_ft_resp(struct fc_seq *, struct fc_frame *, void *);
static int fc_disc_new_target(struct fc_disc *, struct fc_rport *, static int fc_disc_new_target(struct fc_disc *, struct fc_rport *,
struct fc_rport_identifiers *); struct fc_rport_identifiers *);
static void fc_disc_del_target(struct fc_disc *, struct fc_rport *);
static void fc_disc_done(struct fc_disc *); static void fc_disc_done(struct fc_disc *);
static void fc_disc_timeout(struct work_struct *); static void fc_disc_timeout(struct work_struct *);
static void fc_disc_single(struct fc_disc *, struct fc_disc_port *); static void fc_disc_single(struct fc_disc *, struct fc_disc_port *);
...@@ -60,27 +59,19 @@ static void fc_disc_restart(struct fc_disc *); ...@@ -60,27 +59,19 @@ static void fc_disc_restart(struct fc_disc *);
* @lport: Fibre Channel host port instance * @lport: Fibre Channel host port instance
* @port_id: remote port port_id to match * @port_id: remote port port_id to match
*/ */
struct fc_rport *fc_disc_lookup_rport(const struct fc_lport *lport, struct fc_rport_priv *fc_disc_lookup_rport(const struct fc_lport *lport,
u32 port_id) u32 port_id)
{ {
const struct fc_disc *disc = &lport->disc; const struct fc_disc *disc = &lport->disc;
struct fc_rport *rport, *found = NULL; struct fc_rport *rport;
struct fc_rport_priv *rdata; struct fc_rport_priv *rdata;
int disc_found = 0;
list_for_each_entry(rdata, &disc->rports, peers) { list_for_each_entry(rdata, &disc->rports, peers) {
rport = PRIV_TO_RPORT(rdata); rport = PRIV_TO_RPORT(rdata);
if (rport->port_id == port_id) { if (rport->port_id == port_id)
disc_found = 1; return rdata;
found = rport;
break;
}
} }
return NULL;
if (!disc_found)
found = NULL;
return found;
} }
/** /**
...@@ -93,21 +84,18 @@ struct fc_rport *fc_disc_lookup_rport(const struct fc_lport *lport, ...@@ -93,21 +84,18 @@ struct fc_rport *fc_disc_lookup_rport(const struct fc_lport *lport,
void fc_disc_stop_rports(struct fc_disc *disc) void fc_disc_stop_rports(struct fc_disc *disc)
{ {
struct fc_lport *lport; struct fc_lport *lport;
struct fc_rport *rport;
struct fc_rport_priv *rdata, *next; struct fc_rport_priv *rdata, *next;
lport = disc->lport; lport = disc->lport;
mutex_lock(&disc->disc_mutex); mutex_lock(&disc->disc_mutex);
list_for_each_entry_safe(rdata, next, &disc->rports, peers) { list_for_each_entry_safe(rdata, next, &disc->rports, peers) {
rport = PRIV_TO_RPORT(rdata);
list_del(&rdata->peers); list_del(&rdata->peers);
lport->tt.rport_logoff(rport); lport->tt.rport_logoff(rdata);
} }
list_for_each_entry_safe(rdata, next, &disc->rogue_rports, peers) { list_for_each_entry_safe(rdata, next, &disc->rogue_rports, peers) {
rport = PRIV_TO_RPORT(rdata); lport->tt.rport_logoff(rdata);
lport->tt.rport_logoff(rport);
} }
mutex_unlock(&disc->disc_mutex); mutex_unlock(&disc->disc_mutex);
...@@ -116,18 +104,18 @@ void fc_disc_stop_rports(struct fc_disc *disc) ...@@ -116,18 +104,18 @@ void fc_disc_stop_rports(struct fc_disc *disc)
/** /**
* fc_disc_rport_callback() - Event handler for rport events * fc_disc_rport_callback() - Event handler for rport events
* @lport: The lport which is receiving the event * @lport: The lport which is receiving the event
* @rport: The rport which the event has occured on * @rdata: private remote port data
* @event: The event that occured * @event: The event that occured
* *
* Locking Note: The rport lock should not be held when calling * Locking Note: The rport lock should not be held when calling
* this function. * this function.
*/ */
static void fc_disc_rport_callback(struct fc_lport *lport, static void fc_disc_rport_callback(struct fc_lport *lport,
struct fc_rport *rport, struct fc_rport_priv *rdata,
enum fc_rport_event event) enum fc_rport_event event)
{ {
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_disc *disc = &lport->disc; struct fc_disc *disc = &lport->disc;
struct fc_rport *rport = PRIV_TO_RPORT(rdata);
FC_DISC_DBG(disc, "Received a %d event for port (%6x)\n", event, FC_DISC_DBG(disc, "Received a %d event for port (%6x)\n", event,
rport->port_id); rport->port_id);
...@@ -169,7 +157,6 @@ static void fc_disc_recv_rscn_req(struct fc_seq *sp, struct fc_frame *fp, ...@@ -169,7 +157,6 @@ static void fc_disc_recv_rscn_req(struct fc_seq *sp, struct fc_frame *fp,
struct fc_disc *disc) struct fc_disc *disc)
{ {
struct fc_lport *lport; struct fc_lport *lport;
struct fc_rport *rport;
struct fc_rport_priv *rdata; struct fc_rport_priv *rdata;
struct fc_els_rscn *rp; struct fc_els_rscn *rp;
struct fc_els_rscn_page *pp; struct fc_els_rscn_page *pp;
...@@ -249,11 +236,10 @@ static void fc_disc_recv_rscn_req(struct fc_seq *sp, struct fc_frame *fp, ...@@ -249,11 +236,10 @@ static void fc_disc_recv_rscn_req(struct fc_seq *sp, struct fc_frame *fp,
redisc, lport->state, disc->pending); redisc, lport->state, disc->pending);
list_for_each_entry_safe(dp, next, &disc_ports, peers) { list_for_each_entry_safe(dp, next, &disc_ports, peers) {
list_del(&dp->peers); list_del(&dp->peers);
rport = lport->tt.rport_lookup(lport, dp->ids.port_id); rdata = lport->tt.rport_lookup(lport, dp->ids.port_id);
if (rport) { if (rdata) {
rdata = rport->dd_data;
list_del(&rdata->peers); list_del(&rdata->peers);
lport->tt.rport_logoff(rport); lport->tt.rport_logoff(rdata);
} }
fc_disc_single(disc, dp); fc_disc_single(disc, dp);
} }
...@@ -308,16 +294,14 @@ static void fc_disc_recv_req(struct fc_seq *sp, struct fc_frame *fp, ...@@ -308,16 +294,14 @@ static void fc_disc_recv_req(struct fc_seq *sp, struct fc_frame *fp,
*/ */
static void fc_disc_restart(struct fc_disc *disc) static void fc_disc_restart(struct fc_disc *disc)
{ {
struct fc_rport *rport;
struct fc_rport_priv *rdata, *next; struct fc_rport_priv *rdata, *next;
struct fc_lport *lport = disc->lport; struct fc_lport *lport = disc->lport;
FC_DISC_DBG(disc, "Restarting discovery\n"); FC_DISC_DBG(disc, "Restarting discovery\n");
list_for_each_entry_safe(rdata, next, &disc->rports, peers) { list_for_each_entry_safe(rdata, next, &disc->rports, peers) {
rport = PRIV_TO_RPORT(rdata);
list_del(&rdata->peers); list_del(&rdata->peers);
lport->tt.rport_logoff(rport); lport->tt.rport_logoff(rdata);
} }
disc->requested = 1; disc->requested = 1;
...@@ -335,6 +319,7 @@ static void fc_disc_start(void (*disc_callback)(struct fc_lport *, ...@@ -335,6 +319,7 @@ static void fc_disc_start(void (*disc_callback)(struct fc_lport *,
enum fc_disc_event), enum fc_disc_event),
struct fc_lport *lport) struct fc_lport *lport)
{ {
struct fc_rport_priv *rdata;
struct fc_rport *rport; struct fc_rport *rport;
struct fc_rport_identifiers ids; struct fc_rport_identifiers ids;
struct fc_disc *disc = &lport->disc; struct fc_disc *disc = &lport->disc;
...@@ -362,8 +347,9 @@ static void fc_disc_start(void (*disc_callback)(struct fc_lport *, ...@@ -362,8 +347,9 @@ static void fc_disc_start(void (*disc_callback)(struct fc_lport *,
* Handle point-to-point mode as a simple discovery * Handle point-to-point mode as a simple discovery
* of the remote port. Yucky, yucky, yuck, yuck! * of the remote port. Yucky, yucky, yuck, yuck!
*/ */
rport = disc->lport->ptp_rp; rdata = disc->lport->ptp_rp;
if (rport) { if (rdata) {
rport = PRIV_TO_RPORT(rdata);
ids.port_id = rport->port_id; ids.port_id = rport->port_id;
ids.port_name = rport->port_name; ids.port_name = rport->port_name;
ids.node_name = rport->node_name; ids.node_name = rport->node_name;
...@@ -418,7 +404,9 @@ static int fc_disc_new_target(struct fc_disc *disc, ...@@ -418,7 +404,9 @@ static int fc_disc_new_target(struct fc_disc *disc,
* assigned the same FCID. This should be rare. * assigned the same FCID. This should be rare.
* Delete the old one and fall thru to re-create. * Delete the old one and fall thru to re-create.
*/ */
fc_disc_del_target(disc, rport); rdata = rport->dd_data;
list_del(&rdata->peers);
lport->tt.rport_logoff(rdata);
rport = NULL; rport = NULL;
} }
} }
...@@ -426,37 +414,26 @@ static int fc_disc_new_target(struct fc_disc *disc, ...@@ -426,37 +414,26 @@ static int fc_disc_new_target(struct fc_disc *disc,
ids->port_id != fc_host_port_id(lport->host) && ids->port_id != fc_host_port_id(lport->host) &&
ids->port_name != lport->wwpn) { ids->port_name != lport->wwpn) {
if (!rport) { if (!rport) {
rport = lport->tt.rport_lookup(lport, ids->port_id); rdata = lport->tt.rport_lookup(lport, ids->port_id);
if (!rport) { if (!rport) {
rport = lport->tt.rport_create(lport, ids); rdata = lport->tt.rport_create(lport, ids);
} }
if (!rport) if (!rdata)
error = -ENOMEM; error = -ENOMEM;
else
rport = PRIV_TO_RPORT(rdata);
} }
if (rport) { if (rport) {
rdata = rport->dd_data; rdata = rport->dd_data;
rdata->ops = &fc_disc_rport_ops; rdata->ops = &fc_disc_rport_ops;
rdata->rp_state = RPORT_ST_INIT; rdata->rp_state = RPORT_ST_INIT;
list_add_tail(&rdata->peers, &disc->rogue_rports); list_add_tail(&rdata->peers, &disc->rogue_rports);
lport->tt.rport_login(rport); lport->tt.rport_login(rdata);
} }
} }
return error; return error;
} }
/**
* fc_disc_del_target() - Delete a target
* @disc: FC discovery context
* @rport: The remote port to be removed
*/
static void fc_disc_del_target(struct fc_disc *disc, struct fc_rport *rport)
{
struct fc_lport *lport = disc->lport;
struct fc_rport_priv *rdata = rport->dd_data;
list_del(&rdata->peers);
lport->tt.rport_logoff(rport);
}
/** /**
* fc_disc_done() - Discovery has been completed * fc_disc_done() - Discovery has been completed
* @disc: FC discovery context * @disc: FC discovery context
...@@ -573,7 +550,6 @@ static int fc_disc_gpn_ft_parse(struct fc_disc *disc, void *buf, size_t len) ...@@ -573,7 +550,6 @@ static int fc_disc_gpn_ft_parse(struct fc_disc *disc, void *buf, size_t len)
size_t tlen; size_t tlen;
int error = 0; int error = 0;
struct fc_rport_identifiers ids; struct fc_rport_identifiers ids;
struct fc_rport *rport;
struct fc_rport_priv *rdata; struct fc_rport_priv *rdata;
lport = disc->lport; lport = disc->lport;
...@@ -622,14 +598,13 @@ static int fc_disc_gpn_ft_parse(struct fc_disc *disc, void *buf, size_t len) ...@@ -622,14 +598,13 @@ static int fc_disc_gpn_ft_parse(struct fc_disc *disc, void *buf, size_t len)
if (ids.port_id != fc_host_port_id(lport->host) && if (ids.port_id != fc_host_port_id(lport->host) &&
ids.port_name != lport->wwpn) { ids.port_name != lport->wwpn) {
rport = lport->tt.rport_create(lport, &ids); rdata = lport->tt.rport_create(lport, &ids);
if (rport) { if (rdata) {
rdata = rport->dd_data;
rdata->ops = &fc_disc_rport_ops; rdata->ops = &fc_disc_rport_ops;
rdata->local_port = lport; rdata->local_port = lport;
list_add_tail(&rdata->peers, list_add_tail(&rdata->peers,
&disc->rogue_rports); &disc->rogue_rports);
lport->tt.rport_login(rport); lport->tt.rport_login(rdata);
} else } else
printk(KERN_WARNING "libfc: Failed to allocate " printk(KERN_WARNING "libfc: Failed to allocate "
"memory for the newly discovered port " "memory for the newly discovered port "
...@@ -766,7 +741,6 @@ static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp, ...@@ -766,7 +741,6 @@ static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp,
static void fc_disc_single(struct fc_disc *disc, struct fc_disc_port *dp) static void fc_disc_single(struct fc_disc *disc, struct fc_disc_port *dp)
{ {
struct fc_lport *lport; struct fc_lport *lport;
struct fc_rport *new_rport;
struct fc_rport_priv *rdata; struct fc_rport_priv *rdata;
lport = disc->lport; lport = disc->lport;
...@@ -774,13 +748,12 @@ static void fc_disc_single(struct fc_disc *disc, struct fc_disc_port *dp) ...@@ -774,13 +748,12 @@ static void fc_disc_single(struct fc_disc *disc, struct fc_disc_port *dp)
if (dp->ids.port_id == fc_host_port_id(lport->host)) if (dp->ids.port_id == fc_host_port_id(lport->host))
goto out; goto out;
new_rport = lport->tt.rport_create(lport, &dp->ids); rdata = lport->tt.rport_create(lport, &dp->ids);
if (new_rport) { if (rdata) {
rdata = new_rport->dd_data;
rdata->ops = &fc_disc_rport_ops; rdata->ops = &fc_disc_rport_ops;
kfree(dp); kfree(dp);
list_add_tail(&rdata->peers, &disc->rogue_rports); list_add_tail(&rdata->peers, &disc->rogue_rports);
lport->tt.rport_login(new_rport); lport->tt.rport_login(rdata);
} }
return; return;
out: out:
......
drivers/scsi/libfc/fc_elsct.c
View file @ 9fb9d328
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
* fc_elsct_send - sends ELS/CT frame * fc_elsct_send - sends ELS/CT frame
*/ */
static struct fc_seq *fc_elsct_send(struct fc_lport *lport, static struct fc_seq *fc_elsct_send(struct fc_lport *lport,
struct fc_rport *rport, struct fc_rport_priv *rdata,
struct fc_frame *fp, struct fc_frame *fp,
unsigned int op, unsigned int op,
void (*resp)(struct fc_seq *, void (*resp)(struct fc_seq *,
...@@ -47,7 +47,7 @@ static struct fc_seq *fc_elsct_send(struct fc_lport *lport, ...@@ -47,7 +47,7 @@ static struct fc_seq *fc_elsct_send(struct fc_lport *lport,
/* ELS requests */ /* ELS requests */
if ((op >= ELS_LS_RJT) && (op <= ELS_AUTH_ELS)) if ((op >= ELS_LS_RJT) && (op <= ELS_AUTH_ELS))
rc = fc_els_fill(lport, rport, fp, op, &r_ctl, &did, &fh_type); rc = fc_els_fill(lport, rdata, fp, op, &r_ctl, &did, &fh_type);
else else
/* CT requests */ /* CT requests */
rc = fc_ct_fill(lport, fp, op, &r_ctl, &did, &fh_type); rc = fc_ct_fill(lport, fp, op, &r_ctl, &did, &fh_type);
......
drivers/scsi/libfc/fc_fcp.c
View file @ 9fb9d328
...@@ -1308,7 +1308,7 @@ static void fc_fcp_rec(struct fc_fcp_pkt *fsp) ...@@ -1308,7 +1308,7 @@ static void fc_fcp_rec(struct fc_fcp_pkt *fsp)
fc_fill_fc_hdr(fp, FC_RCTL_ELS_REQ, rport->port_id, fc_fill_fc_hdr(fp, FC_RCTL_ELS_REQ, rport->port_id,
fc_host_port_id(rp->local_port->host), FC_TYPE_ELS, fc_host_port_id(rp->local_port->host), FC_TYPE_ELS,
FC_FC_FIRST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0); FC_FC_FIRST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0);
if (lp->tt.elsct_send(lp, rport, fp, ELS_REC, fc_fcp_rec_resp, if (lp->tt.elsct_send(lp, rport->dd_data, fp, ELS_REC, fc_fcp_rec_resp,
fsp, jiffies_to_msecs(FC_SCSI_REC_TOV))) { fsp, jiffies_to_msecs(FC_SCSI_REC_TOV))) {
fc_fcp_pkt_hold(fsp); /* hold while REC outstanding */ fc_fcp_pkt_hold(fsp); /* hold while REC outstanding */
return; return;
......
drivers/scsi/libfc/fc_lport.c
View file @ 9fb9d328
...@@ -133,16 +133,18 @@ static int fc_frame_drop(struct fc_lport *lport, struct fc_frame *fp) ...@@ -133,16 +133,18 @@ static int fc_frame_drop(struct fc_lport *lport, struct fc_frame *fp)
/** /**
* fc_lport_rport_callback() - Event handler for rport events * fc_lport_rport_callback() - Event handler for rport events
* @lport: The lport which is receiving the event * @lport: The lport which is receiving the event
* @rport: The rport which the event has occured on * @rdata: private remote port data
* @event: The event that occured * @event: The event that occured
* *
* Locking Note: The rport lock should not be held when calling * Locking Note: The rport lock should not be held when calling
* this function. * this function.
*/ */
static void fc_lport_rport_callback(struct fc_lport *lport, static void fc_lport_rport_callback(struct fc_lport *lport,
struct fc_rport *rport, struct fc_rport_priv *rdata,
enum fc_rport_event event) enum fc_rport_event event)
{ {
struct fc_rport *rport = PRIV_TO_RPORT(rdata);
FC_LPORT_DBG(lport, "Received a %d event for port (%6x)\n", event, FC_LPORT_DBG(lport, "Received a %d event for port (%6x)\n", event,
rport->port_id); rport->port_id);
...@@ -151,7 +153,7 @@ static void fc_lport_rport_callback(struct fc_lport *lport, ...@@ -151,7 +153,7 @@ static void fc_lport_rport_callback(struct fc_lport *lport,
if (rport->port_id == FC_FID_DIR_SERV) { if (rport->port_id == FC_FID_DIR_SERV) {
mutex_lock(&lport->lp_mutex); mutex_lock(&lport->lp_mutex);
if (lport->state == LPORT_ST_DNS) { if (lport->state == LPORT_ST_DNS) {
lport->dns_rp = rport; lport->dns_rp = rdata;
fc_lport_enter_rpn_id(lport); fc_lport_enter_rpn_id(lport);
} else { } else {
FC_LPORT_DBG(lport, "Received an CREATED event " FC_LPORT_DBG(lport, "Received an CREATED event "
...@@ -160,7 +162,7 @@ static void fc_lport_rport_callback(struct fc_lport *lport, ...@@ -160,7 +162,7 @@ static void fc_lport_rport_callback(struct fc_lport *lport,
"in the DNS state, it's in the " "in the DNS state, it's in the "
"%d state", rport->port_id, "%d state", rport->port_id,
lport->state); lport->state);
lport->tt.rport_logoff(rport); lport->tt.rport_logoff(rdata);
} }
mutex_unlock(&lport->lp_mutex); mutex_unlock(&lport->lp_mutex);
} else } else
...@@ -832,7 +834,7 @@ static void fc_lport_recv_req(struct fc_lport *lport, struct fc_seq *sp, ...@@ -832,7 +834,7 @@ static void fc_lport_recv_req(struct fc_lport *lport, struct fc_seq *sp,
{ {
struct fc_frame_header *fh = fc_frame_header_get(fp); struct fc_frame_header *fh = fc_frame_header_get(fp);
void (*recv) (struct fc_seq *, struct fc_frame *, struct fc_lport *); void (*recv) (struct fc_seq *, struct fc_frame *, struct fc_lport *);
struct fc_rport *rport; struct fc_rport_priv *rdata;
u32 s_id; u32 s_id;
u32 d_id; u32 d_id;
struct fc_seq_els_data rjt_data; struct fc_seq_els_data rjt_data;
...@@ -888,9 +890,9 @@ static void fc_lport_recv_req(struct fc_lport *lport, struct fc_seq *sp, ...@@ -888,9 +890,9 @@ static void fc_lport_recv_req(struct fc_lport *lport, struct fc_seq *sp,
s_id = ntoh24(fh->fh_s_id); s_id = ntoh24(fh->fh_s_id);
d_id = ntoh24(fh->fh_d_id); d_id = ntoh24(fh->fh_d_id);
rport = lport->tt.rport_lookup(lport, s_id); rdata = lport->tt.rport_lookup(lport, s_id);
if (rport) if (rdata)
lport->tt.rport_recv_req(sp, fp, rport); lport->tt.rport_recv_req(sp, fp, rdata);
else { else {
rjt_data.fp = NULL; rjt_data.fp = NULL;
rjt_data.reason = ELS_RJT_UNAB; rjt_data.reason = ELS_RJT_UNAB;
...@@ -1304,7 +1306,6 @@ static struct fc_rport_operations fc_lport_rport_ops = { ...@@ -1304,7 +1306,6 @@ static struct fc_rport_operations fc_lport_rport_ops = {
*/ */
static void fc_lport_enter_dns(struct fc_lport *lport) static void fc_lport_enter_dns(struct fc_lport *lport)
{ {
struct fc_rport *rport;
struct fc_rport_priv *rdata; struct fc_rport_priv *rdata;
struct fc_rport_identifiers ids; struct fc_rport_identifiers ids;
...@@ -1318,13 +1319,12 @@ static void fc_lport_enter_dns(struct fc_lport *lport) ...@@ -1318,13 +1319,12 @@ static void fc_lport_enter_dns(struct fc_lport *lport)
fc_lport_state_enter(lport, LPORT_ST_DNS); fc_lport_state_enter(lport, LPORT_ST_DNS);
rport = lport->tt.rport_create(lport, &ids); rdata = lport->tt.rport_create(lport, &ids);
if (!rport) if (!rdata)
goto err; goto err;
rdata = rport->dd_data;
rdata->ops = &fc_lport_rport_ops; rdata->ops = &fc_lport_rport_ops;
lport->tt.rport_login(rport); lport->tt.rport_login(rdata);
return; return;
err: err:
......
drivers/scsi/libfc/fc_rport.c
View file @ 9fb9d328
...@@ -57,23 +57,23 @@ ...@@ -57,23 +57,23 @@
struct workqueue_struct *rport_event_queue; struct workqueue_struct *rport_event_queue;
static void fc_rport_enter_plogi(struct fc_rport *); static void fc_rport_enter_plogi(struct fc_rport_priv *);
static void fc_rport_enter_prli(struct fc_rport *); static void fc_rport_enter_prli(struct fc_rport_priv *);
static void fc_rport_enter_rtv(struct fc_rport *); static void fc_rport_enter_rtv(struct fc_rport_priv *);
static void fc_rport_enter_ready(struct fc_rport *); static void fc_rport_enter_ready(struct fc_rport_priv *);
static void fc_rport_enter_logo(struct fc_rport *); static void fc_rport_enter_logo(struct fc_rport_priv *);
static void fc_rport_recv_plogi_req(struct fc_rport *, static void fc_rport_recv_plogi_req(struct fc_rport_priv *,
struct fc_seq *, struct fc_frame *); struct fc_seq *, struct fc_frame *);
static void fc_rport_recv_prli_req(struct fc_rport *, static void fc_rport_recv_prli_req(struct fc_rport_priv *,
struct fc_seq *, struct fc_frame *); struct fc_seq *, struct fc_frame *);
static void fc_rport_recv_prlo_req(struct fc_rport *, static void fc_rport_recv_prlo_req(struct fc_rport_priv *,
struct fc_seq *, struct fc_frame *); struct fc_seq *, struct fc_frame *);
static void fc_rport_recv_logo_req(struct fc_rport *, static void fc_rport_recv_logo_req(struct fc_rport_priv *,
struct fc_seq *, struct fc_frame *); struct fc_seq *, struct fc_frame *);
static void fc_rport_timeout(struct work_struct *); static void fc_rport_timeout(struct work_struct *);
static void fc_rport_error(struct fc_rport *, struct fc_frame *); static void fc_rport_error(struct fc_rport_priv *, struct fc_frame *);
static void fc_rport_error_retry(struct fc_rport *, struct fc_frame *); static void fc_rport_error_retry(struct fc_rport_priv *, struct fc_frame *);
static void fc_rport_work(struct work_struct *); static void fc_rport_work(struct work_struct *);
static const char *fc_rport_state_names[] = { static const char *fc_rport_state_names[] = {
...@@ -89,12 +89,14 @@ static const char *fc_rport_state_names[] = { ...@@ -89,12 +89,14 @@ static const char *fc_rport_state_names[] = {
static void fc_rport_rogue_destroy(struct device *dev) static void fc_rport_rogue_destroy(struct device *dev)
{ {
struct fc_rport *rport = dev_to_rport(dev); struct fc_rport *rport = dev_to_rport(dev);
FC_RPORT_DBG(rport, "Destroying rogue rport\n"); struct fc_rport_priv *rdata = RPORT_TO_PRIV(rport);
FC_RPORT_DBG(rdata, "Destroying rogue rport\n");
kfree(rport); kfree(rport);
} }
struct fc_rport *fc_rport_rogue_create(struct fc_lport *lport, struct fc_rport_priv *fc_rport_rogue_create(struct fc_lport *lport,
struct fc_rport_identifiers *ids) struct fc_rport_identifiers *ids)
{ {
struct fc_rport *rport; struct fc_rport *rport;
struct fc_rport_priv *rdata; struct fc_rport_priv *rdata;
...@@ -135,17 +137,16 @@ struct fc_rport *fc_rport_rogue_create(struct fc_lport *lport, ...@@ -135,17 +137,16 @@ struct fc_rport *fc_rport_rogue_create(struct fc_lport *lport,
*/ */
INIT_LIST_HEAD(&rdata->peers); INIT_LIST_HEAD(&rdata->peers);
return rport; return rdata;
} }
/** /**
* fc_rport_state() - return a string for the state the rport is in * fc_rport_state() - return a string for the state the rport is in
* @rport: The rport whose state we want to get a string for * @rdata: remote port private data
*/ */
static const char *fc_rport_state(struct fc_rport *rport) static const char *fc_rport_state(struct fc_rport_priv *rdata)
{ {
const char *cp; const char *cp;
struct fc_rport_priv *rdata = rport->dd_data;
cp = fc_rport_state_names[rdata->rp_state]; cp = fc_rport_state_names[rdata->rp_state];
if (!cp) if (!cp)
...@@ -192,15 +193,14 @@ static unsigned int fc_plogi_get_maxframe(struct fc_els_flogi *flp, ...@@ -192,15 +193,14 @@ static unsigned int fc_plogi_get_maxframe(struct fc_els_flogi *flp,
/** /**
* fc_rport_state_enter() - Change the rport's state * fc_rport_state_enter() - Change the rport's state
* @rport: The rport whose state should change * @rdata: The rport whose state should change
* @new: The new state of the rport * @new: The new state of the rport
* *
* Locking Note: Called with the rport lock held * Locking Note: Called with the rport lock held
*/ */
static void fc_rport_state_enter(struct fc_rport *rport, static void fc_rport_state_enter(struct fc_rport_priv *rdata,
enum fc_rport_state new) enum fc_rport_state new)
{ {
struct fc_rport_priv *rdata = rport->dd_data;
if (rdata->rp_state != new) if (rdata->rp_state != new)
rdata->retries = 0; rdata->retries = 0;
rdata->rp_state = new; rdata->rp_state = new;
...@@ -255,7 +255,7 @@ static void fc_rport_work(struct work_struct *work) ...@@ -255,7 +255,7 @@ static void fc_rport_work(struct work_struct *work)
INIT_LIST_HEAD(&new_rdata->peers); INIT_LIST_HEAD(&new_rdata->peers);
INIT_WORK(&new_rdata->event_work, fc_rport_work); INIT_WORK(&new_rdata->event_work, fc_rport_work);
fc_rport_state_enter(new_rport, RPORT_ST_READY); fc_rport_state_enter(new_rdata, RPORT_ST_READY);
} else { } else {
printk(KERN_WARNING "libfc: Failed to allocate " printk(KERN_WARNING "libfc: Failed to allocate "
" memory for rport (%6x)\n", ids.port_id); " memory for rport (%6x)\n", ids.port_id);
...@@ -263,20 +263,20 @@ static void fc_rport_work(struct work_struct *work) ...@@ -263,20 +263,20 @@ static void fc_rport_work(struct work_struct *work)
} }
if (rport->port_id != FC_FID_DIR_SERV) if (rport->port_id != FC_FID_DIR_SERV)
if (rport_ops->event_callback) if (rport_ops->event_callback)
rport_ops->event_callback(lport, rport, rport_ops->event_callback(lport, rdata,
RPORT_EV_FAILED); RPORT_EV_FAILED);
put_device(&rport->dev); put_device(&rport->dev);
rport = new_rport; rport = new_rport;
rdata = new_rport->dd_data; rdata = new_rport->dd_data;
if (rport_ops->event_callback) if (rport_ops->event_callback)
rport_ops->event_callback(lport, rport, event); rport_ops->event_callback(lport, rdata, event);
} else if ((event == RPORT_EV_FAILED) || } else if ((event == RPORT_EV_FAILED) ||
(event == RPORT_EV_LOGO) || (event == RPORT_EV_LOGO) ||
(event == RPORT_EV_STOP)) { (event == RPORT_EV_STOP)) {
trans_state = rdata->trans_state; trans_state = rdata->trans_state;
mutex_unlock(&rdata->rp_mutex); mutex_unlock(&rdata->rp_mutex);
if (rport_ops->event_callback) if (rport_ops->event_callback)
rport_ops->event_callback(lport, rport, event); rport_ops->event_callback(lport, rdata, event);
cancel_delayed_work_sync(&rdata->retry_work); cancel_delayed_work_sync(&rdata->retry_work);
if (trans_state == FC_PORTSTATE_ROGUE) if (trans_state == FC_PORTSTATE_ROGUE)
put_device(&rport->dev); put_device(&rport->dev);
...@@ -292,21 +292,19 @@ static void fc_rport_work(struct work_struct *work) ...@@ -292,21 +292,19 @@ static void fc_rport_work(struct work_struct *work)
/** /**
* fc_rport_login() - Start the remote port login state machine * fc_rport_login() - Start the remote port login state machine
* @rport: Fibre Channel remote port * @rdata: private remote port
* *
* Locking Note: Called without the rport lock held. This * Locking Note: Called without the rport lock held. This
* function will hold the rport lock, call an _enter_* * function will hold the rport lock, call an _enter_*
* function and then unlock the rport. * function and then unlock the rport.
*/ */
int fc_rport_login(struct fc_rport *rport) int fc_rport_login(struct fc_rport_priv *rdata)
{ {
struct fc_rport_priv *rdata = rport->dd_data;
mutex_lock(&rdata->rp_mutex); mutex_lock(&rdata->rp_mutex);
FC_RPORT_DBG(rport, "Login to port\n"); FC_RPORT_DBG(rdata, "Login to port\n");
fc_rport_enter_plogi(rport); fc_rport_enter_plogi(rdata);
mutex_unlock(&rdata->rp_mutex); mutex_unlock(&rdata->rp_mutex);
...@@ -315,7 +313,7 @@ int fc_rport_login(struct fc_rport *rport) ...@@ -315,7 +313,7 @@ int fc_rport_login(struct fc_rport *rport)
/** /**
* fc_rport_enter_delete() - schedule a remote port to be deleted. * fc_rport_enter_delete() - schedule a remote port to be deleted.
* @rport: Fibre Channel remote port * @rdata: private remote port
* @event: event to report as the reason for deletion * @event: event to report as the reason for deletion
* *
* Locking Note: Called with the rport lock held. * Locking Note: Called with the rport lock held.
...@@ -327,17 +325,15 @@ int fc_rport_login(struct fc_rport *rport) ...@@ -327,17 +325,15 @@ int fc_rport_login(struct fc_rport *rport)
* Since we have the mutex, even if fc_rport_work() is already started, * Since we have the mutex, even if fc_rport_work() is already started,
* it'll see the new event. * it'll see the new event.
*/ */
static void fc_rport_enter_delete(struct fc_rport *rport, static void fc_rport_enter_delete(struct fc_rport_priv *rdata,
enum fc_rport_event event) enum fc_rport_event event)
{ {
struct fc_rport_priv *rdata = rport->dd_data;
if (rdata->rp_state == RPORT_ST_DELETE) if (rdata->rp_state == RPORT_ST_DELETE)
return; return;
FC_RPORT_DBG(rport, "Delete port\n"); FC_RPORT_DBG(rdata, "Delete port\n");
fc_rport_state_enter(rport, RPORT_ST_DELETE); fc_rport_state_enter(rdata, RPORT_ST_DELETE);
if (rdata->event == RPORT_EV_NONE) if (rdata->event == RPORT_EV_NONE)
queue_work(rport_event_queue, &rdata->event_work); queue_work(rport_event_queue, &rdata->event_work);
...@@ -346,33 +342,31 @@ static void fc_rport_enter_delete(struct fc_rport *rport, ...@@ -346,33 +342,31 @@ static void fc_rport_enter_delete(struct fc_rport *rport,
/** /**
* fc_rport_logoff() - Logoff and remove an rport * fc_rport_logoff() - Logoff and remove an rport
* @rport: Fibre Channel remote port to be removed * @rdata: private remote port
* *
* Locking Note: Called without the rport lock held. This * Locking Note: Called without the rport lock held. This
* function will hold the rport lock, call an _enter_* * function will hold the rport lock, call an _enter_*
* function and then unlock the rport. * function and then unlock the rport.
*/ */
int fc_rport_logoff(struct fc_rport *rport) int fc_rport_logoff(struct fc_rport_priv *rdata)
{ {
struct fc_rport_priv *rdata = rport->dd_data;
mutex_lock(&rdata->rp_mutex); mutex_lock(&rdata->rp_mutex);
FC_RPORT_DBG(rport, "Remove port\n"); FC_RPORT_DBG(rdata, "Remove port\n");
if (rdata->rp_state == RPORT_ST_DELETE) { if (rdata->rp_state == RPORT_ST_DELETE) {
FC_RPORT_DBG(rport, "Port in Delete state, not removing\n"); FC_RPORT_DBG(rdata, "Port in Delete state, not removing\n");
mutex_unlock(&rdata->rp_mutex); mutex_unlock(&rdata->rp_mutex);
goto out; goto out;
} }
fc_rport_enter_logo(rport); fc_rport_enter_logo(rdata);
/* /*
* Change the state to Delete so that we discard * Change the state to Delete so that we discard
* the response. * the response.
*/ */
fc_rport_enter_delete(rport, RPORT_EV_STOP); fc_rport_enter_delete(rdata, RPORT_EV_STOP);
mutex_unlock(&rdata->rp_mutex); mutex_unlock(&rdata->rp_mutex);
out: out:
...@@ -381,18 +375,16 @@ out: ...@@ -381,18 +375,16 @@ out:
/** /**
* fc_rport_enter_ready() - The rport is ready * fc_rport_enter_ready() - The rport is ready
* @rport: Fibre Channel remote port that is ready * @rdata: private remote port
* *
* Locking Note: The rport lock is expected to be held before calling * Locking Note: The rport lock is expected to be held before calling
* this routine. * this routine.
*/ */
static void fc_rport_enter_ready(struct fc_rport *rport) static void fc_rport_enter_ready(struct fc_rport_priv *rdata)
{ {
struct fc_rport_priv *rdata = rport->dd_data; fc_rport_state_enter(rdata, RPORT_ST_READY);
fc_rport_state_enter(rport, RPORT_ST_READY);
FC_RPORT_DBG(rport, "Port is Ready\n"); FC_RPORT_DBG(rdata, "Port is Ready\n");
if (rdata->event == RPORT_EV_NONE) if (rdata->event == RPORT_EV_NONE)
queue_work(rport_event_queue, &rdata->event_work); queue_work(rport_event_queue, &rdata->event_work);
...@@ -411,22 +403,21 @@ static void fc_rport_timeout(struct work_struct *work) ...@@ -411,22 +403,21 @@ static void fc_rport_timeout(struct work_struct *work)
{ {
struct fc_rport_priv *rdata = struct fc_rport_priv *rdata =
container_of(work, struct fc_rport_priv, retry_work.work); container_of(work, struct fc_rport_priv, retry_work.work);
struct fc_rport *rport = PRIV_TO_RPORT(rdata);
mutex_lock(&rdata->rp_mutex); mutex_lock(&rdata->rp_mutex);
switch (rdata->rp_state) { switch (rdata->rp_state) {
case RPORT_ST_PLOGI: case RPORT_ST_PLOGI:
fc_rport_enter_plogi(rport); fc_rport_enter_plogi(rdata);
break; break;
case RPORT_ST_PRLI: case RPORT_ST_PRLI:
fc_rport_enter_prli(rport); fc_rport_enter_prli(rdata);
break; break;
case RPORT_ST_RTV: case RPORT_ST_RTV:
fc_rport_enter_rtv(rport); fc_rport_enter_rtv(rdata);
break; break;
case RPORT_ST_LOGO: case RPORT_ST_LOGO:
fc_rport_enter_logo(rport); fc_rport_enter_logo(rdata);
break; break;
case RPORT_ST_READY: case RPORT_ST_READY:
case RPORT_ST_INIT: case RPORT_ST_INIT:
...@@ -439,27 +430,25 @@ static void fc_rport_timeout(struct work_struct *work) ...@@ -439,27 +430,25 @@ static void fc_rport_timeout(struct work_struct *work)
/** /**
* fc_rport_error() - Error handler, called once retries have been exhausted * fc_rport_error() - Error handler, called once retries have been exhausted
* @rport: The fc_rport object * @rdata: private remote port
* @fp: The frame pointer * @fp: The frame pointer
* *
* Locking Note: The rport lock is expected to be held before * Locking Note: The rport lock is expected to be held before
* calling this routine * calling this routine
*/ */
static void fc_rport_error(struct fc_rport *rport, struct fc_frame *fp) static void fc_rport_error(struct fc_rport_priv *rdata, struct fc_frame *fp)
{ {
struct fc_rport_priv *rdata = rport->dd_data; FC_RPORT_DBG(rdata, "Error %ld in state %s, retries %d\n",
PTR_ERR(fp), fc_rport_state(rdata), rdata->retries);
FC_RPORT_DBG(rport, "Error %ld in state %s, retries %d\n",
PTR_ERR(fp), fc_rport_state(rport), rdata->retries);
switch (rdata->rp_state) { switch (rdata->rp_state) {
case RPORT_ST_PLOGI: case RPORT_ST_PLOGI:
case RPORT_ST_PRLI: case RPORT_ST_PRLI:
case RPORT_ST_LOGO: case RPORT_ST_LOGO:
fc_rport_enter_delete(rport, RPORT_EV_FAILED); fc_rport_enter_delete(rdata, RPORT_EV_FAILED);
break; break;
case RPORT_ST_RTV: case RPORT_ST_RTV:
fc_rport_enter_ready(rport); fc_rport_enter_ready(rdata);
break; break;
case RPORT_ST_DELETE: case RPORT_ST_DELETE:
case RPORT_ST_READY: case RPORT_ST_READY:
...@@ -470,7 +459,7 @@ static void fc_rport_error(struct fc_rport *rport, struct fc_frame *fp) ...@@ -470,7 +459,7 @@ static void fc_rport_error(struct fc_rport *rport, struct fc_frame *fp)
/** /**
* fc_rport_error_retry() - Error handler when retries are desired * fc_rport_error_retry() - Error handler when retries are desired
* @rport: The fc_rport object * @rdata: private remote port data
* @fp: The frame pointer * @fp: The frame pointer
* *
* If the error was an exchange timeout retry immediately, * If the error was an exchange timeout retry immediately,
...@@ -479,18 +468,18 @@ static void fc_rport_error(struct fc_rport *rport, struct fc_frame *fp) ...@@ -479,18 +468,18 @@ static void fc_rport_error(struct fc_rport *rport, struct fc_frame *fp)
* Locking Note: The rport lock is expected to be held before * Locking Note: The rport lock is expected to be held before
* calling this routine * calling this routine
*/ */
static void fc_rport_error_retry(struct fc_rport *rport, struct fc_frame *fp) static void fc_rport_error_retry(struct fc_rport_priv *rdata,
struct fc_frame *fp)
{ {
struct fc_rport_priv *rdata = rport->dd_data;
unsigned long delay = FC_DEF_E_D_TOV; unsigned long delay = FC_DEF_E_D_TOV;
/* make sure this isn't an FC_EX_CLOSED error, never retry those */ /* make sure this isn't an FC_EX_CLOSED error, never retry those */
if (PTR_ERR(fp) == -FC_EX_CLOSED) if (PTR_ERR(fp) == -FC_EX_CLOSED)
return fc_rport_error(rport, fp); return fc_rport_error(rdata, fp);
if (rdata->retries < rdata->local_port->max_rport_retry_count) { if (rdata->retries < rdata->local_port->max_rport_retry_count) {
FC_RPORT_DBG(rport, "Error %ld in state %s, retrying\n", FC_RPORT_DBG(rdata, "Error %ld in state %s, retrying\n",
PTR_ERR(fp), fc_rport_state(rport)); PTR_ERR(fp), fc_rport_state(rdata));
rdata->retries++; rdata->retries++;
/* no additional delay on exchange timeouts */ /* no additional delay on exchange timeouts */
if (PTR_ERR(fp) == -FC_EX_TIMEOUT) if (PTR_ERR(fp) == -FC_EX_TIMEOUT)
...@@ -499,24 +488,24 @@ static void fc_rport_error_retry(struct fc_rport *rport, struct fc_frame *fp) ...@@ -499,24 +488,24 @@ static void fc_rport_error_retry(struct fc_rport *rport, struct fc_frame *fp)
return; return;
} }
return fc_rport_error(rport, fp); return fc_rport_error(rdata, fp);
} }
/** /**
* fc_rport_plogi_recv_resp() - Handle incoming ELS PLOGI response * fc_rport_plogi_recv_resp() - Handle incoming ELS PLOGI response
* @sp: current sequence in the PLOGI exchange * @sp: current sequence in the PLOGI exchange
* @fp: response frame * @fp: response frame
* @rp_arg: Fibre Channel remote port * @rdata_arg: private remote port data
* *
* Locking Note: This function will be called without the rport lock * Locking Note: This function will be called without the rport lock
* held, but it will lock, call an _enter_* function or fc_rport_error * held, but it will lock, call an _enter_* function or fc_rport_error
* and then unlock the rport. * and then unlock the rport.
*/ */
static void fc_rport_plogi_resp(struct fc_seq *sp, struct fc_frame *fp, static void fc_rport_plogi_resp(struct fc_seq *sp, struct fc_frame *fp,
void *rp_arg) void *rdata_arg)
{ {
struct fc_rport *rport = rp_arg; struct fc_rport_priv *rdata = rdata_arg;
struct fc_rport_priv *rdata = rport->dd_data; struct fc_rport *rport = PRIV_TO_RPORT(rdata);
struct fc_lport *lport = rdata->local_port; struct fc_lport *lport = rdata->local_port;
struct fc_els_flogi *plp = NULL; struct fc_els_flogi *plp = NULL;
unsigned int tov; unsigned int tov;
...@@ -526,18 +515,18 @@ static void fc_rport_plogi_resp(struct fc_seq *sp, struct fc_frame *fp, ...@@ -526,18 +515,18 @@ static void fc_rport_plogi_resp(struct fc_seq *sp, struct fc_frame *fp,
mutex_lock(&rdata->rp_mutex); mutex_lock(&rdata->rp_mutex);
FC_RPORT_DBG(rport, "Received a PLOGI response\n"); FC_RPORT_DBG(rdata, "Received a PLOGI response\n");
if (rdata->rp_state != RPORT_ST_PLOGI) { if (rdata->rp_state != RPORT_ST_PLOGI) {
FC_RPORT_DBG(rport, "Received a PLOGI response, but in state " FC_RPORT_DBG(rdata, "Received a PLOGI response, but in state "
"%s\n", fc_rport_state(rport)); "%s\n", fc_rport_state(rdata));
if (IS_ERR(fp)) if (IS_ERR(fp))
goto err; goto err;
goto out; goto out;
} }
if (IS_ERR(fp)) { if (IS_ERR(fp)) {
fc_rport_error_retry(rport, fp); fc_rport_error_retry(rdata, fp);
goto err; goto err;
} }
...@@ -565,11 +554,11 @@ static void fc_rport_plogi_resp(struct fc_seq *sp, struct fc_frame *fp, ...@@ -565,11 +554,11 @@ static void fc_rport_plogi_resp(struct fc_seq *sp, struct fc_frame *fp,
* we skip PRLI and RTV and go straight to READY. * we skip PRLI and RTV and go straight to READY.
*/ */
if (rport->port_id >= FC_FID_DOM_MGR) if (rport->port_id >= FC_FID_DOM_MGR)
fc_rport_enter_ready(rport); fc_rport_enter_ready(rdata);
else else
fc_rport_enter_prli(rport); fc_rport_enter_prli(rdata);
} else } else
fc_rport_error_retry(rport, fp); fc_rport_error_retry(rdata, fp);
out: out:
fc_frame_free(fp); fc_frame_free(fp);
...@@ -580,33 +569,33 @@ err: ...@@ -580,33 +569,33 @@ err:
/** /**
* fc_rport_enter_plogi() - Send Port Login (PLOGI) request to peer * fc_rport_enter_plogi() - Send Port Login (PLOGI) request to peer
* @rport: Fibre Channel remote port to send PLOGI to * @rdata: private remote port data
* *
* Locking Note: The rport lock is expected to be held before calling * Locking Note: The rport lock is expected to be held before calling
* this routine. * this routine.
*/ */
static void fc_rport_enter_plogi(struct fc_rport *rport) static void fc_rport_enter_plogi(struct fc_rport_priv *rdata)
{ {
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port; struct fc_lport *lport = rdata->local_port;
struct fc_rport *rport = PRIV_TO_RPORT(rdata);
struct fc_frame *fp; struct fc_frame *fp;
FC_RPORT_DBG(rport, "Port entered PLOGI state from %s state\n", FC_RPORT_DBG(rdata, "Port entered PLOGI state from %s state\n",
fc_rport_state(rport)); fc_rport_state(rdata));
fc_rport_state_enter(rport, RPORT_ST_PLOGI); fc_rport_state_enter(rdata, RPORT_ST_PLOGI);
rport->maxframe_size = FC_MIN_MAX_PAYLOAD; rport->maxframe_size = FC_MIN_MAX_PAYLOAD;
fp = fc_frame_alloc(lport, sizeof(struct fc_els_flogi)); fp = fc_frame_alloc(lport, sizeof(struct fc_els_flogi));
if (!fp) { if (!fp) {
fc_rport_error_retry(rport, fp); fc_rport_error_retry(rdata, fp);
return; return;
} }
rdata->e_d_tov = lport->e_d_tov; rdata->e_d_tov = lport->e_d_tov;
if (!lport->tt.elsct_send(lport, rport, fp, ELS_PLOGI, if (!lport->tt.elsct_send(lport, rdata, fp, ELS_PLOGI,
fc_rport_plogi_resp, rport, lport->e_d_tov)) fc_rport_plogi_resp, rdata, lport->e_d_tov))
fc_rport_error_retry(rport, fp); fc_rport_error_retry(rdata, fp);
else else
get_device(&rport->dev); get_device(&rport->dev);
} }
...@@ -615,17 +604,17 @@ static void fc_rport_enter_plogi(struct fc_rport *rport) ...@@ -615,17 +604,17 @@ static void fc_rport_enter_plogi(struct fc_rport *rport)
* fc_rport_prli_resp() - Process Login (PRLI) response handler * fc_rport_prli_resp() - Process Login (PRLI) response handler
* @sp: current sequence in the PRLI exchange * @sp: current sequence in the PRLI exchange
* @fp: response frame * @fp: response frame
* @rp_arg: Fibre Channel remote port * @rdata_arg: private remote port data
* *
* Locking Note: This function will be called without the rport lock * Locking Note: This function will be called without the rport lock
* held, but it will lock, call an _enter_* function or fc_rport_error * held, but it will lock, call an _enter_* function or fc_rport_error
* and then unlock the rport. * and then unlock the rport.
*/ */
static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp, static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp,
void *rp_arg) void *rdata_arg)
{ {
struct fc_rport *rport = rp_arg; struct fc_rport_priv *rdata = rdata_arg;
struct fc_rport_priv *rdata = rport->dd_data; struct fc_rport *rport = PRIV_TO_RPORT(rdata);
struct { struct {
struct fc_els_prli prli; struct fc_els_prli prli;
struct fc_els_spp spp; struct fc_els_spp spp;
...@@ -636,18 +625,18 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp, ...@@ -636,18 +625,18 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp,
mutex_lock(&rdata->rp_mutex); mutex_lock(&rdata->rp_mutex);
FC_RPORT_DBG(rport, "Received a PRLI response\n"); FC_RPORT_DBG(rdata, "Received a PRLI response\n");
if (rdata->rp_state != RPORT_ST_PRLI) { if (rdata->rp_state != RPORT_ST_PRLI) {
FC_RPORT_DBG(rport, "Received a PRLI response, but in state " FC_RPORT_DBG(rdata, "Received a PRLI response, but in state "
"%s\n", fc_rport_state(rport)); "%s\n", fc_rport_state(rdata));
if (IS_ERR(fp)) if (IS_ERR(fp))
goto err; goto err;
goto out; goto out;
} }
if (IS_ERR(fp)) { if (IS_ERR(fp)) {
fc_rport_error_retry(rport, fp); fc_rport_error_retry(rdata, fp);
goto err; goto err;
} }
...@@ -667,11 +656,11 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp, ...@@ -667,11 +656,11 @@ static void fc_rport_prli_resp(struct fc_seq *sp, struct fc_frame *fp,
roles |= FC_RPORT_ROLE_FCP_TARGET; roles |= FC_RPORT_ROLE_FCP_TARGET;
rport->roles = roles; rport->roles = roles;
fc_rport_enter_rtv(rport); fc_rport_enter_rtv(rdata);
} else { } else {
FC_RPORT_DBG(rport, "Bad ELS response for PRLI command\n"); FC_RPORT_DBG(rdata, "Bad ELS response for PRLI command\n");
fc_rport_enter_delete(rport, RPORT_EV_FAILED); fc_rport_enter_delete(rdata, RPORT_EV_FAILED);
} }
out: out:
...@@ -685,42 +674,42 @@ err: ...@@ -685,42 +674,42 @@ err:
* fc_rport_logo_resp() - Logout (LOGO) response handler * fc_rport_logo_resp() - Logout (LOGO) response handler
* @sp: current sequence in the LOGO exchange * @sp: current sequence in the LOGO exchange
* @fp: response frame * @fp: response frame
* @rp_arg: Fibre Channel remote port * @rdata_arg: private remote port data
* *
* Locking Note: This function will be called without the rport lock * Locking Note: This function will be called without the rport lock
* held, but it will lock, call an _enter_* function or fc_rport_error * held, but it will lock, call an _enter_* function or fc_rport_error
* and then unlock the rport. * and then unlock the rport.
*/ */
static void fc_rport_logo_resp(struct fc_seq *sp, struct fc_frame *fp, static void fc_rport_logo_resp(struct fc_seq *sp, struct fc_frame *fp,
void *rp_arg) void *rdata_arg)
{ {
struct fc_rport *rport = rp_arg; struct fc_rport_priv *rdata = rdata_arg;
struct fc_rport_priv *rdata = rport->dd_data; struct fc_rport *rport = PRIV_TO_RPORT(rdata);
u8 op; u8 op;
mutex_lock(&rdata->rp_mutex); mutex_lock(&rdata->rp_mutex);
FC_RPORT_DBG(rport, "Received a LOGO response\n"); FC_RPORT_DBG(rdata, "Received a LOGO response\n");
if (rdata->rp_state != RPORT_ST_LOGO) { if (rdata->rp_state != RPORT_ST_LOGO) {
FC_RPORT_DBG(rport, "Received a LOGO response, but in state " FC_RPORT_DBG(rdata, "Received a LOGO response, but in state "
"%s\n", fc_rport_state(rport)); "%s\n", fc_rport_state(rdata));
if (IS_ERR(fp)) if (IS_ERR(fp))
goto err; goto err;
goto out; goto out;
} }
if (IS_ERR(fp)) { if (IS_ERR(fp)) {
fc_rport_error_retry(rport, fp); fc_rport_error_retry(rdata, fp);
goto err; goto err;
} }
op = fc_frame_payload_op(fp); op = fc_frame_payload_op(fp);
if (op == ELS_LS_ACC) { if (op == ELS_LS_ACC) {
fc_rport_enter_rtv(rport); fc_rport_enter_rtv(rdata);
} else { } else {
FC_RPORT_DBG(rport, "Bad ELS response for LOGO command\n"); FC_RPORT_DBG(rdata, "Bad ELS response for LOGO command\n");
fc_rport_enter_delete(rport, RPORT_EV_LOGO); fc_rport_enter_delete(rdata, RPORT_EV_LOGO);
} }
out: out:
...@@ -732,14 +721,14 @@ err: ...@@ -732,14 +721,14 @@ err:
/** /**
* fc_rport_enter_prli() - Send Process Login (PRLI) request to peer * fc_rport_enter_prli() - Send Process Login (PRLI) request to peer
* @rport: Fibre Channel remote port to send PRLI to * @rdata: private remote port data
* *
* Locking Note: The rport lock is expected to be held before calling * Locking Note: The rport lock is expected to be held before calling
* this routine. * this routine.
*/ */
static void fc_rport_enter_prli(struct fc_rport *rport) static void fc_rport_enter_prli(struct fc_rport_priv *rdata)
{ {
struct fc_rport_priv *rdata = rport->dd_data; struct fc_rport *rport = PRIV_TO_RPORT(rdata);
struct fc_lport *lport = rdata->local_port; struct fc_lport *lport = rdata->local_port;
struct { struct {
struct fc_els_prli prli; struct fc_els_prli prli;
...@@ -747,20 +736,20 @@ static void fc_rport_enter_prli(struct fc_rport *rport) ...@@ -747,20 +736,20 @@ static void fc_rport_enter_prli(struct fc_rport *rport)
} *pp; } *pp;
struct fc_frame *fp; struct fc_frame *fp;
FC_RPORT_DBG(rport, "Port entered PRLI state from %s state\n", FC_RPORT_DBG(rdata, "Port entered PRLI state from %s state\n",
fc_rport_state(rport)); fc_rport_state(rdata));
fc_rport_state_enter(rport, RPORT_ST_PRLI); fc_rport_state_enter(rdata, RPORT_ST_PRLI);
fp = fc_frame_alloc(lport, sizeof(*pp)); fp = fc_frame_alloc(lport, sizeof(*pp));
if (!fp) { if (!fp) {
fc_rport_error_retry(rport, fp); fc_rport_error_retry(rdata, fp);
return; return;
} }
if (!lport->tt.elsct_send(lport, rport, fp, ELS_PRLI, if (!lport->tt.elsct_send(lport, rdata, fp, ELS_PRLI,
fc_rport_prli_resp, rport, lport->e_d_tov)) fc_rport_prli_resp, rdata, lport->e_d_tov))
fc_rport_error_retry(rport, fp); fc_rport_error_retry(rdata, fp);
else else
get_device(&rport->dev); get_device(&rport->dev);
} }
...@@ -769,7 +758,7 @@ static void fc_rport_enter_prli(struct fc_rport *rport) ...@@ -769,7 +758,7 @@ static void fc_rport_enter_prli(struct fc_rport *rport)
* fc_rport_els_rtv_resp() - Request Timeout Value response handler * fc_rport_els_rtv_resp() - Request Timeout Value response handler
* @sp: current sequence in the RTV exchange * @sp: current sequence in the RTV exchange
* @fp: response frame * @fp: response frame
* @rp_arg: Fibre Channel remote port * @rdata_arg: private remote port data
* *
* Many targets don't seem to support this. * Many targets don't seem to support this.
* *
...@@ -778,26 +767,26 @@ static void fc_rport_enter_prli(struct fc_rport *rport) ...@@ -778,26 +767,26 @@ static void fc_rport_enter_prli(struct fc_rport *rport)
* and then unlock the rport. * and then unlock the rport.
*/ */
static void fc_rport_rtv_resp(struct fc_seq *sp, struct fc_frame *fp, static void fc_rport_rtv_resp(struct fc_seq *sp, struct fc_frame *fp,
void *rp_arg) void *rdata_arg)
{ {
struct fc_rport *rport = rp_arg; struct fc_rport_priv *rdata = rdata_arg;
struct fc_rport_priv *rdata = rport->dd_data; struct fc_rport *rport = PRIV_TO_RPORT(rdata);
u8 op; u8 op;
mutex_lock(&rdata->rp_mutex); mutex_lock(&rdata->rp_mutex);
FC_RPORT_DBG(rport, "Received a RTV response\n"); FC_RPORT_DBG(rdata, "Received a RTV response\n");
if (rdata->rp_state != RPORT_ST_RTV) { if (rdata->rp_state != RPORT_ST_RTV) {
FC_RPORT_DBG(rport, "Received a RTV response, but in state " FC_RPORT_DBG(rdata, "Received a RTV response, but in state "
"%s\n", fc_rport_state(rport)); "%s\n", fc_rport_state(rdata));
if (IS_ERR(fp)) if (IS_ERR(fp))
goto err; goto err;
goto out; goto out;
} }
if (IS_ERR(fp)) { if (IS_ERR(fp)) {
fc_rport_error(rport, fp); fc_rport_error(rdata, fp);
goto err; goto err;
} }
...@@ -823,7 +812,7 @@ static void fc_rport_rtv_resp(struct fc_seq *sp, struct fc_frame *fp, ...@@ -823,7 +812,7 @@ static void fc_rport_rtv_resp(struct fc_seq *sp, struct fc_frame *fp,
} }
} }
fc_rport_enter_ready(rport); fc_rport_enter_ready(rdata);
out: out:
fc_frame_free(fp); fc_frame_free(fp);
...@@ -834,62 +823,62 @@ err: ...@@ -834,62 +823,62 @@ err:
/** /**
* fc_rport_enter_rtv() - Send Request Timeout Value (RTV) request to peer * fc_rport_enter_rtv() - Send Request Timeout Value (RTV) request to peer
* @rport: Fibre Channel remote port to send RTV to * @rdata: private remote port data
* *
* Locking Note: The rport lock is expected to be held before calling * Locking Note: The rport lock is expected to be held before calling
* this routine. * this routine.
*/ */
static void fc_rport_enter_rtv(struct fc_rport *rport) static void fc_rport_enter_rtv(struct fc_rport_priv *rdata)
{ {
struct fc_frame *fp; struct fc_frame *fp;
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port; struct fc_lport *lport = rdata->local_port;
struct fc_rport *rport = PRIV_TO_RPORT(rdata);
FC_RPORT_DBG(rport, "Port entered RTV state from %s state\n", FC_RPORT_DBG(rdata, "Port entered RTV state from %s state\n",
fc_rport_state(rport)); fc_rport_state(rdata));
fc_rport_state_enter(rport, RPORT_ST_RTV); fc_rport_state_enter(rdata, RPORT_ST_RTV);
fp = fc_frame_alloc(lport, sizeof(struct fc_els_rtv)); fp = fc_frame_alloc(lport, sizeof(struct fc_els_rtv));
if (!fp) { if (!fp) {
fc_rport_error_retry(rport, fp); fc_rport_error_retry(rdata, fp);
return; return;
} }
if (!lport->tt.elsct_send(lport, rport, fp, ELS_RTV, if (!lport->tt.elsct_send(lport, rdata, fp, ELS_RTV,
fc_rport_rtv_resp, rport, lport->e_d_tov)) fc_rport_rtv_resp, rdata, lport->e_d_tov))
fc_rport_error_retry(rport, fp); fc_rport_error_retry(rdata, fp);
else else
get_device(&rport->dev); get_device(&rport->dev);
} }
/** /**
* fc_rport_enter_logo() - Send Logout (LOGO) request to peer * fc_rport_enter_logo() - Send Logout (LOGO) request to peer
* @rport: Fibre Channel remote port to send LOGO to * @rdata: private remote port data
* *
* Locking Note: The rport lock is expected to be held before calling * Locking Note: The rport lock is expected to be held before calling
* this routine. * this routine.
*/ */
static void fc_rport_enter_logo(struct fc_rport *rport) static void fc_rport_enter_logo(struct fc_rport_priv *rdata)
{ {
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port; struct fc_lport *lport = rdata->local_port;
struct fc_rport *rport = PRIV_TO_RPORT(rdata);
struct fc_frame *fp; struct fc_frame *fp;
FC_RPORT_DBG(rport, "Port entered LOGO state from %s state\n", FC_RPORT_DBG(rdata, "Port entered LOGO state from %s state\n",
fc_rport_state(rport)); fc_rport_state(rdata));
fc_rport_state_enter(rport, RPORT_ST_LOGO); fc_rport_state_enter(rdata, RPORT_ST_LOGO);
fp = fc_frame_alloc(lport, sizeof(struct fc_els_logo)); fp = fc_frame_alloc(lport, sizeof(struct fc_els_logo));
if (!fp) { if (!fp) {
fc_rport_error_retry(rport, fp); fc_rport_error_retry(rdata, fp);
return; return;
} }
if (!lport->tt.elsct_send(lport, rport, fp, ELS_LOGO, if (!lport->tt.elsct_send(lport, rdata, fp, ELS_LOGO,
fc_rport_logo_resp, rport, lport->e_d_tov)) fc_rport_logo_resp, rdata, lport->e_d_tov))
fc_rport_error_retry(rport, fp); fc_rport_error_retry(rdata, fp);
else else
get_device(&rport->dev); get_device(&rport->dev);
} }
...@@ -899,16 +888,15 @@ static void fc_rport_enter_logo(struct fc_rport *rport) ...@@ -899,16 +888,15 @@ static void fc_rport_enter_logo(struct fc_rport *rport)
* fc_rport_recv_req() - Receive a request from a rport * fc_rport_recv_req() - Receive a request from a rport
* @sp: current sequence in the PLOGI exchange * @sp: current sequence in the PLOGI exchange
* @fp: response frame * @fp: response frame
* @rp_arg: Fibre Channel remote port * @rdata_arg: private remote port data
* *
* Locking Note: Called without the rport lock held. This * Locking Note: Called without the rport lock held. This
* function will hold the rport lock, call an _enter_* * function will hold the rport lock, call an _enter_*
* function and then unlock the rport. * function and then unlock the rport.
*/ */
void fc_rport_recv_req(struct fc_seq *sp, struct fc_frame *fp, void fc_rport_recv_req(struct fc_seq *sp, struct fc_frame *fp,
struct fc_rport *rport) struct fc_rport_priv *rdata)
{ {
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port; struct fc_lport *lport = rdata->local_port;
struct fc_frame_header *fh; struct fc_frame_header *fh;
...@@ -927,16 +915,16 @@ void fc_rport_recv_req(struct fc_seq *sp, struct fc_frame *fp, ...@@ -927,16 +915,16 @@ void fc_rport_recv_req(struct fc_seq *sp, struct fc_frame *fp,
op = fc_frame_payload_op(fp); op = fc_frame_payload_op(fp);
switch (op) { switch (op) {
case ELS_PLOGI: case ELS_PLOGI:
fc_rport_recv_plogi_req(rport, sp, fp); fc_rport_recv_plogi_req(rdata, sp, fp);
break; break;
case ELS_PRLI: case ELS_PRLI:
fc_rport_recv_prli_req(rport, sp, fp); fc_rport_recv_prli_req(rdata, sp, fp);
break; break;
case ELS_PRLO: case ELS_PRLO:
fc_rport_recv_prlo_req(rport, sp, fp); fc_rport_recv_prlo_req(rdata, sp, fp);
break; break;
case ELS_LOGO: case ELS_LOGO:
fc_rport_recv_logo_req(rport, sp, fp); fc_rport_recv_logo_req(rdata, sp, fp);
break; break;
case ELS_RRQ: case ELS_RRQ:
els_data.fp = fp; els_data.fp = fp;
...@@ -958,17 +946,17 @@ void fc_rport_recv_req(struct fc_seq *sp, struct fc_frame *fp, ...@@ -958,17 +946,17 @@ void fc_rport_recv_req(struct fc_seq *sp, struct fc_frame *fp,
/** /**
* fc_rport_recv_plogi_req() - Handle incoming Port Login (PLOGI) request * fc_rport_recv_plogi_req() - Handle incoming Port Login (PLOGI) request
* @rport: Fibre Channel remote port that initiated PLOGI * @rdata: private remote port data
* @sp: current sequence in the PLOGI exchange * @sp: current sequence in the PLOGI exchange
* @fp: PLOGI request frame * @fp: PLOGI request frame
* *
* Locking Note: The rport lock is exected to be held before calling * Locking Note: The rport lock is exected to be held before calling
* this function. * this function.
*/ */
static void fc_rport_recv_plogi_req(struct fc_rport *rport, static void fc_rport_recv_plogi_req(struct fc_rport_priv *rdata,
struct fc_seq *sp, struct fc_frame *rx_fp) struct fc_seq *sp, struct fc_frame *rx_fp)
{ {
struct fc_rport_priv *rdata = rport->dd_data; struct fc_rport *rport = PRIV_TO_RPORT(rdata);
struct fc_lport *lport = rdata->local_port; struct fc_lport *lport = rdata->local_port;
struct fc_frame *fp = rx_fp; struct fc_frame *fp = rx_fp;
struct fc_exch *ep; struct fc_exch *ep;
...@@ -984,13 +972,13 @@ static void fc_rport_recv_plogi_req(struct fc_rport *rport, ...@@ -984,13 +972,13 @@ static void fc_rport_recv_plogi_req(struct fc_rport *rport,
fh = fc_frame_header_get(fp); fh = fc_frame_header_get(fp);
FC_RPORT_DBG(rport, "Received PLOGI request while in state %s\n", FC_RPORT_DBG(rdata, "Received PLOGI request while in state %s\n",
fc_rport_state(rport)); fc_rport_state(rdata));
sid = ntoh24(fh->fh_s_id); sid = ntoh24(fh->fh_s_id);
pl = fc_frame_payload_get(fp, sizeof(*pl)); pl = fc_frame_payload_get(fp, sizeof(*pl));
if (!pl) { if (!pl) {
FC_RPORT_DBG(rport, "Received PLOGI too short\n"); FC_RPORT_DBG(rdata, "Received PLOGI too short\n");
WARN_ON(1); WARN_ON(1);
/* XXX TBD: send reject? */ /* XXX TBD: send reject? */
fc_frame_free(fp); fc_frame_free(fp);
...@@ -1012,25 +1000,25 @@ static void fc_rport_recv_plogi_req(struct fc_rport *rport, ...@@ -1012,25 +1000,25 @@ static void fc_rport_recv_plogi_req(struct fc_rport *rport,
*/ */
switch (rdata->rp_state) { switch (rdata->rp_state) {
case RPORT_ST_INIT: case RPORT_ST_INIT:
FC_RPORT_DBG(rport, "Received PLOGI, wwpn %llx state INIT " FC_RPORT_DBG(rdata, "Received PLOGI, wwpn %llx state INIT "
"- reject\n", (unsigned long long)wwpn); "- reject\n", (unsigned long long)wwpn);
reject = ELS_RJT_UNSUP; reject = ELS_RJT_UNSUP;
break; break;
case RPORT_ST_PLOGI: case RPORT_ST_PLOGI:
FC_RPORT_DBG(rport, "Received PLOGI in PLOGI state %d\n", FC_RPORT_DBG(rdata, "Received PLOGI in PLOGI state %d\n",
rdata->rp_state); rdata->rp_state);
if (wwpn < lport->wwpn) if (wwpn < lport->wwpn)
reject = ELS_RJT_INPROG; reject = ELS_RJT_INPROG;
break; break;
case RPORT_ST_PRLI: case RPORT_ST_PRLI:
case RPORT_ST_READY: case RPORT_ST_READY:
FC_RPORT_DBG(rport, "Received PLOGI in logged-in state %d " FC_RPORT_DBG(rdata, "Received PLOGI in logged-in state %d "
"- ignored for now\n", rdata->rp_state); "- ignored for now\n", rdata->rp_state);
/* XXX TBD - should reset */ /* XXX TBD - should reset */
break; break;
case RPORT_ST_DELETE: case RPORT_ST_DELETE:
default: default:
FC_RPORT_DBG(rport, "Received PLOGI in unexpected " FC_RPORT_DBG(rdata, "Received PLOGI in unexpected "
"state %d\n", rdata->rp_state); "state %d\n", rdata->rp_state);
fc_frame_free(fp); fc_frame_free(fp);
return; return;
...@@ -1074,24 +1062,24 @@ static void fc_rport_recv_plogi_req(struct fc_rport *rport, ...@@ -1074,24 +1062,24 @@ static void fc_rport_recv_plogi_req(struct fc_rport *rport,
FC_TYPE_ELS, f_ctl, 0); FC_TYPE_ELS, f_ctl, 0);
lport->tt.seq_send(lport, sp, fp); lport->tt.seq_send(lport, sp, fp);
if (rdata->rp_state == RPORT_ST_PLOGI) if (rdata->rp_state == RPORT_ST_PLOGI)
fc_rport_enter_prli(rport); fc_rport_enter_prli(rdata);
} }
} }
} }
/** /**
* fc_rport_recv_prli_req() - Handle incoming Process Login (PRLI) request * fc_rport_recv_prli_req() - Handle incoming Process Login (PRLI) request
* @rport: Fibre Channel remote port that initiated PRLI * @rdata: private remote port data
* @sp: current sequence in the PRLI exchange * @sp: current sequence in the PRLI exchange
* @fp: PRLI request frame * @fp: PRLI request frame
* *
* Locking Note: The rport lock is exected to be held before calling * Locking Note: The rport lock is exected to be held before calling
* this function. * this function.
*/ */
static void fc_rport_recv_prli_req(struct fc_rport *rport, static void fc_rport_recv_prli_req(struct fc_rport_priv *rdata,
struct fc_seq *sp, struct fc_frame *rx_fp) struct fc_seq *sp, struct fc_frame *rx_fp)
{ {
struct fc_rport_priv *rdata = rport->dd_data; struct fc_rport *rport = PRIV_TO_RPORT(rdata);
struct fc_lport *lport = rdata->local_port; struct fc_lport *lport = rdata->local_port;
struct fc_exch *ep; struct fc_exch *ep;
struct fc_frame *fp; struct fc_frame *fp;
...@@ -1115,8 +1103,8 @@ static void fc_rport_recv_prli_req(struct fc_rport *rport, ...@@ -1115,8 +1103,8 @@ static void fc_rport_recv_prli_req(struct fc_rport *rport,
fh = fc_frame_header_get(rx_fp); fh = fc_frame_header_get(rx_fp);
FC_RPORT_DBG(rport, "Received PRLI request while in state %s\n", FC_RPORT_DBG(rdata, "Received PRLI request while in state %s\n",
fc_rport_state(rport)); fc_rport_state(rdata));
switch (rdata->rp_state) { switch (rdata->rp_state) {
case RPORT_ST_PRLI: case RPORT_ST_PRLI:
...@@ -1220,7 +1208,7 @@ static void fc_rport_recv_prli_req(struct fc_rport *rport, ...@@ -1220,7 +1208,7 @@ static void fc_rport_recv_prli_req(struct fc_rport *rport,
*/ */
switch (rdata->rp_state) { switch (rdata->rp_state) {
case RPORT_ST_PRLI: case RPORT_ST_PRLI:
fc_rport_enter_ready(rport); fc_rport_enter_ready(rdata);
break; break;
case RPORT_ST_READY: case RPORT_ST_READY:
break; break;
...@@ -1233,17 +1221,17 @@ static void fc_rport_recv_prli_req(struct fc_rport *rport, ...@@ -1233,17 +1221,17 @@ static void fc_rport_recv_prli_req(struct fc_rport *rport,
/** /**
* fc_rport_recv_prlo_req() - Handle incoming Process Logout (PRLO) request * fc_rport_recv_prlo_req() - Handle incoming Process Logout (PRLO) request
* @rport: Fibre Channel remote port that initiated PRLO * @rdata: private remote port data
* @sp: current sequence in the PRLO exchange * @sp: current sequence in the PRLO exchange
* @fp: PRLO request frame * @fp: PRLO request frame
* *
* Locking Note: The rport lock is exected to be held before calling * Locking Note: The rport lock is exected to be held before calling
* this function. * this function.
*/ */
static void fc_rport_recv_prlo_req(struct fc_rport *rport, struct fc_seq *sp, static void fc_rport_recv_prlo_req(struct fc_rport_priv *rdata,
struct fc_seq *sp,
struct fc_frame *fp) struct fc_frame *fp)
{ {
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port; struct fc_lport *lport = rdata->local_port;
struct fc_frame_header *fh; struct fc_frame_header *fh;
...@@ -1251,8 +1239,8 @@ static void fc_rport_recv_prlo_req(struct fc_rport *rport, struct fc_seq *sp, ...@@ -1251,8 +1239,8 @@ static void fc_rport_recv_prlo_req(struct fc_rport *rport, struct fc_seq *sp,
fh = fc_frame_header_get(fp); fh = fc_frame_header_get(fp);
FC_RPORT_DBG(rport, "Received PRLO request while in state %s\n", FC_RPORT_DBG(rdata, "Received PRLO request while in state %s\n",
fc_rport_state(rport)); fc_rport_state(rdata));
if (rdata->rp_state == RPORT_ST_DELETE) { if (rdata->rp_state == RPORT_ST_DELETE) {
fc_frame_free(fp); fc_frame_free(fp);
...@@ -1268,24 +1256,24 @@ static void fc_rport_recv_prlo_req(struct fc_rport *rport, struct fc_seq *sp, ...@@ -1268,24 +1256,24 @@ static void fc_rport_recv_prlo_req(struct fc_rport *rport, struct fc_seq *sp,
/** /**
* fc_rport_recv_logo_req() - Handle incoming Logout (LOGO) request * fc_rport_recv_logo_req() - Handle incoming Logout (LOGO) request
* @rport: Fibre Channel remote port that initiated LOGO * @rdata: private remote port data
* @sp: current sequence in the LOGO exchange * @sp: current sequence in the LOGO exchange
* @fp: LOGO request frame * @fp: LOGO request frame
* *
* Locking Note: The rport lock is exected to be held before calling * Locking Note: The rport lock is exected to be held before calling
* this function. * this function.
*/ */
static void fc_rport_recv_logo_req(struct fc_rport *rport, struct fc_seq *sp, static void fc_rport_recv_logo_req(struct fc_rport_priv *rdata,
struct fc_seq *sp,
struct fc_frame *fp) struct fc_frame *fp)
{ {
struct fc_frame_header *fh; struct fc_frame_header *fh;
struct fc_rport_priv *rdata = rport->dd_data;
struct fc_lport *lport = rdata->local_port; struct fc_lport *lport = rdata->local_port;
fh = fc_frame_header_get(fp); fh = fc_frame_header_get(fp);
FC_RPORT_DBG(rport, "Received LOGO request while in state %s\n", FC_RPORT_DBG(rdata, "Received LOGO request while in state %s\n",
fc_rport_state(rport)); fc_rport_state(rdata));
if (rdata->rp_state == RPORT_ST_DELETE) { if (rdata->rp_state == RPORT_ST_DELETE) {
fc_frame_free(fp); fc_frame_free(fp);
...@@ -1293,7 +1281,7 @@ static void fc_rport_recv_logo_req(struct fc_rport *rport, struct fc_seq *sp, ...@@ -1293,7 +1281,7 @@ static void fc_rport_recv_logo_req(struct fc_rport *rport, struct fc_seq *sp,
} }
rdata->event = RPORT_EV_LOGO; rdata->event = RPORT_EV_LOGO;
fc_rport_state_enter(rport, RPORT_ST_DELETE); fc_rport_state_enter(rdata, RPORT_ST_DELETE);
queue_work(rport_event_queue, &rdata->event_work); queue_work(rport_event_queue, &rdata->event_work);
lport->tt.seq_els_rsp_send(sp, ELS_LS_ACC, NULL); lport->tt.seq_els_rsp_send(sp, ELS_LS_ACC, NULL);
......
include/scsi/fc_encode.h
View file @ 9fb9d328
...@@ -249,10 +249,13 @@ static inline void fc_scr_fill(struct fc_lport *lport, struct fc_frame *fp) ...@@ -249,10 +249,13 @@ static inline void fc_scr_fill(struct fc_lport *lport, struct fc_frame *fp)
/** /**
* fc_els_fill - Fill in an ELS request frame * fc_els_fill - Fill in an ELS request frame
*/ */
static inline int fc_els_fill(struct fc_lport *lport, struct fc_rport *rport, static inline int fc_els_fill(struct fc_lport *lport,
struct fc_rport_priv *rdata,
struct fc_frame *fp, unsigned int op, struct fc_frame *fp, unsigned int op,
enum fc_rctl *r_ctl, u32 *did, enum fc_fh_type *fh_type) enum fc_rctl *r_ctl, u32 *did, enum fc_fh_type *fh_type)
{ {
struct fc_rport *rport = PRIV_TO_RPORT(rdata);
switch (op) { switch (op) {
case ELS_PLOGI: case ELS_PLOGI:
fc_plogi_fill(lport, fp, ELS_PLOGI); fc_plogi_fill(lport, fp, ELS_PLOGI);
...@@ -272,7 +275,7 @@ static inline int fc_els_fill(struct fc_lport *lport, struct fc_rport *rport, ...@@ -272,7 +275,7 @@ static inline int fc_els_fill(struct fc_lport *lport, struct fc_rport *rport,
* is port logo, therefore * is port logo, therefore
* set did to rport id. * set did to rport id.
*/ */
if (rport) if (rdata)
*did = rport->port_id; *did = rport->port_id;
break; break;
......
include/scsi/libfc.h
View file @ 9fb9d328
...@@ -75,10 +75,10 @@ do { \ ...@@ -75,10 +75,10 @@ do { \
(lport)->host->host_no, \ (lport)->host->host_no, \
(port_id), ##args)) (port_id), ##args))
#define FC_RPORT_DBG(rport, fmt, args...) \ #define FC_RPORT_DBG(rdata, fmt, args...) \
do { \ do { \
struct fc_rport_priv *rdata = rport->dd_data; \
struct fc_lport *lport = rdata->local_port; \ struct fc_lport *lport = rdata->local_port; \
struct fc_rport *rport = PRIV_TO_RPORT(rdata); \
FC_RPORT_ID_DBG(lport, rport->port_id, fmt, ##args); \ FC_RPORT_ID_DBG(lport, rport->port_id, fmt, ##args); \
} while (0) } while (0)
...@@ -185,8 +185,10 @@ enum fc_rport_event { ...@@ -185,8 +185,10 @@ enum fc_rport_event {
*/ */
#define fc_rport_priv fc_rport_libfc_priv #define fc_rport_priv fc_rport_libfc_priv
struct fc_rport_priv;
struct fc_rport_operations { struct fc_rport_operations {
void (*event_callback)(struct fc_lport *, struct fc_rport *, void (*event_callback)(struct fc_lport *, struct fc_rport_priv *,
enum fc_rport_event); enum fc_rport_event);
}; };
...@@ -422,7 +424,7 @@ struct libfc_function_template { ...@@ -422,7 +424,7 @@ struct libfc_function_template {
* STATUS: OPTIONAL * STATUS: OPTIONAL
*/ */
struct fc_seq *(*elsct_send)(struct fc_lport *lport, struct fc_seq *(*elsct_send)(struct fc_lport *lport,
struct fc_rport *rport, struct fc_rport_priv *,
struct fc_frame *fp, struct fc_frame *fp,
unsigned int op, unsigned int op,
void (*resp)(struct fc_seq *, void (*resp)(struct fc_seq *,
...@@ -567,8 +569,8 @@ struct libfc_function_template { ...@@ -567,8 +569,8 @@ struct libfc_function_template {
/* /*
* Create a remote port * Create a remote port
*/ */
struct fc_rport *(*rport_create)(struct fc_lport *, struct fc_rport_priv *(*rport_create)(struct fc_lport *,
struct fc_rport_identifiers *); struct fc_rport_identifiers *);
/* /*
* Initiates the RP state machine. It is called from the LP module. * Initiates the RP state machine. It is called from the LP module.
...@@ -581,7 +583,7 @@ struct libfc_function_template { ...@@ -581,7 +583,7 @@ struct libfc_function_template {
* *
* STATUS: OPTIONAL * STATUS: OPTIONAL
*/ */
int (*rport_login)(struct fc_rport *rport); int (*rport_login)(struct fc_rport_priv *);
/* /*
* Logoff, and remove the rport from the transport if * Logoff, and remove the rport from the transport if
...@@ -589,7 +591,7 @@ struct libfc_function_template { ...@@ -589,7 +591,7 @@ struct libfc_function_template {
* *
* STATUS: OPTIONAL * STATUS: OPTIONAL
*/ */
int (*rport_logoff)(struct fc_rport *rport); int (*rport_logoff)(struct fc_rport_priv *);
/* /*
* Recieve a request from a remote port. * Recieve a request from a remote port.
...@@ -597,14 +599,14 @@ struct libfc_function_template { ...@@ -597,14 +599,14 @@ struct libfc_function_template {
* STATUS: OPTIONAL * STATUS: OPTIONAL
*/ */
void (*rport_recv_req)(struct fc_seq *, struct fc_frame *, void (*rport_recv_req)(struct fc_seq *, struct fc_frame *,
struct fc_rport *); struct fc_rport_priv *);
/* /*
* lookup an rport by it's port ID. * lookup an rport by it's port ID.
* *
* STATUS: OPTIONAL * STATUS: OPTIONAL
*/ */
struct fc_rport *(*rport_lookup)(const struct fc_lport *, u32); struct fc_rport_priv *(*rport_lookup)(const struct fc_lport *, u32);
/* /*
* Send a fcp cmd from fsp pkt. * Send a fcp cmd from fsp pkt.
...@@ -694,8 +696,8 @@ struct fc_lport { ...@@ -694,8 +696,8 @@ struct fc_lport {
/* Associations */ /* Associations */
struct Scsi_Host *host; struct Scsi_Host *host;
struct list_head ema_list; struct list_head ema_list;
struct fc_rport *dns_rp; struct fc_rport_priv *dns_rp;
struct fc_rport *ptp_rp; struct fc_rport_priv *ptp_rp;
void *scsi_priv; void *scsi_priv;
struct fc_disc disc; struct fc_disc disc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment