1 files changed, 37 insertions, 5 deletions

diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
index 953603a7a43c..834b699cac76 100644
--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -187,11 +187,17 @@ struct lpfc_sli_intf {
 /* Active interrupt test count */
 #define LPFC_ACT_INTR_CNT       4
 
+/* Algrithmns for scheduling FCP commands to WQs */
+#define LPFC_FCP_SCHED_ROUND_ROBIN      0
+#define LPFC_FCP_SCHED_BY_CPU           1
+
 /* Delay Multiplier constant */
 #define LPFC_DMULT_CONST       651042
-#define LPFC_MIM_IMAX          636
-#define LPFC_FP_DEF_IMAX       10000
-#define LPFC_SP_DEF_IMAX       10000
+
+/* Configuration of Interrupts / sec for entire HBA port */
+#define LPFC_MIN_IMAX          5000
+#define LPFC_MAX_IMAX          5000000
+#define LPFC_DEF_IMAX          50000
 
 /* PORT_CAPABILITIES constants. */
 #define LPFC_MAX_SUPPORTED_PAGES        8
@@ -338,7 +344,7 @@ struct lpfc_cqe {
  * Define mask value for xri_aborted and wcqe completed CQE extended status.
  * Currently, extended status is limited to 9 bits (0x0 -> 0x103) .
  */
-#define WCQE_PARAM_MASK         0x1FF;
+#define WCQE_PARAM_MASK         0x1FF
 
 /* completion queue entry for wqe completions */
 struct lpfc_wcqe_complete {
@@ -880,13 +886,19 @@ struct mbox_header {
 #define LPFC_MBOX_OPCODE_EQ_DESTROY                     0x37
 #define LPFC_MBOX_OPCODE_QUERY_FW_CFG                   0x3A
 #define LPFC_MBOX_OPCODE_FUNCTION_RESET                 0x3D
+#define LPFC_MBOX_OPCODE_SET_PHYSICAL_LINK_CONFIG       0x3E
+#define LPFC_MBOX_OPCODE_SET_BOOT_CONFIG                0x43
 #define LPFC_MBOX_OPCODE_GET_PORT_NAME                  0x4D
 #define LPFC_MBOX_OPCODE_MQ_CREATE_EXT                  0x5A
+#define LPFC_MBOX_OPCODE_GET_VPD_DATA                   0x5B
+#define LPFC_MBOX_OPCODE_SEND_ACTIVATION                0x73
+#define LPFC_MBOX_OPCODE_RESET_LICENSES                 0x74
 #define LPFC_MBOX_OPCODE_GET_RSRC_EXTENT_INFO           0x9A
 #define LPFC_MBOX_OPCODE_GET_ALLOC_RSRC_EXTENT          0x9B
 #define LPFC_MBOX_OPCODE_ALLOC_RSRC_EXTENT              0x9C
 #define LPFC_MBOX_OPCODE_DEALLOC_RSRC_EXTENT            0x9D
 #define LPFC_MBOX_OPCODE_GET_FUNCTION_CONFIG            0xA0
+#define LPFC_MBOX_OPCODE_GET_PROFILE_CAPACITIES         0xA1
 #define LPFC_MBOX_OPCODE_GET_PROFILE_CONFIG             0xA4
 #define LPFC_MBOX_OPCODE_SET_PROFILE_CONFIG             0xA5
 #define LPFC_MBOX_OPCODE_GET_PROFILE_LIST               0xA6
@@ -1382,6 +1394,11 @@ struct lpfc_mbx_set_link_diag_state {
 #define lpfc_mbx_set_diag_state_diag_SHIFT      0
 #define lpfc_mbx_set_diag_state_diag_MASK       0x00000001
 #define lpfc_mbx_set_diag_state_diag_WORD       word0
+#define lpfc_mbx_set_diag_state_diag_bit_valid_SHIFT    2
+#define lpfc_mbx_set_diag_state_diag_bit_valid_MASK     0x00000001
+#define lpfc_mbx_set_diag_state_diag_bit_valid_WORD     word0
+#define LPFC_DIAG_STATE_DIAG_BIT_VALID_NO_CHANGE        0
+#define LPFC_DIAG_STATE_DIAG_BIT_VALID_CHANGE           1
 #define lpfc_mbx_set_diag_state_link_num_SHIFT  16
 #define lpfc_mbx_set_diag_state_link_num_MASK   0x0000003F
 #define lpfc_mbx_set_diag_state_link_num_WORD   word0
@@ -2556,7 +2573,7 @@ struct lpfc_mbx_get_sli4_parameters {
 };
 
 struct lpfc_rscr_desc_generic {
-#define LPFC_RSRC_DESC_WSIZE                    18
+#define LPFC_RSRC_DESC_WSIZE                    22
         uint32_t desc[LPFC_RSRC_DESC_WSIZE];
 };
 
@@ -2566,6 +2583,9 @@ struct lpfc_rsrc_desc_pcie {
 #define lpfc_rsrc_desc_pcie_type_MASK           0x000000ff
 #define lpfc_rsrc_desc_pcie_type_WORD           word0
 #define LPFC_RSRC_DESC_TYPE_PCIE                0x40
+#define lpfc_rsrc_desc_pcie_length_SHIFT        8
+#define lpfc_rsrc_desc_pcie_length_MASK         0x000000ff
+#define lpfc_rsrc_desc_pcie_length_WORD         word0
         uint32_t word1;
 #define lpfc_rsrc_desc_pcie_pfnum_SHIFT         0
 #define lpfc_rsrc_desc_pcie_pfnum_MASK          0x000000ff
@@ -2593,6 +2613,12 @@ struct lpfc_rsrc_desc_fcfcoe {
 #define lpfc_rsrc_desc_fcfcoe_type_MASK         0x000000ff
 #define lpfc_rsrc_desc_fcfcoe_type_WORD         word0
 #define LPFC_RSRC_DESC_TYPE_FCFCOE              0x43
+#define lpfc_rsrc_desc_fcfcoe_length_SHIFT      8
+#define lpfc_rsrc_desc_fcfcoe_length_MASK       0x000000ff
+#define lpfc_rsrc_desc_fcfcoe_length_WORD       word0
+#define LPFC_RSRC_DESC_TYPE_FCFCOE_V0_RSVD      0
+#define LPFC_RSRC_DESC_TYPE_FCFCOE_V0_LENGTH    72
+#define LPFC_RSRC_DESC_TYPE_FCFCOE_V1_LENGTH    88
         uint32_t word1;
 #define lpfc_rsrc_desc_fcfcoe_vfnum_SHIFT       0
 #define lpfc_rsrc_desc_fcfcoe_vfnum_MASK        0x000000ff
@@ -2651,6 +2677,12 @@ struct lpfc_rsrc_desc_fcfcoe {
 #define lpfc_rsrc_desc_fcfcoe_eq_cnt_SHIFT      16
 #define lpfc_rsrc_desc_fcfcoe_eq_cnt_MASK       0x0000ffff
 #define lpfc_rsrc_desc_fcfcoe_eq_cnt_WORD       word13
+/* extended FC/FCoE Resource Descriptor when length = 88 bytes */
+        uint32_t bw_min;
+        uint32_t bw_max;
+        uint32_t iops_min;
+        uint32_t iops_max;
+        uint32_t reserved[4];
 };
 
 struct lpfc_func_cfg {