Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[karo-tx-linux.git] / drivers / scsi / qla4xxx / ql4_fw.h

diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h
index 8d4092b33c070e694678aa34bbb3f0e870c94df9..699575efc9ba89f9f027384b1aeaa124f5aa2136 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_fw.h
+++ b/drivers/scsi/qla4xxx/ql4_fw.h
@@ -390,6 +390,7 @@ struct qla_flt_region {
 #define MBOX_CMD_CLEAR_DATABASE_ENTRY          0x0031
 #define MBOX_CMD_CONN_OPEN                     0x0074
 #define MBOX_CMD_CONN_CLOSE_SESS_LOGOUT                0x0056
+#define DDB_NOT_LOGGED_IN                      0x09
 #define LOGOUT_OPTION_CLOSE_SESSION            0x0002
 #define LOGOUT_OPTION_RELOGIN                  0x0004
 #define LOGOUT_OPTION_FREE_DDB                 0x0008
@@ -505,9 +506,9 @@ struct qla_flt_region {
 #define MBOX_ASTS_RESPONSE_QUEUE_FULL          0x8028
 #define MBOX_ASTS_IP_ADDR_STATE_CHANGED                0x8029
 #define MBOX_ASTS_IPV6_DEFAULT_ROUTER_CHANGED  0x802A
-#define MBOX_ASTS_IPV6_PREFIX_EXPIRED          0x802B
-#define MBOX_ASTS_IPV6_ND_PREFIX_IGNORED       0x802C
-#define MBOX_ASTS_IPV6_LCL_PREFIX_IGNORED      0x802D
+#define MBOX_ASTS_IPV6_LINK_MTU_CHANGE         0x802B
+#define MBOX_ASTS_IPV6_AUTO_PREFIX_IGNORED     0x802C
+#define MBOX_ASTS_IPV6_ND_LOCAL_PREFIX_IGNORED 0x802D
 #define MBOX_ASTS_ICMPV6_ERROR_MSG_RCVD                0x802E
 #define MBOX_ASTS_INITIALIZATION_FAILED                0x8031
 #define MBOX_ASTS_SYSTEM_WARNING_EVENT         0x8036
@@ -528,14 +529,14 @@ struct qla_flt_region {
 #define ACB_CONFIG_DISABLE             0x00
 #define ACB_CONFIG_SET                 0x01
 
-/* ACB State Defines */
-#define ACB_STATE_UNCONFIGURED 0x00
-#define ACB_STATE_INVALID      0x01
-#define ACB_STATE_ACQUIRING    0x02
-#define ACB_STATE_TENTATIVE    0x03
-#define ACB_STATE_DEPRICATED   0x04
-#define ACB_STATE_VALID                0x05
-#define ACB_STATE_DISABLING    0x06
+/* ACB/IP Address State Defines */
+#define IP_ADDRSTATE_UNCONFIGURED      0
+#define IP_ADDRSTATE_INVALID           1
+#define IP_ADDRSTATE_ACQUIRING         2
+#define IP_ADDRSTATE_TENTATIVE         3
+#define IP_ADDRSTATE_DEPRICATED                4
+#define IP_ADDRSTATE_PREFERRED         5
+#define IP_ADDRSTATE_DISABLING         6
 
 /* FLASH offsets */
 #define FLASH_SEGMENT_IFCB     0x04000000
@@ -698,14 +699,6 @@ struct addr_ctrl_blk {
        uint8_t ipv6_lnk_lcl_addr_state;/* 222 */
        uint8_t ipv6_addr0_state;       /* 223 */
        uint8_t ipv6_addr1_state;       /* 224 */
-#define IP_ADDRSTATE_UNCONFIGURED      0
-#define IP_ADDRSTATE_INVALID           1
-#define IP_ADDRSTATE_ACQUIRING         2
-#define IP_ADDRSTATE_TENTATIVE         3
-#define IP_ADDRSTATE_DEPRICATED                4
-#define IP_ADDRSTATE_PREFERRED         5
-#define IP_ADDRSTATE_DISABLING         6
-
        uint8_t ipv6_dflt_rtr_state;    /* 225 */
 #define IPV6_RTRSTATE_UNKNOWN                   0
 #define IPV6_RTRSTATE_MANUAL                    1
@@ -1422,6 +1415,9 @@ struct ql_iscsi_stats {
 #define QLA83XX_DBG_OCM_WNDREG_ARRAY_LEN       16
 #define QLA83XX_SS_OCM_WNDREG_INDEX            3
 #define QLA83XX_SS_PCI_INDEX                   0
+#define QLA8022_TEMPLATE_CAP_OFFSET            172
+#define QLA83XX_TEMPLATE_CAP_OFFSET            268
+#define QLA80XX_TEMPLATE_RESERVED_BITS         16
 
 struct qla4_8xxx_minidump_template_hdr {
        uint32_t entry_type;
@@ -1441,6 +1437,7 @@ struct qla4_8xxx_minidump_template_hdr {
        uint32_t saved_state_array[QLA8XXX_DBG_STATE_ARRAY_LEN];
        uint32_t capture_size_array[QLA8XXX_DBG_CAP_SIZE_ARRAY_LEN];
        uint32_t ocm_window_reg[QLA83XX_DBG_OCM_WNDREG_ARRAY_LEN];
+       uint32_t capabilities[QLA80XX_TEMPLATE_RESERVED_BITS];
 };
 
 #endif /*  _QLA4X_FW_H */