[SCSI] libfc: Move the port_id into lport

This patch creates a port_id member in struct fc_lport.
This allows libfc to just deal with fc_lport instances
instead of calling into the fc_host to get the port_id.

This change helps in only using symbols necessary for
operation from the libfc structures. libfc still needs
to change the fc_host_port_id() if the port_id changes
so the presentation layer (scsi_transport_fc) can provide
the user with the correct value, but libfc shouldn't
rely on the presentation layer for operational values.

Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c
index ec4c88c2d131244a8d38dc9abac0db71d49be611..948364a3342f5b0e105f6e324ec75a693f1c8183 100644 (file)
--- a/drivers/scsi/fcoe/libfcoe.c
+++ b/drivers/scsi/fcoe/libfcoe.c
@@ -343,7 +343,7 @@ static void fcoe_ctlr_send_keep_alive(struct fcoe_ctlr *fip,
 
        fcf = fip->sel_fcf;
        lp = fip->lp;
-       if (!fcf || !fc_host_port_id(lp->host))
+       if (!fcf || !lp->port_id)
                return;
 
        len = sizeof(*kal) + ports * sizeof(*vn);
@@ -374,7 +374,7 @@ static void fcoe_ctlr_send_keep_alive(struct fcoe_ctlr *fip,
                vn->fd_desc.fip_dtype = FIP_DT_VN_ID;
                vn->fd_desc.fip_dlen = sizeof(*vn) / FIP_BPW;
                memcpy(vn->fd_mac, fip->get_src_addr(lport), ETH_ALEN);
-               hton24(vn->fd_fc_id, fc_host_port_id(lp->host));
+               hton24(vn->fd_fc_id, lp->port_id);
                put_unaligned_be64(lp->wwpn, &vn->fd_wwpn);
        }
        skb_put(skb, len);
@@ -949,7 +949,7 @@ static void fcoe_ctlr_recv_clr_vlink(struct fcoe_ctlr *fip,
 
        LIBFCOE_FIP_DBG(fip, "Clear Virtual Link received\n");
 
-       if (!fcf || !fc_host_port_id(lport->host))
+       if (!fcf || !lport->port_id)
                return;
 
        /*
@@ -987,8 +987,7 @@ static void fcoe_ctlr_recv_clr_vlink(struct fcoe_ctlr *fip,
                        if (compare_ether_addr(vp->fd_mac,
                                               fip->get_src_addr(lport)) == 0 &&
                            get_unaligned_be64(&vp->fd_wwpn) == lport->wwpn &&
-                           ntoh24(vp->fd_fc_id) ==
-                           fc_host_port_id(lport->host))
+                           ntoh24(vp->fd_fc_id) == lport->port_id)
                                desc_mask &= ~BIT(FIP_DT_VN_ID);
                        break;
                default:

diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c
index b292272d296ff510526646ffa4ddfeeff52cda21..c7985da880999b3cf8aa04f0aba3aeb1edc37b1d 100644 (file)
--- a/drivers/scsi/libfc/fc_disc.c
+++ b/drivers/scsi/libfc/fc_disc.c
@@ -440,7 +440,7 @@ static int fc_disc_gpn_ft_parse(struct fc_disc *disc, void *buf, size_t len)
                ids.port_id = ntoh24(np->fp_fid);
                ids.port_name = ntohll(np->fp_wwpn);
 
-               if (ids.port_id != fc_host_port_id(lport->host) &&
+               if (ids.port_id != lport->port_id &&
                    ids.port_name != lport->wwpn) {
                        rdata = lport->tt.rport_create(lport, ids.port_id);
                        if (rdata) {

diff --git a/drivers/scsi/libfc/fc_elsct.c b/drivers/scsi/libfc/fc_elsct.c
index 53748724f2c52e55b8aa93ebf8bd9cfc554a7015..e9412b710fab7278e59ba9df393b235f620e660c 100644 (file)
--- a/drivers/scsi/libfc/fc_elsct.c
+++ b/drivers/scsi/libfc/fc_elsct.c
@@ -63,7 +63,7 @@ struct fc_seq *fc_elsct_send(struct fc_lport *lport, u32 did,
                return NULL;
        }
 
-       fc_fill_fc_hdr(fp, r_ctl, did, fc_host_port_id(lport->host), fh_type,
+       fc_fill_fc_hdr(fp, r_ctl, did, lport->port_id, fh_type,
                       FC_FC_FIRST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0);
 
        return lport->tt.exch_seq_send(lport, fp, resp, NULL, arg, timer_msec);

diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
index 6addbd6e41e2b3e5351ce24a0d058f8709d51716..104e0fba7c43bb71dff75eb8650c16f5668679c3 100644 (file)
--- a/drivers/scsi/libfc/fc_exch.c
+++ b/drivers/scsi/libfc/fc_exch.c
@@ -1927,7 +1927,7 @@ static void fc_exch_rrq(struct fc_exch *ep)
                did = ep->sid;
 
        fc_fill_fc_hdr(fp, FC_RCTL_ELS_REQ, did,
-                      fc_host_port_id(lport->host), FC_TYPE_ELS,
+                      lport->port_id, FC_TYPE_ELS,
                       FC_FC_FIRST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0);
 
        if (fc_exch_seq_send(lport, fp, fc_exch_rrq_resp, NULL, ep,

diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index 81a7c976b3730f3b2b40b784e14e6ee658ace16b..ec1f66c4a9d4054de233970cf5998cd2d2c9d09e 100644 (file)
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -490,7 +490,7 @@ crc_err:
                        if (stats->InvalidCRCCount++ < 5)
                                printk(KERN_WARNING "libfc: CRC error on data "
                                       "frame for port (%6.6x)\n",
-                                      fc_host_port_id(lport->host));
+                                      lport->port_id);
                        put_cpu();
                        /*
                         * Assume the frame is total garbage.
@@ -1109,7 +1109,7 @@ static int fc_fcp_cmd_send(struct fc_lport *lport, struct fc_fcp_pkt *fsp,
        rpriv = rport->dd_data;
 
        fc_fill_fc_hdr(fp, FC_RCTL_DD_UNSOL_CMD, rport->port_id,
-                      fc_host_port_id(rpriv->local_port->host), FC_TYPE_FCP,
+                      rpriv->local_port->port_id, FC_TYPE_FCP,
                       FC_FC_FIRST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0);
 
        seq = lport->tt.exch_seq_send(lport, fp, resp, fc_fcp_pkt_destroy,
@@ -1382,7 +1382,7 @@ static void fc_fcp_rec(struct fc_fcp_pkt *fsp)
 
        fr_seq(fp) = fsp->seq_ptr;
        fc_fill_fc_hdr(fp, FC_RCTL_ELS_REQ, rport->port_id,
-                      fc_host_port_id(rpriv->local_port->host), FC_TYPE_ELS,
+                      rpriv->local_port->port_id, FC_TYPE_ELS,
                       FC_FC_FIRST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0);
        if (lport->tt.elsct_send(lport, rport->port_id, fp, ELS_REC,
                                 fc_fcp_rec_resp, fsp,
@@ -1640,7 +1640,7 @@ static void fc_fcp_srr(struct fc_fcp_pkt *fsp, enum fc_rctl r_ctl, u32 offset)
        srr->srr_rel_off = htonl(offset);
 
        fc_fill_fc_hdr(fp, FC_RCTL_ELS4_REQ, rport->port_id,
-                      fc_host_port_id(rpriv->local_port->host), FC_TYPE_FCP,
+                      rpriv->local_port->port_id, FC_TYPE_FCP,
                       FC_FC_FIRST_SEQ | FC_FC_END_SEQ | FC_FC_SEQ_INIT, 0);
 
        seq = lport->tt.exch_seq_send(lport, fp, fc_fcp_srr_resp, NULL,
@@ -2101,12 +2101,12 @@ int fc_eh_host_reset(struct scsi_cmnd *sc_cmd)
 
        if (fc_fcp_lport_queue_ready(lport)) {
                shost_printk(KERN_INFO, shost, "libfc: Host reset succeeded "
-                            "on port (%6.6x)\n", fc_host_port_id(lport->host));
+                            "on port (%6.6x)\n", lport->port_id);
                return SUCCESS;
        } else {
                shost_printk(KERN_INFO, shost, "libfc: Host reset failed, "
                             "port (%6.6x) is not ready.\n",
-                            fc_host_port_id(lport->host));
+                            lport->port_id);
                return FAILED;
        }
 }
@@ -2191,7 +2191,7 @@ void fc_fcp_destroy(struct fc_lport *lport)
 
        if (!list_empty(&si->scsi_pkt_queue))
                printk(KERN_ERR "libfc: Leaked SCSI packets when destroying "
-                      "port (%6.6x)\n", fc_host_port_id(lport->host));
+                      "port (%6.6x)\n", lport->port_id);
 
        mempool_destroy(si->scsi_pkt_pool);
        kfree(si);

diff --git a/drivers/scsi/libfc/fc_libfc.h b/drivers/scsi/libfc/fc_libfc.h
index efc6b3fe6f35a1bb1852d0c42973ef2bc4a23973..f5c0ca4b6ef8289e0776f10d50ca528b7192f09f 100644 (file)
--- a/drivers/scsi/libfc/fc_libfc.h
+++ b/drivers/scsi/libfc/fc_libfc.h
@@ -47,7 +47,7 @@ extern unsigned int fc_debug_logging;
        FC_CHECK_LOGGING(FC_LPORT_LOGGING,                              \
                         printk(KERN_INFO "host%u: lport %6.6x: " fmt,  \
                                (lport)->host->host_no,                 \
-                               fc_host_port_id((lport)->host), ##args))
+                               (lport)->port_id, ##args))
 
 #define FC_DISC_DBG(disc, fmt, args...)                                \
        FC_CHECK_LOGGING(FC_DISC_LOGGING,                       \

diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c
index 7159bcfa8ec3f078bd074be782fdf4df52f79dea..79c9e3ccd34153dd8424c730b842f0fecc8237b0 100644 (file)
--- a/drivers/scsi/libfc/fc_lport.c
+++ b/drivers/scsi/libfc/fc_lport.c
@@ -565,7 +565,7 @@ void __fc_linkup(struct fc_lport *lport)
 void fc_linkup(struct fc_lport *lport)
 {
        printk(KERN_INFO "host%d: libfc: Link up on port (%6.6x)\n",
-              lport->host->host_no, fc_host_port_id(lport->host));
+              lport->host->host_no, lport->port_id);
 
        mutex_lock(&lport->lp_mutex);
        __fc_linkup(lport);
@@ -595,7 +595,7 @@ void __fc_linkdown(struct fc_lport *lport)
 void fc_linkdown(struct fc_lport *lport)
 {
        printk(KERN_INFO "host%d: libfc: Link down on port (%6.6x)\n",
-              lport->host->host_no, fc_host_port_id(lport->host));
+              lport->host->host_no, lport->port_id);
 
        mutex_lock(&lport->lp_mutex);
        __fc_linkdown(lport);
@@ -697,7 +697,7 @@ void fc_lport_disc_callback(struct fc_lport *lport, enum fc_disc_event event)
        case DISC_EV_FAILED:
                printk(KERN_ERR "host%d: libfc: "
                       "Discovery failed for port (%6.6x)\n",
-                      lport->host->host_no, fc_host_port_id(lport->host));
+                      lport->host->host_no, lport->port_id);
                mutex_lock(&lport->lp_mutex);
                fc_lport_enter_reset(lport);
                mutex_unlock(&lport->lp_mutex);
@@ -745,7 +745,11 @@ static void fc_lport_set_port_id(struct fc_lport *lport, u32 port_id,
                printk(KERN_INFO "host%d: Assigned Port ID %6.6x\n",
                       lport->host->host_no, port_id);
 
+       lport->port_id = port_id;
+
+       /* Update the fc_host */
        fc_host_port_id(lport->host) = port_id;
+
        if (lport->tt.lport_set_port_id)
                lport->tt.lport_set_port_id(lport, port_id, fp);
 }
@@ -950,7 +954,7 @@ static void fc_lport_reset_locked(struct fc_lport *lport)
        lport->tt.exch_mgr_reset(lport, 0, 0);
        fc_host_fabric_name(lport->host) = 0;
 
-       if (fc_host_port_id(lport->host))
+       if (lport->port_id)
                fc_lport_set_port_id(lport, 0, NULL);
 }
 
@@ -1695,7 +1699,7 @@ static int fc_lport_els_request(struct fc_bsg_job *job,
        fh = fc_frame_header_get(fp);
        fh->fh_r_ctl = FC_RCTL_ELS_REQ;
        hton24(fh->fh_d_id, did);
-       hton24(fh->fh_s_id, fc_host_port_id(lport->host));
+       hton24(fh->fh_s_id, lport->port_id);
        fh->fh_type = FC_TYPE_ELS;
        hton24(fh->fh_f_ctl, FC_FC_FIRST_SEQ |
               FC_FC_END_SEQ | FC_FC_SEQ_INIT);
@@ -1755,7 +1759,7 @@ static int fc_lport_ct_request(struct fc_bsg_job *job,
        fh = fc_frame_header_get(fp);
        fh->fh_r_ctl = FC_RCTL_DD_UNSOL_CTL;
        hton24(fh->fh_d_id, did);
-       hton24(fh->fh_s_id, fc_host_port_id(lport->host));
+       hton24(fh->fh_s_id, lport->port_id);
        fh->fh_type = FC_TYPE_CT;
        hton24(fh->fh_f_ctl, FC_FC_FIRST_SEQ |
               FC_FC_END_SEQ | FC_FC_SEQ_INIT);

diff --git a/drivers/scsi/libfc/fc_npiv.c b/drivers/scsi/libfc/fc_npiv.c
index 45b6f1e2df92eecff08e2ac04bb9129f3ec8fbb5..dd2b43bb1c70887259b1bb526b219871614db918 100644 (file)
--- a/drivers/scsi/libfc/fc_npiv.c
+++ b/drivers/scsi/libfc/fc_npiv.c
@@ -69,7 +69,7 @@ struct fc_lport *fc_vport_id_lookup(struct fc_lport *n_port, u32 port_id)
        struct fc_lport *lport = NULL;
        struct fc_lport *vn_port;
 
-       if (fc_host_port_id(n_port->host) == port_id)
+       if (n_port->port_id == port_id)
                return n_port;
 
        if (port_id == FC_FID_FLOGI)
@@ -77,7 +77,7 @@ struct fc_lport *fc_vport_id_lookup(struct fc_lport *n_port, u32 port_id)
 
        mutex_lock(&n_port->lp_mutex);
        list_for_each_entry(vn_port, &n_port->vports, list) {
-               if (fc_host_port_id(vn_port->host) == port_id) {
+               if (vn_port->port_id == port_id) {
                        lport = vn_port;
                        break;
                }

diff --git a/include/scsi/fc_encode.h b/include/scsi/fc_encode.h
index 8eb0a0fc0a719062f616b9523818534ef57f6338..9b4867c9c2d2e6cf8c433ef903b2d4d168b1848e 100644 (file)
--- a/include/scsi/fc_encode.h
+++ b/include/scsi/fc_encode.h
@@ -74,7 +74,7 @@ static inline void fc_adisc_fill(struct fc_lport *lport, struct fc_frame *fp)
        adisc->adisc_cmd = ELS_ADISC;
        put_unaligned_be64(lport->wwpn, &adisc->adisc_wwpn);
        put_unaligned_be64(lport->wwnn, &adisc->adisc_wwnn);
-       hton24(adisc->adisc_port_id, fc_host_port_id(lport->host));
+       hton24(adisc->adisc_port_id, lport->port_id);
 }
 
 /**
@@ -127,15 +127,13 @@ static inline int fc_ct_fill(struct fc_lport *lport,
 
        case FC_NS_RFT_ID:
                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rft));
-               hton24(ct->payload.rft.fid.fp_fid,
-                      fc_host_port_id(lport->host));
+               hton24(ct->payload.rft.fid.fp_fid, lport->port_id);
                ct->payload.rft.fts = lport->fcts;
                break;
 
        case FC_NS_RFF_ID:
                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rff_id));
-               hton24(ct->payload.rff.fr_fid.fp_fid,
-                      fc_host_port_id(lport->host));
+               hton24(ct->payload.rff.fr_fid.fp_fid, lport->port_id);
                ct->payload.rff.fr_type = FC_TYPE_FCP;
                if (lport->service_params & FCP_SPPF_INIT_FCN)
                        ct->payload.rff.fr_feat = FCP_FEAT_INIT;
@@ -145,16 +143,14 @@ static inline int fc_ct_fill(struct fc_lport *lport,
 
        case FC_NS_RNN_ID:
                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rn_id));
-               hton24(ct->payload.rn.fr_fid.fp_fid,
-                      fc_host_port_id(lport->host));
+               hton24(ct->payload.rn.fr_fid.fp_fid, lport->port_id);
                put_unaligned_be64(lport->wwnn, &ct->payload.rn.fr_wwn);
                break;
 
        case FC_NS_RSPN_ID:
                len = strnlen(fc_host_symbolic_name(lport->host), 255);
                ct = fc_ct_hdr_fill(fp, op, sizeof(struct fc_ns_rspn) + len);
-               hton24(ct->payload.spn.fr_fid.fp_fid,
-                      fc_host_port_id(lport->host));
+               hton24(ct->payload.spn.fr_fid.fp_fid, lport->port_id);
                strncpy(ct->payload.spn.fr_name,
                        fc_host_symbolic_name(lport->host), len);
                ct->payload.spn.fr_name_len = len;
@@ -268,7 +264,7 @@ static inline void fc_logo_fill(struct fc_lport *lport, struct fc_frame *fp)
        logo = fc_frame_payload_get(fp, sizeof(*logo));
        memset(logo, 0, sizeof(*logo));
        logo->fl_cmd = ELS_LOGO;
-       hton24(logo->fl_n_port_id, fc_host_port_id(lport->host));
+       hton24(logo->fl_n_port_id, lport->port_id);
        logo->fl_n_port_wwn = htonll(lport->wwpn);
 }
 
@@ -295,7 +291,7 @@ static inline void fc_rec_fill(struct fc_lport *lport, struct fc_frame *fp)
        rec = fc_frame_payload_get(fp, sizeof(*rec));
        memset(rec, 0, sizeof(*rec));
        rec->rec_cmd = ELS_REC;
-       hton24(rec->rec_s_id, fc_host_port_id(lport->host));
+       hton24(rec->rec_s_id, lport->port_id);
        rec->rec_ox_id = htons(ep->oxid);
        rec->rec_rx_id = htons(ep->rxid);
 }

diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 1755fa7e9271ae7f00cf6008f6c477ee8478448f..7495c0ba67ee398ceba1ab8fa9e1ed6ce801958d 100644 (file)
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -780,6 +780,7 @@ struct fc_disc {
  * @dev_stats:             FCoE device stats (TODO: libfc should not be
  *                         FCoE aware)
  * @retry_count:           Number of retries in the current state
+ * @port_id:               FC Port ID
  * @wwpn:                  World Wide Port Name
  * @wwnn:                  World Wide Node Name
  * @service_params:        Common service parameters
@@ -826,6 +827,7 @@ struct fc_lport {
        u8                             retry_count;
 
        /* Fabric information */
+       u32                            port_id;
        u64                            wwpn;
        u64                            wwnn;
        unsigned int                   service_params;