1 files changed, 83 insertions, 14 deletions

diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
index 14be49b44e84..a3cbda4ddb5c 100644
--- a/include/scsi/libfc.h
+++ b/include/scsi/libfc.h
@@ -35,6 +35,8 @@
 
 #include <scsi/fc_frame.h>
 
+#define FC_FC4_PROV_SIZE        (FC_TYPE_FCP + 1)       /* size of tables */
+
 /*
  * libfc error codes
  */
@@ -156,6 +158,7 @@ struct fc_rport_libfc_priv {
         #define FC_RP_FLAGS_REC_SUPPORTED       (1 << 0)
         #define FC_RP_FLAGS_RETRY               (1 << 1)
         #define FC_RP_STARTED                   (1 << 2)
+        #define FC_RP_FLAGS_CONF_REQ            (1 << 3)
         unsigned int               e_d_tov;
         unsigned int               r_a_tov;
 };
@@ -179,6 +182,7 @@ struct fc_rport_libfc_priv {
  * @rp_mutex:       The mutex that protects the remote port
  * @retry_work:     Handle for retries
  * @event_callback: Callback when READY, FAILED or LOGO states complete
+ * @prli_count:     Count of open PRLI sessions in providers
  * @rcu:            Structure used for freeing in an RCU-safe manner
  */
 struct fc_rport_priv {
@@ -202,7 +206,13 @@ struct fc_rport_priv {
         struct list_head            peers;
         struct work_struct          event_work;
         u32                         supported_classes;
+        u16                         prli_count;
         struct rcu_head             rcu;
+        u16                         sp_features;
+        u8                          spp_type;
+        void                        (*lld_event_callback)(struct fc_lport *,
+                                                      struct fc_rport_priv *,
+                                                      enum fc_rport_event);
 };
 
 /**
@@ -221,8 +231,8 @@ struct fc_rport_priv {
  * @InputRequests:         Number of input requests
  * @OutputRequests:        Number of output requests
  * @ControlRequests:       Number of control requests
- * @InputMegabytes:        Number of received megabytes
- * @OutputMegabytes:       Number of transmitted megabytes
+ * @InputBytes:            Number of received bytes
+ * @OutputBytes:           Number of transmitted bytes
  * @VLinkFailureCount:     Number of virtual link failures
  * @MissDiscAdvCount:      Number of missing FIP discovery advertisement
  */
@@ -241,8 +251,8 @@ struct fcoe_dev_stats {
         u64             InputRequests;
         u64             OutputRequests;
         u64             ControlRequests;
-        u64             InputMegabytes;
-        u64             OutputMegabytes;
+        u64             InputBytes;
+        u64             OutputBytes;
         u64             VLinkFailureCount;
         u64             MissDiscAdvCount;
 };
@@ -250,7 +260,7 @@ struct fcoe_dev_stats {
 /**
  * struct fc_seq_els_data - ELS data used for passing ELS specific responses
  * @reason: The reason for rejection
- * @explan: The explaination of the rejection
+ * @explan: The explanation of the rejection
  *
  * Mainly used by the exchange manager layer.
  */
@@ -263,7 +273,6 @@ struct fc_seq_els_data {
  * struct fc_fcp_pkt - FCP request structure (one for each scsi_cmnd request)
  * @lp:              The associated local port
  * @state:           The state of the I/O
- * @tgt_flags:       Target's flags
  * @ref_cnt:         Reference count
  * @scsi_pkt_lock:   Lock to protect the SCSI packet (must be taken before the
  *                   host_lock if both are to be held at the same time)
@@ -298,7 +307,6 @@ struct fc_fcp_pkt {
         /* Housekeeping information */
         struct fc_lport   *lp;
         u16               state;
-        u16               tgt_flags;
         atomic_t          ref_cnt;
         spinlock_t        scsi_pkt_lock;
 
@@ -517,7 +525,7 @@ struct libfc_function_template {
                         struct fc_frame *);
 
         /*
-         * Send an ELS response using infomation from the received frame.
+         * Send an ELS response using information from the received frame.
          *
          * STATUS: OPTIONAL
          */
@@ -553,6 +561,16 @@ struct libfc_function_template {
         struct fc_seq *(*seq_start_next)(struct fc_seq *);
 
         /*
+         * Set a response handler for the exchange of the sequence.
+         *
+         * STATUS: OPTIONAL
+         */
+        void (*seq_set_resp)(struct fc_seq *sp,
+                             void (*resp)(struct fc_seq *, struct fc_frame *,
+                                          void *),
+                             void *arg);
+
+        /*
          * Assign a sequence for an incoming request frame.
          *
          * STATUS: OPTIONAL
@@ -560,6 +578,13 @@ struct libfc_function_template {
         struct fc_seq *(*seq_assign)(struct fc_lport *, struct fc_frame *);
 
         /*
+         * Release the reference on the sequence returned by seq_assign().
+         *
+         * STATUS: OPTIONAL
+         */
+        void (*seq_release)(struct fc_seq *);
+
+        /*
          * Reset an exchange manager, completing all sequences and exchanges.
          * If s_id is non-zero, reset only exchanges originating from that FID.
          * If d_id is non-zero, reset only exchanges sending to that FID.
@@ -638,7 +663,7 @@ struct libfc_function_template {
         int (*rport_logoff)(struct fc_rport_priv *);
 
         /*
-         * Recieve a request from a remote port.
+         * Receive a request from a remote port.
          *
          * STATUS: OPTIONAL
          */
@@ -658,6 +683,15 @@ struct libfc_function_template {
         void (*rport_destroy)(struct kref *);
 
         /*
+         * Callback routine after the remote port is logged in
+         *
+         * STATUS: OPTIONAL
+         */
+        void (*rport_event_callback)(struct fc_lport *,
+                                     struct fc_rport_priv *,
+                                     enum fc_rport_event);
+
+        /*
          * Send a fcp cmd from fsp pkt.
          * Called with the SCSI host lock unlocked and irqs disabled.
          *
@@ -670,7 +704,7 @@ struct libfc_function_template {
                                          void *));
 
         /*
-         * Cleanup the FCP layer, used durring link down and reset
+         * Cleanup the FCP layer, used during link down and reset
          *
          * STATUS: OPTIONAL
          */
@@ -721,7 +755,7 @@ struct libfc_function_template {
  * struct fc_disc - Discovery context
  * @retry_count:   Number of retries
  * @pending:       1 if discovery is pending, 0 if not
- * @requesting:    1 if discovery has been requested, 0 if not
+ * @requested:     1 if discovery has been requested, 0 if not
  * @seq_count:     Number of sequences used for discovery
  * @buf_len:       Length of the discovery buffer
  * @disc_id:       Discovery ID
@@ -751,6 +785,15 @@ struct fc_disc {
                               enum fc_disc_event);
 };
 
+/*
+ * Local port notifier and events.
+ */
+extern struct blocking_notifier_head fc_lport_notifier_head;
+enum fc_lport_event {
+        FC_LPORT_EV_ADD,
+        FC_LPORT_EV_DEL,
+};
+
 /**
  * struct fc_lport - Local port
  * @host:                  The SCSI host associated with a local port
@@ -791,8 +834,10 @@ struct fc_disc {
  * @lso_max:               The maximum large offload send size
  * @fcts:                  FC-4 type mask
  * @lp_mutex:              Mutex to protect the local port
- * @list:                  Handle for list of local ports
+ * @list:                  Linkage on list of vport peers
  * @retry_work:            Handle to local port for delayed retry context
+ * @prov:                  Pointers available for use by passive FC-4 providers
+ * @lport_list:            Linkage on module-wide list of local ports
  */
 struct fc_lport {
         /* Associations */
@@ -848,8 +893,32 @@ struct fc_lport {
         struct mutex                   lp_mutex;
         struct list_head               list;
         struct delayed_work            retry_work;
+        void                           *prov[FC_FC4_PROV_SIZE];
+        struct list_head               lport_list;
 };
 
+/**
+ * struct fc4_prov - FC-4 provider registration
+ * @prli:               Handler for incoming PRLI
+ * @prlo:               Handler for session reset
+ * @recv:               Handler for incoming request
+ * @module:             Pointer to module.  May be NULL.
+ */
+struct fc4_prov {
+        int (*prli)(struct fc_rport_priv *, u32 spp_len,
+                    const struct fc_els_spp *spp_in,
+                    struct fc_els_spp *spp_out);
+        void (*prlo)(struct fc_rport_priv *);
+        void (*recv)(struct fc_lport *, struct fc_frame *);
+        struct module *module;
+};
+
+/*
+ * Register FC-4 provider with libfc.
+ */
+int fc_fc4_register_provider(enum fc_fh_type type, struct fc4_prov *);
+void fc_fc4_deregister_provider(enum fc_fh_type type, struct fc4_prov *);
+
 /*
  * FC_LPORT HELPER FUNCTIONS
  *****************************/
@@ -980,6 +1049,7 @@ struct fc_lport *libfc_vport_create(struct fc_vport *, int privsize);
 struct fc_lport *fc_vport_id_lookup(struct fc_lport *, u32 port_id);
 int fc_lport_bsg_request(struct fc_bsg_job *);
 void fc_lport_set_local_id(struct fc_lport *, u32 port_id);
+void fc_lport_iterate(void (*func)(struct fc_lport *, void *), void *);
 
 /*
  * REMOTE PORT LAYER
@@ -1006,8 +1076,7 @@ void fc_fcp_destroy(struct fc_lport *);
 /*
  * SCSI INTERACTION LAYER
  *****************************/
-int fc_queuecommand(struct scsi_cmnd *,
-                    void (*done)(struct scsi_cmnd *));
+int fc_queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
 int fc_eh_abort(struct scsi_cmnd *);
 int fc_eh_device_reset(struct scsi_cmnd *);
 int fc_eh_host_reset(struct scsi_cmnd *);