[SCSI] bfa: statistics and typo fix

- Added time stamp for fcport stats reset
- Added new fileds to the statistics data structures.
- Typo removal and minor cleanup.

Signed-off-by: Jing Huang <huangj@brocade.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

9 files changed, 50 insertions, 37 deletions

diff --git a/drivers/scsi/bfa/include/bfa.h b/drivers/scsi/bfa/include/bfa.h
index 1f5966cfbd16..9519a6d81045 100644
--- a/drivers/scsi/bfa/include/bfa.h
+++ b/drivers/scsi/bfa/include/bfa.h
@@ -126,6 +126,8 @@ struct bfa_sge_s {
         bfa_ioc_get_type(&(__bfa)->ioc)
 #define bfa_get_mac(__bfa)  \
         bfa_ioc_get_mac(&(__bfa)->ioc)
+#define bfa_get_fw_clock_res(__bfa)    \
+        ((__bfa)->iocfc.cfgrsp->fwcfg.fw_tick_res)
 
 /*
  * bfa API functions
diff --git a/drivers/scsi/bfa/include/cna/port/bfa_port.h b/drivers/scsi/bfa/include/cna/port/bfa_port.h
index 7cbf17d3141b..d7babaf97848 100644
--- a/drivers/scsi/bfa/include/cna/port/bfa_port.h
+++ b/drivers/scsi/bfa/include/cna/port/bfa_port.h
@@ -37,6 +37,7 @@ struct bfa_port_s {
         bfa_port_stats_cbfn_t stats_cbfn;
         void           *stats_cbarg;
         bfa_status_t    stats_status;
+        u32             stats_reset_time;
         union bfa_pport_stats_u *stats;
         struct bfa_dma_s stats_dma;
         bfa_boolean_t   endis_pending;
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_auth.h b/drivers/scsi/bfa/include/defs/bfa_defs_auth.h
index 45df32820911..f56ed871bb99 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_auth.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_auth.h
@@ -125,10 +125,10 @@ struct bfa_auth_attr_s {
         enum bfa_auth_status    status;
         enum bfa_auth_algo      algo;
         enum bfa_auth_group     dh_grp;
-        u16             rjt_code;
-        u16             rjt_code_exp;
+        enum bfa_auth_rej_code  rjt_code;
+        enum bfa_auth_rej_code_exp rjt_code_exp;
         u8                      secret_set;
-        u8                      resv[7];
+        u8                      resv[3];
 };
 
 #endif /* __BFA_DEFS_AUTH_H__ */
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_fcport.h b/drivers/scsi/bfa/include/defs/bfa_defs_fcport.h
index a07ef4a3cd78..af86a6396439 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_fcport.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_fcport.h
@@ -48,7 +48,7 @@ struct bfa_fcoe_stats_s {
         u64     disc_fcf_unavail; /*  Discovery FCF not avail        */
         u64     linksvc_unsupp; /*  FIP link service req unsupp.    */
         u64     linksvc_err;    /*  FIP link service req errors     */
-        u64     logo_req;       /*  FIP logo                         */
+        u64     logo_req;       /*  FIP logos received                       */
         u64     clrvlink_req;   /*  Clear virtual link requests     */
         u64     op_unsupp;      /*  FIP operation unsupp.            */
         u64     untagged;       /*  FIP untagged frames      */
@@ -64,21 +64,15 @@ struct bfa_fcoe_stats_s {
         u64     txf_timeout;    /*  Tx timeouts              */
         u64     txf_parity_errors; /*  Transmit parity err           */
         u64     txf_fid_parity_errors; /*  Transmit FID parity err  */
-        u64     tx_pause;       /*  Tx pause frames                  */
-        u64     tx_zero_pause;  /*  Tx zero pause frames             */
-        u64     tx_first_pause; /*  Tx first pause frames            */
-        u64     rx_pause;       /*  Rx pause frames                  */
-        u64     rx_zero_pause;  /*  Rx zero pause frames             */
-        u64     rx_first_pause; /*  Rx first pause frames            */
-        u64     rxf_ucast_octets; /*  Rx unicast octets      */
-        u64     rxf_ucast;      /*  Rx unicast frames                */
-        u64     rxf_ucast_vlan; /*  Rx unicast vlan frames           */
-        u64     rxf_mcast_octets; /*  Rx multicast octets            */
-        u64     rxf_mcast;      /*  Rx multicast frames      */
-        u64     rxf_mcast_vlan; /*  Rx multicast vlan frames         */
-        u64     rxf_bcast_octets; /*  Rx broadcast octests           */
-        u64     rxf_bcast;      /*  Rx broadcast frames      */
-        u64     rxf_bcast_vlan; /*  Rx broadcast vlan frames         */
+        u64     rxf_ucast_octets; /* Rx FCoE unicast octets        */
+        u64     rxf_ucast;      /* Rx FCoE unicast frames          */
+        u64     rxf_ucast_vlan; /* Rx FCoE unicast vlan frames     */
+        u64     rxf_mcast_octets; /* Rx FCoE multicast octets      */
+        u64     rxf_mcast;      /* Rx FCoE multicast frames        */
+        u64     rxf_mcast_vlan; /* Rx FCoE multicast vlan frames   */
+        u64     rxf_bcast_octets; /* Rx FCoE broadcast octets      */
+        u64     rxf_bcast;      /* Rx FCoE broadcast frames        */
+        u64     rxf_bcast_vlan; /* Rx FCoE broadcast vlan frames   */
 };
 
 /**
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h b/drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h
index c290fb13d2d1..31e728a631ed 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h
@@ -51,8 +51,10 @@ struct bfa_iocfc_fwcfg_s {
         u16        num_tsktm_reqs;      /*  TM task management requests*/
         u16        num_fcxp_reqs;       /*  unassisted FC exchanges     */
         u16        num_uf_bufs; /*  unsolicited recv buffers    */
-        u8              num_cqs;
-        u8              rsvd[5];
+        u8         num_cqs;
+        u8         fw_tick_res;    /*!< FW clock resolution in ms */
+        u8         rsvd[4];
+
 };
 
 struct bfa_iocfc_drvcfg_s {
@@ -176,10 +178,10 @@ struct bfa_fw_port_fpg_stats_s {
     u32    nos_rx;
     u32    lip_rx;
     u32    arbf0_rx;
+    u32    arb_rx;
     u32    mrk_rx;
     u32    const_mrk_rx;
     u32    prim_unknown;
-    u32    rsvd;
 };
 
 
@@ -200,6 +202,8 @@ struct bfa_fw_port_lksm_stats_s {
     u32    lrr_tx;             /*  No. of times LRR tx started         */
     u32    ols_tx;             /*  No. of times OLS tx started         */
     u32    nos_tx;             /*  No. of times NOS tx started         */
+    u32    hwsm_lrr_rx;        /*  No. of times LRR rx-ed by HWSM      */
+    u32    hwsm_lr_rx;         /* No. of times LR rx-ed by HWSM        */
 };
 
 
@@ -239,7 +243,7 @@ struct bfa_fw_fip_stats_s {
     u32    disc_fcf_unavail;   /*  Discovery FCF Not Avail.            */
     u32    linksvc_unsupp;     /*  Unsupported link service req        */
     u32    linksvc_err;        /*  Parse error in link service req     */
-    u32    logo_req;           /*  Number of FIP logos received        */
+    u32    logo_req;           /*  FIP logos received                  */
     u32    clrvlink_req;       /*  Clear virtual link req              */
     u32    op_unsupp;          /*  Unsupported FIP operation           */
     u32    untagged;           /*  Untagged frames (ignored)           */
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_itnim.h b/drivers/scsi/bfa/include/defs/bfa_defs_itnim.h
index 2ec769903d24..d77788b3999a 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_itnim.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_itnim.h
@@ -34,6 +34,15 @@ enum bfa_itnim_state {
         BFA_ITNIM_INITIATIOR    = 7,    /*  initiator */
 };
 
+struct bfa_itnim_latency_s {
+        u32     min;
+        u32     max;
+        u32     count;
+        u32     clock_res;
+        u32     avg;
+        u32     rsvd;
+};
+
 struct bfa_itnim_hal_stats_s {
         u32     onlines;        /*  ITN nexus onlines (PRLI done) */
         u32     offlines;       /*  ITN Nexus offlines  */
@@ -91,6 +100,7 @@ struct bfa_itnim_attr_s {
         u8      task_retry_id;  /*  task retry ident support   */
         u8 rec_support;    /*  REC supported              */
         u8 conf_comp;      /*  confirmed completion supp  */
+        struct bfa_itnim_latency_s  io_latency; /* IO latency  */
 };
 
 /**
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_port.h b/drivers/scsi/bfa/include/defs/bfa_defs_port.h
index 752a81293d5a..ebdf0d1731a4 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_port.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_port.h
@@ -159,7 +159,7 @@ struct bfa_port_stats_s {
         u32        ms_plogi_rsp_err;
         u32        ms_plogi_acc_err;
         u32        ms_plogi_accepts;
-        u32        ms_rejects;  /* NS command rejects */
+        u32        ms_rejects;  /* MS command rejects */
         u32        ms_plogi_unknown_rsp;
         u32        ms_plogi_alloc_wait;
 
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_pport.h b/drivers/scsi/bfa/include/defs/bfa_defs_pport.h
index de6181cf9677..2c2cec5ee278 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_pport.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_pport.h
@@ -246,7 +246,7 @@ struct bfa_pport_fc_stats_s {
         u64    secs_reset; /* Seconds since stats is reset     */
         u64    tx_frames;  /* Tx frames                */
         u64    tx_words;   /* Tx words                 */
-        u64    tx_lip;     /* TX LIP               */
+        u64    tx_lip;     /* Tx LIP               */
         u64    tx_nos;     /* Tx NOS               */
         u64    tx_ols;     /* Tx OLS               */
         u64    tx_lr;      /* Tx LR                */
@@ -312,7 +312,7 @@ struct bfa_pport_eth_stats_s {
         u64    rx_zero_pause;    /* Rx zero pause              */
         u64    tx_pause;     /* Tx pause               */
         u64    tx_zero_pause;    /* Tx zero pause              */
-        u64    rx_fcoe_pause;    /* Rx fcoe pause              */
+        u64    rx_fcoe_pause;    /* Rx FCoE pause              */
         u64    rx_fcoe_zero_pause; /* Rx FCoE zero pause       */
         u64    tx_fcoe_pause;    /* Tx FCoE pause              */
         u64    tx_fcoe_zero_pause; /* Tx FCoE zero pause       */
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_status.h b/drivers/scsi/bfa/include/defs/bfa_defs_status.h
index 819db5abf461..7cef900707c5 100644
--- a/drivers/scsi/bfa/include/defs/bfa_defs_status.h
+++ b/drivers/scsi/bfa/include/defs/bfa_defs_status.h
@@ -84,8 +84,9 @@ enum bfa_status {
         BFA_STATUS_BADFRMHDR    = 48,   /*  Bad frame header */
         BFA_STATUS_BADFRMSZ     = 49,   /*  Bad frame size check and replace
                                          * SFP/cable */
-        BFA_STATUS_MISSINGFRM   = 50,   /*  Missing frame check and replace
-                                         * SFP/cable */
+        BFA_STATUS_MISSINGFRM   = 50,   /* Missing frame check and replace
+                                         * SFP/cable or for Mezz card check and
+                                         * replace pass through module */
         BFA_STATUS_LINKTIMEOUT  = 51,   /*  Link timeout check and replace
                                          * SFP/cable */
         BFA_STATUS_NO_FCPIM_NEXUS = 52, /*  No FCP Nexus exists with the
@@ -173,7 +174,7 @@ enum bfa_status {
         BFA_STATUS_LEDTEST_OP = 109, /*  LED test is operating */
         BFA_STATUS_CEE_NOT_DN = 110, /*  eth port is not at down state, please
                                       * bring down first */
-        BFA_STATUS_10G_SPD = 111, /*  Speed setting not valid for 10G HBA */
+        BFA_STATUS_10G_SPD = 111, /*  Speed setting not valid for 10G CNA */
         BFA_STATUS_IM_INV_TEAM_NAME = 112, /*  Invalid team name */
         BFA_STATUS_IM_DUP_TEAM_NAME = 113, /*  Given team name already
                                             * exists */
@@ -215,11 +216,11 @@ enum bfa_status {
         BFA_STATUS_BAD_ASICBLK = 132, /*  Bad ASIC block */
         BFA_STATUS_NO_DRIVER = 133, /*  Brocade adapter/driver not installed
                                      *  or loaded */
-        BFA_STATUS_INVALID_MAC = 134, /*  Invalid mac address */
+        BFA_STATUS_INVALID_MAC = 134, /*  Invalid MAC address */
         BFA_STATUS_IM_NO_VLAN = 135, /*  No VLANs configured on the adapter */
         BFA_STATUS_IM_ETH_LB_FAILED = 136, /*  Ethernet loopback test failed */
-        BFA_STATUS_IM_PVID_REMOVE = 137, /*  Cannot remove port vlan (PVID) */
-        BFA_STATUS_IM_PVID_EDIT = 138, /*  Cannot edit port vlan (PVID) */
+        BFA_STATUS_IM_PVID_REMOVE = 137, /* Cannot remove port VLAN (PVID) */
+        BFA_STATUS_IM_PVID_EDIT = 138, /* Cannot edit port VLAN (PVID) */
         BFA_STATUS_CNA_NO_BOOT = 139, /*  Boot upload not allowed for CNA */
         BFA_STATUS_IM_PVID_NON_ZERO = 140, /*  Port VLAN ID (PVID) is Set to
                                             * Non-Zero Value */
@@ -233,14 +234,15 @@ enum bfa_status {
         BFA_STATUS_INSUFFICIENT_PERMS = 144, /*  User doesn't have sufficient
                                               * permissions to execute the BCU
                                               * application */
-        BFA_STATUS_IM_INV_VLAN_NAME = 145, /*  Invalid/Reserved Vlan name
+        BFA_STATUS_IM_INV_VLAN_NAME = 145, /* Invalid/Reserved VLAN name
                                             * string. The name is not allowed
-                                            * for the normal Vlans */
+                                            * for the normal VLAN */
         BFA_STATUS_CMD_NOTSUPP_CNA = 146, /*  Command not supported for CNA */
-        BFA_STATUS_IM_PASSTHRU_EDIT = 147, /*  Can not edit passthru vlan id */
-        BFA_STATUS_IM_BIND_FAILED = 148, /*! < IM Driver bind operation
+        BFA_STATUS_IM_PASSTHRU_EDIT = 147, /* Can not edit passthrough VLAN
+                                            * id */
+        BFA_STATUS_IM_BIND_FAILED = 148, /* IM Driver bind operation
                                           * failed */
-        BFA_STATUS_IM_UNBIND_FAILED = 149, /* ! < IM Driver unbind operation
+        BFA_STATUS_IM_UNBIND_FAILED = 149, /* IM Driver unbind operation
                                             * failed */
         BFA_STATUS_IM_PORT_IN_TEAM = 150, /*  Port is already part of the
                                            * team */