net/qede/base: move code bits
[dpdk.git] / drivers / net / qede / base / mcp_public.h
index 969dd5a..8d65390 100644 (file)
@@ -294,16 +294,20 @@ struct dcbx_ets_feature {
 #define DCBX_ETS_CBS_SHIFT                      3
 #define DCBX_ETS_MAX_TCS_MASK                   0x000000f0
 #define DCBX_ETS_MAX_TCS_SHIFT                  4
-#define DCBX_ISCSI_OOO_TC_MASK                 0x00000f00
-#define DCBX_ISCSI_OOO_TC_SHIFT                 8
+#define DCBX_OOO_TC_MASK                        0x00000f00
+#define DCBX_OOO_TC_SHIFT                       8
 /* Entries in tc table are orginized that the left most is pri 0, right most is
  * prio 7
  */
 
        u32  pri_tc_tbl[1];
-#define DCBX_ISCSI_OOO_TC                      (4)
+/* Fixed TCP OOO TC usage is deprecated and used only for driver backward
+ * compatibility
+ */
+#define DCBX_TCP_OOO_TC                                (4)
+#define DCBX_TCP_OOO_K2_4PORT_TC               (3)
 
-#define NIG_ETS_ISCSI_OOO_CLIENT_OFFSET                (DCBX_ISCSI_OOO_TC + 1)
+#define NIG_ETS_ISCSI_OOO_CLIENT_OFFSET                (DCBX_TCP_OOO_TC + 1)
 #define DCBX_CEE_STRICT_PRIORITY               0xf
 /* Entries in tc table are orginized that the left most is pri 0, right most is
  * prio 7
@@ -586,14 +590,14 @@ struct public_port {
        u32 link_status;
 #define LINK_STATUS_LINK_UP                            0x00000001
 #define LINK_STATUS_SPEED_AND_DUPLEX_MASK              0x0000001e
-#define LINK_STATUS_SPEED_AND_DUPLEX_1000THD                   (1 << 1)
-#define LINK_STATUS_SPEED_AND_DUPLEX_1000TFD                   (2 << 1)
-#define LINK_STATUS_SPEED_AND_DUPLEX_10G                       (3 << 1)
-#define LINK_STATUS_SPEED_AND_DUPLEX_20G                       (4 << 1)
-#define LINK_STATUS_SPEED_AND_DUPLEX_40G                       (5 << 1)
-#define LINK_STATUS_SPEED_AND_DUPLEX_50G                       (6 << 1)
-#define LINK_STATUS_SPEED_AND_DUPLEX_100G                      (7 << 1)
-#define LINK_STATUS_SPEED_AND_DUPLEX_25G                       (8 << 1)
+#define LINK_STATUS_SPEED_AND_DUPLEX_1000THD           (1 << 1)
+#define LINK_STATUS_SPEED_AND_DUPLEX_1000TFD           (2 << 1)
+#define LINK_STATUS_SPEED_AND_DUPLEX_10G               (3 << 1)
+#define LINK_STATUS_SPEED_AND_DUPLEX_20G               (4 << 1)
+#define LINK_STATUS_SPEED_AND_DUPLEX_40G               (5 << 1)
+#define LINK_STATUS_SPEED_AND_DUPLEX_50G               (6 << 1)
+#define LINK_STATUS_SPEED_AND_DUPLEX_100G              (7 << 1)
+#define LINK_STATUS_SPEED_AND_DUPLEX_25G               (8 << 1)
 #define LINK_STATUS_AUTO_NEGOTIATE_ENABLED             0x00000020
 #define LINK_STATUS_AUTO_NEGOTIATE_COMPLETE            0x00000040
 #define LINK_STATUS_PARALLEL_DETECTION_USED            0x00000080
@@ -607,10 +611,10 @@ struct public_port {
 #define LINK_STATUS_LINK_PARTNER_100G_CAPABLE          0x00008000
 #define LINK_STATUS_LINK_PARTNER_25G_CAPABLE           0x00010000
 #define LINK_STATUS_LINK_PARTNER_FLOW_CONTROL_MASK     0x000C0000
-#define LINK_STATUS_LINK_PARTNER_NOT_PAUSE_CAPABLE             (0 << 18)
-#define LINK_STATUS_LINK_PARTNER_SYMMETRIC_PAUSE               (1 << 18)
-#define LINK_STATUS_LINK_PARTNER_ASYMMETRIC_PAUSE              (2 << 18)
-#define LINK_STATUS_LINK_PARTNER_BOTH_PAUSE                    (3 << 18)
+#define LINK_STATUS_LINK_PARTNER_NOT_PAUSE_CAPABLE     (0 << 18)
+#define LINK_STATUS_LINK_PARTNER_SYMMETRIC_PAUSE       (1 << 18)
+#define LINK_STATUS_LINK_PARTNER_ASYMMETRIC_PAUSE      (2 << 18)
+#define LINK_STATUS_LINK_PARTNER_BOTH_PAUSE            (3 << 18)
 #define LINK_STATUS_SFP_TX_FAULT                       0x00100000
 #define LINK_STATUS_TX_FLOW_CONTROL_ENABLED            0x00200000
 #define LINK_STATUS_RX_FLOW_CONTROL_ENABLED            0x00400000
@@ -619,9 +623,9 @@ struct public_port {
 #define LINK_STATUS_MAC_REMOTE_FAULT                   0x02000000
 #define LINK_STATUS_UNSUPPORTED_SPD_REQ                        0x04000000
 #define LINK_STATUS_FEC_MODE_MASK                      0x38000000
-#define LINK_STATUS_FEC_MODE_NONE                              (0 << 27)
-#define LINK_STATUS_FEC_MODE_FIRECODE_CL74                     (1 << 27)
-#define LINK_STATUS_FEC_MODE_RS_CL91                           (2 << 27)
+#define LINK_STATUS_FEC_MODE_NONE                      (0 << 27)
+#define LINK_STATUS_FEC_MODE_FIRECODE_CL74             (1 << 27)
+#define LINK_STATUS_FEC_MODE_RS_CL91                   (2 << 27)
 #define LINK_STATUS_EXT_PHY_LINK_UP                    0x40000000
 
        u32 link_status1;
@@ -762,23 +766,23 @@ struct public_port {
         *          When 1'b1 those bits contains a value times 16 microseconds.
         */
        u32 eee_status;
-       #define EEE_TIMER_MASK          0x000fffff
-       #define EEE_ADV_STATUS_MASK     0x00f00000
-               #define EEE_1G_ADV      (1 << 1)
-               #define EEE_10G_ADV     (1 << 2)
-       #define EEE_ADV_STATUS_SHIFT    20
-       #define EEE_LP_ADV_STATUS_MASK  0x0f000000
-       #define EEE_LP_ADV_STATUS_SHIFT 24
-       #define EEE_REQUESTED_BIT       0x10000000
-       #define EEE_LPI_REQUESTED_BIT   0x20000000
-       #define EEE_ACTIVE_BIT          0x40000000
-       #define EEE_TIME_OUTPUT_BIT     0x80000000
+#define EEE_TIMER_MASK         0x000fffff
+#define EEE_ADV_STATUS_MASK    0x00f00000
+#define EEE_1G_ADV     (1 << 1)
+#define EEE_10G_ADV    (1 << 2)
+#define EEE_ADV_STATUS_SHIFT   20
+#define        EEE_LP_ADV_STATUS_MASK  0x0f000000
+#define EEE_LP_ADV_STATUS_SHIFT        24
+#define EEE_REQUESTED_BIT      0x10000000
+#define EEE_LPI_REQUESTED_BIT  0x20000000
+#define EEE_ACTIVE_BIT         0x40000000
+#define EEE_TIME_OUTPUT_BIT    0x80000000
 
        u32 eee_remote; /* Used for EEE in LLDP */
-       #define EEE_REMOTE_TW_TX_MASK   0x0000ffff
-       #define EEE_REMOTE_TW_TX_SHIFT  0
-       #define EEE_REMOTE_TW_RX_MASK   0xffff0000
-       #define EEE_REMOTE_TW_RX_SHIFT  16
+#define EEE_REMOTE_TW_TX_MASK  0x0000ffff
+#define EEE_REMOTE_TW_TX_SHIFT 0
+#define EEE_REMOTE_TW_RX_MASK  0xffff0000
+#define EEE_REMOTE_TW_RX_SHIFT 16
 };
 
 /**************************************/
@@ -874,9 +878,11 @@ struct public_func {
 #define DRV_ID_PDA_COMP_VER_MASK       0x0000ffff
 #define DRV_ID_PDA_COMP_VER_SHIFT      0
 
+#define LOAD_REQ_HSI_VERSION           2
 #define DRV_ID_MCP_HSI_VER_MASK                0x00ff0000
 #define DRV_ID_MCP_HSI_VER_SHIFT       16
-#define DRV_ID_MCP_HSI_VER_CURRENT     (1 << DRV_ID_MCP_HSI_VER_SHIFT)
+#define DRV_ID_MCP_HSI_VER_CURRENT     (LOAD_REQ_HSI_VERSION << \
+                                        DRV_ID_MCP_HSI_VER_SHIFT)
 
 #define DRV_ID_DRV_TYPE_MASK           0x7f000000
 #define DRV_ID_DRV_TYPE_SHIFT          24
@@ -1019,6 +1025,7 @@ enum resource_id_enum {
        RESOURCE_NUM_RSS_ENGINES_E      =       14,
        RESOURCE_LL2_QUEUE_E            =       15,
        RESOURCE_RDMA_STATS_QUEUE_E     =       16,
+       RESOURCE_BDQ_E                  =       17,
        RESOURCE_MAX_NUM,
        RESOURCE_NUM_INVALID            =       0xFFFFFFFF
 };
@@ -1036,8 +1043,47 @@ struct resource_info {
 #define RESOURCE_ELEMENT_STRICT (1 << 0)
 };
 
+#define DRV_ROLE_NONE          0
+#define DRV_ROLE_PREBOOT       1
+#define DRV_ROLE_OS            2
+#define DRV_ROLE_KDUMP         3
+
+struct load_req_stc {
+       u32 drv_ver_0;
+       u32 drv_ver_1;
+       u32 fw_ver;
+       u32 misc0;
+#define LOAD_REQ_ROLE_MASK             0x000000FF
+#define LOAD_REQ_ROLE_SHIFT            0
+#define LOAD_REQ_LOCK_TO_MASK          0x0000FF00
+#define LOAD_REQ_LOCK_TO_SHIFT         0 /* @DPDK */
+#define LOAD_REQ_LOCK_TO_DEFAULT       0
+#define LOAD_REQ_LOCK_TO_NONE          255
+#define LOAD_REQ_FORCE_MASK            0x000F0000
+#define LOAD_REQ_FORCE_SHIFT           0 /* @DPDK */
+#define LOAD_REQ_FORCE_NONE            0
+#define LOAD_REQ_FORCE_PF              1
+#define LOAD_REQ_FORCE_ALL             2
+#define LOAD_REQ_FLAGS0_MASK           0x00F00000
+#define LOAD_REQ_FLAGS0_SHIFT          0 /* @DPDK */
+#define LOAD_REQ_FLAGS0_AVOID_RESET    (0x1 << 0)
+};
+
+struct load_rsp_stc {
+       u32 drv_ver_0;
+       u32 drv_ver_1;
+       u32 fw_ver;
+       u32 misc0;
+#define LOAD_RSP_ROLE_MASK             0x000000FF
+#define LOAD_RSP_ROLE_SHIFT            0
+#define LOAD_RSP_HSI_MASK              0x0000FF00
+#define LOAD_RSP_HSI_SHIFT             8
+#define LOAD_RSP_FLAGS0_MASK           0x000F0000
+#define LOAD_RSP_FLAGS0_SHIFT          16
+#define LOAD_RSP_FLAGS0_DRV_EXISTS     (0x1 << 0)
+};
+
 union drv_union_data {
-       u32 ver_str[MCP_DRV_VER_STR_SIZE_DWORD];    /* LOAD_REQ */
        struct mcp_mac wol_mac; /* UNLOAD_DONE */
 
 /* This configuration should be set by the driver for the LINK_SET command. */
@@ -1064,6 +1110,9 @@ union drv_union_data {
        struct bist_nvm_image_att nvm_image_att;
        struct mdump_config_stc mdump_config;
        u32 dword;
+
+       struct load_req_stc load_req;
+       struct load_rsp_stc load_rsp;
        /* ... */
 };
 
@@ -1073,6 +1122,7 @@ struct public_drv_mb {
 #define DRV_MSG_CODE_LOAD_REQ                   0x10000000
 #define DRV_MSG_CODE_LOAD_DONE                  0x11000000
 #define DRV_MSG_CODE_INIT_HW                    0x12000000
+#define DRV_MSG_CODE_CANCEL_LOAD_REQ            0x13000000
 #define DRV_MSG_CODE_UNLOAD_REQ                        0x20000000
 #define DRV_MSG_CODE_UNLOAD_DONE                0x21000000
 #define DRV_MSG_CODE_INIT_PHY                  0x22000000
@@ -1088,16 +1138,15 @@ struct public_drv_mb {
 #define DRV_MSG_CODE_OV_UPDATE_BUS_NUM         0x27000000
 #define DRV_MSG_CODE_OV_UPDATE_BOOT_PROGRESS   0x28000000
 #define DRV_MSG_CODE_OV_UPDATE_STORM_FW_VER    0x29000000
+#define DRV_MSG_CODE_NIG_DRAIN                 0x30000000
 #define DRV_MSG_CODE_OV_UPDATE_DRIVER_STATE    0x31000000
 #define DRV_MSG_CODE_BW_UPDATE_ACK             0x32000000
 #define DRV_MSG_CODE_OV_UPDATE_MTU             0x33000000
-
-#define DRV_MSG_CODE_NIG_DRAIN                 0x30000000
-
 /* DRV_MB Param: driver version supp, FW_MB param: MFW version supp,
  * data: struct resource_info
  */
 #define DRV_MSG_GET_RESOURCE_ALLOC_MSG         0x34000000
+#define DRV_MSG_SET_RESOURCE_VALUE_MSG         0x35000000
 
 /*deprecated don't use*/
 #define DRV_MSG_CODE_INITIATE_FLR_DEPRECATED    0x02000000
@@ -1157,15 +1206,17 @@ struct public_drv_mb {
  * [3:0] - func, drv_data[7:0] - MAC/WWNN/WWPN
  */
 #define DRV_MSG_CODE_GET_VMAC                   0x00120000
-       #define DRV_MSG_CODE_VMAC_TYPE_MAC              1
-       #define DRV_MSG_CODE_VMAC_TYPE_WWNN             2
-       #define DRV_MSG_CODE_VMAC_TYPE_WWPN             3
+#define DRV_MSG_CODE_VMAC_TYPE_SHIFT            4
+#define DRV_MSG_CODE_VMAC_TYPE_MASK             0x30
+#define DRV_MSG_CODE_VMAC_TYPE_MAC              1
+#define DRV_MSG_CODE_VMAC_TYPE_WWNN             2
+#define DRV_MSG_CODE_VMAC_TYPE_WWPN             3
 /* Get statistics from pf, params [31:4] - reserved, [3:0] - stats type */
 #define DRV_MSG_CODE_GET_STATS                  0x00130000
-       #define DRV_MSG_CODE_STATS_TYPE_LAN             1
-       #define DRV_MSG_CODE_STATS_TYPE_FCOE            2
-       #define DRV_MSG_CODE_STATS_TYPE_ISCSI           3
-       #define DRV_MSG_CODE_STATS_TYPE_RDMA            4
+#define DRV_MSG_CODE_STATS_TYPE_LAN             1
+#define DRV_MSG_CODE_STATS_TYPE_FCOE            2
+#define DRV_MSG_CODE_STATS_TYPE_ISCSI           3
+#define DRV_MSG_CODE_STATS_TYPE_RDMA            4
 /* Host shall provide buffer and size for MFW  */
 #define DRV_MSG_CODE_PMD_DIAG_DUMP             0x00140000
 /* Host shall provide buffer and size for MFW  */
@@ -1193,8 +1244,8 @@ struct public_drv_mb {
 #define DRV_MSG_CODE_MASK_PARITIES             0x001a0000
 /* param[0] - Simulate fan failure,  param[1] - simulate over temp. */
 #define DRV_MSG_CODE_INDUCE_FAILURE            0x001b0000
-       #define DRV_MSG_FAN_FAILURE_TYPE                (1 << 0)
-       #define DRV_MSG_TEMPERATURE_FAILURE_TYPE        (1 << 1)
+#define DRV_MSG_FAN_FAILURE_TYPE               (1 << 0)
+#define DRV_MSG_TEMPERATURE_FAILURE_TYPE       (1 << 1)
 /* Param: [0:15] - gpio number */
 #define DRV_MSG_CODE_GPIO_READ                 0x001c0000
 /* Param: [0:15] - gpio number, [16:31] - gpio value */
@@ -1211,54 +1262,69 @@ struct public_drv_mb {
 #define DRV_MSG_CODE_TIMESTAMP                  0x00210000
 /* This is an empty mailbox just return OK*/
 #define DRV_MSG_CODE_EMPTY_MB                  0x00220000
+
 /* Param[0:4] - resource number (0-31), Param[5:7] - opcode,
  * param[15:8] - age
  */
 #define DRV_MSG_CODE_RESOURCE_CMD              0x00230000
-       /* request resource ownership with default aging */
-       #define RESOURCE_OPCODE_REQ                     1
-       /* request resource ownership without aging */
-       #define RESOURCE_OPCODE_REQ_WO_AGING            2
-       /* request resource ownership with specific aging timer (in seconds) */
-       #define RESOURCE_OPCODE_REQ_W_AGING             3
-       #define RESOURCE_OPCODE_RELEASE                 4 /* release resource */
-       /* force resource release */
-       #define RESOURCE_OPCODE_FORCE_RELEASE           5
-       /* resource is free and granted to requester */
-       #define RESOURCE_OPCODE_GNT                     1
-       /* resource is busy, param[7:0] indicates owner as follow 0-15 = PF0-15,
-        * 16 = MFW, 17 = diag over serial
-        */
-       #define RESOURCE_OPCODE_BUSY                    2
-       /* indicate release request was acknowledged */
-       #define RESOURCE_OPCODE_RELEASED                3
-       /* indicate release request was previously received by other owner */
-       #define RESOURCE_OPCODE_RELEASED_PREVIOUS       4
-       /* indicate wrong owner during release */
-       #define RESOURCE_OPCODE_WRONG_OWNER             5
-       #define RESOURCE_OPCODE_UNKNOWN_CMD             255
-       /* dedicate resource 0 for dump */
-       #define RESOURCE_DUMP                           0
+
+#define RESOURCE_CMD_REQ_RESC_MASK             0x0000001F
+#define RESOURCE_CMD_REQ_RESC_SHIFT            0
+#define RESOURCE_CMD_REQ_OPCODE_MASK           0x000000E0
+#define RESOURCE_CMD_REQ_OPCODE_SHIFT          5
+/* request resource ownership with default aging */
+#define RESOURCE_OPCODE_REQ                    1
+/* request resource ownership without aging */
+#define RESOURCE_OPCODE_REQ_WO_AGING           2
+/* request resource ownership with specific aging timer (in seconds) */
+#define RESOURCE_OPCODE_REQ_W_AGING            3
+#define RESOURCE_OPCODE_RELEASE                        4 /* release resource */
+/* force resource release */
+#define RESOURCE_OPCODE_FORCE_RELEASE          5
+#define RESOURCE_CMD_REQ_AGE_MASK              0x0000FF00
+#define RESOURCE_CMD_REQ_AGE_SHIFT             8
+
+#define RESOURCE_CMD_RSP_OWNER_MASK            0x000000FF
+#define RESOURCE_CMD_RSP_OWNER_SHIFT           0
+#define RESOURCE_CMD_RSP_OPCODE_MASK           0x00000700
+#define RESOURCE_CMD_RSP_OPCODE_SHIFT          8
+/* resource is free and granted to requester */
+#define RESOURCE_OPCODE_GNT                    1
+/* resource is busy, param[7:0] indicates owner as follow 0-15 = PF0-15,
+ * 16 = MFW, 17 = diag over serial
+ */
+#define RESOURCE_OPCODE_BUSY                   2
+/* indicate release request was acknowledged */
+#define RESOURCE_OPCODE_RELEASED               3
+/* indicate release request was previously received by other owner */
+#define RESOURCE_OPCODE_RELEASED_PREVIOUS      4
+/* indicate wrong owner during release */
+#define RESOURCE_OPCODE_WRONG_OWNER            5
+#define RESOURCE_OPCODE_UNKNOWN_CMD            255
+
+/* dedicate resource 0 for dump */
+#define RESOURCE_DUMP                          0
+
 #define DRV_MSG_CODE_GET_MBA_VERSION           0x00240000 /* Get MBA version */
 /* Send crash dump commands with param[3:0] - opcode */
 #define DRV_MSG_CODE_MDUMP_CMD                 0x00250000
-       #define MDUMP_DRV_PARAM_OPCODE_MASK             0x0000000f
-       /* acknowledge reception of error indication */
-       #define DRV_MSG_CODE_MDUMP_ACK                  0x01
-       /* set epoc and personality as follow: drv_data[3:0] - epoch,
       * drv_data[7:4] - personality
       */
-       #define DRV_MSG_CODE_MDUMP_SET_VALUES           0x02
-       /* trigger crash dump procedure */
-       #define DRV_MSG_CODE_MDUMP_TRIGGER              0x03
-       /* Request valid logs and config words */
-       #define DRV_MSG_CODE_MDUMP_GET_CONFIG           0x04
-       /* Set triggers mask. drv_mb_param should indicate (bitwise) which
       * trigger enabled
       */
-       #define DRV_MSG_CODE_MDUMP_SET_ENABLE           0x05
-       /* Clear all logs */
-       #define DRV_MSG_CODE_MDUMP_CLEAR_LOGS           0x06
+#define MDUMP_DRV_PARAM_OPCODE_MASK            0x0000000f
+/* acknowledge reception of error indication */
+#define DRV_MSG_CODE_MDUMP_ACK                 0x01
+/* set epoc and personality as follow: drv_data[3:0] - epoch,
+ * drv_data[7:4] - personality
+ */
+#define DRV_MSG_CODE_MDUMP_SET_VALUES          0x02
+/* trigger crash dump procedure */
+#define DRV_MSG_CODE_MDUMP_TRIGGER             0x03
+/* Request valid logs and config words */
+#define DRV_MSG_CODE_MDUMP_GET_CONFIG          0x04
+/* Set triggers mask. drv_mb_param should indicate (bitwise) which
+ * trigger enabled
+ */
+#define DRV_MSG_CODE_MDUMP_SET_ENABLE          0x05
+/* Clear all logs */
+#define DRV_MSG_CODE_MDUMP_CLEAR_LOGS          0x06
 #define DRV_MSG_CODE_MEM_ECC_EVENTS            0x00260000 /* Param: None */
 /* Param: [0:15] - gpio number */
 #define DRV_MSG_CODE_GPIO_INFO                 0x00270000
@@ -1266,12 +1332,12 @@ struct public_drv_mb {
 #define DRV_MSG_CODE_EXT_PHY_READ              0x00280000
 /* Value should be placed in union */
 #define DRV_MSG_CODE_EXT_PHY_WRITE             0x00290000
-       #define DRV_MB_PARAM_ADDR_SHIFT                 0
-       #define DRV_MB_PARAM_ADDR_MASK                  0x0000FFFF
-       #define DRV_MB_PARAM_DEVAD_SHIFT                16
-       #define DRV_MB_PARAM_DEVAD_MASK                 0x001F0000
-       #define DRV_MB_PARAM_PORT_SHIFT                 21
-       #define DRV_MB_PARAM_PORT_MASK                  0x00600000
+#define DRV_MB_PARAM_ADDR_SHIFT                        0
+#define DRV_MB_PARAM_ADDR_MASK                 0x0000FFFF
+#define DRV_MB_PARAM_DEVAD_SHIFT               16
+#define DRV_MB_PARAM_DEVAD_MASK                        0x001F0000
+#define DRV_MB_PARAM_PORT_SHIFT                        21
+#define DRV_MB_PARAM_PORT_MASK                 0x00600000
 #define DRV_MSG_CODE_EXT_PHY_FW_UPGRADE                0x002a0000
 
 #define DRV_MSG_SEQ_NUMBER_MASK                 0x0000ffff
@@ -1423,12 +1489,16 @@ struct public_drv_mb {
 
        u32 fw_mb_header;
 #define FW_MSG_CODE_MASK                        0xffff0000
+#define FW_MSG_CODE_UNSUPPORTED                        0x00000000
 #define FW_MSG_CODE_DRV_LOAD_ENGINE            0x10100000
 #define FW_MSG_CODE_DRV_LOAD_PORT               0x10110000
 #define FW_MSG_CODE_DRV_LOAD_FUNCTION           0x10120000
 #define FW_MSG_CODE_DRV_LOAD_REFUSED_PDA        0x10200000
-#define FW_MSG_CODE_DRV_LOAD_REFUSED_HSI        0x10210000
+#define FW_MSG_CODE_DRV_LOAD_REFUSED_HSI_1      0x10210000
 #define FW_MSG_CODE_DRV_LOAD_REFUSED_DIAG       0x10220000
+#define FW_MSG_CODE_DRV_LOAD_REFUSED_HSI        0x10230000
+#define FW_MSG_CODE_DRV_LOAD_REFUSED_REQUIRES_FORCE 0x10300000
+#define FW_MSG_CODE_DRV_LOAD_REFUSED_REJECT     0x10310000
 #define FW_MSG_CODE_DRV_LOAD_DONE               0x11100000
 #define FW_MSG_CODE_DRV_UNLOAD_ENGINE           0x20110000
 #define FW_MSG_CODE_DRV_UNLOAD_PORT             0x20120000
@@ -1481,6 +1551,10 @@ struct public_drv_mb {
 #define FW_MSG_CODE_NVM_PUT_FILE_FINISH_OK     0x00400000
 /* MFW reject "mcp reset" command if one of the drivers is up */
 #define FW_MSG_CODE_MCP_RESET_REJECT           0x00600000
+#define FW_MSG_CODE_NVM_FAILED_CALC_HASH       0x00310000
+#define FW_MSG_CODE_NVM_PUBLIC_KEY_MISSING     0x00320000
+#define FW_MSG_CODE_NVM_INVALID_PUBLIC_KEY     0x00330000
+
 #define FW_MSG_CODE_PHY_OK                     0x00110000
 #define FW_MSG_CODE_PHY_ERROR                  0x00120000
 #define FW_MSG_CODE_SET_SECURE_MODE_ERROR      0x00130000
@@ -1509,8 +1583,9 @@ struct public_drv_mb {
 #define FW_MSG_CODE_EXTPHY_INVALID_PHY_TYPE    0x00710000
 #define FW_MSG_CODE_EXTPHY_OPERATION_FAILED    0x00720000
 #define FW_MSG_CODE_EXTPHY_NO_PHY_DETECTED     0x00730000
+#define FW_MSG_CODE_RECOVERY_MODE              0x00740000
 
-/* mdump related response codes */
+       /* mdump related response codes */
 #define FW_MSG_CODE_MDUMP_NO_IMAGE_FOUND       0x00010000
 #define FW_MSG_CODE_MDUMP_ALLOC_FAILED         0x00020000
 #define FW_MSG_CODE_MDUMP_INVALID_CMD          0x00030000
@@ -1521,7 +1596,7 @@ struct public_drv_mb {
 
 
        u32 fw_mb_param;
-       /* Resource Allocation params - MFW  version support*/
+/* Resource Allocation params - MFW  version support */
 #define FW_MB_PARAM_RESOURCE_ALLOC_VERSION_MAJOR_MASK  0xFFFF0000
 #define FW_MB_PARAM_RESOURCE_ALLOC_VERSION_MAJOR_SHIFT         16
 #define FW_MB_PARAM_RESOURCE_ALLOC_VERSION_MINOR_MASK  0x0000FFFF