Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / scsi / qla2xxx / qla_def.h

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index d2a4e1530708add3659525948aec20ce13629f91..ccfc8e78be21d3075d8fafa8ba9c1a3334a64baa 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -706,6 +706,11 @@ typedef struct {
 #define MBC_SET_PORT_CONFIG            0x122   /* Set port configuration */
 #define MBC_GET_PORT_CONFIG            0x123   /* Get port configuration */
 
+/*
+ * ISP81xx mailbox commands
+ */
+#define MBC_WRITE_MPI_REGISTER         0x01    /* Write MPI Register. */
+
 /* Firmware return data sizes */
 #define FCAL_MAP_SIZE  128
 
@@ -1695,9 +1700,7 @@ typedef struct fc_port {
        atomic_t state;
        uint32_t flags;
 
-       int port_login_retry_count;
        int login_retry;
-       atomic_t port_down_timer;
 
        struct fc_rport *rport, *drport;
        u32 supported_classes;
@@ -2406,7 +2409,6 @@ struct qla_hw_data {
                uint32_t        enable_target_reset     :1;
                uint32_t        enable_lip_full_login   :1;
                uint32_t        enable_led_scheme       :1;
-               uint32_t        inta_enabled            :1;
                uint32_t        msi_enabled             :1;
                uint32_t        msix_enabled            :1;
                uint32_t        disable_serdes          :1;
@@ -2423,6 +2425,9 @@ struct qla_hw_data {
                uint32_t        disable_msix_handshake  :1;
                uint32_t        fcp_prio_enabled        :1;
                uint32_t        fw_hung :1;
+               uint32_t        quiesce_owner:1;
+               uint32_t        thermal_supported:1;
+               /* 26 bits */
        } flags;
 
        /* This spinlock is used to protect "io transactions", you must
@@ -2860,6 +2865,8 @@ typedef struct scsi_qla_host {
 #define NPIV_CONFIG_NEEDED     16
 #define ISP_UNRECOVERABLE      17
 #define FCOE_CTX_RESET_NEEDED  18      /* Initiate FCoE context reset */
+#define MPI_RESET_NEEDED       19      /* Initiate MPI FW reset */
+#define ISP_QUIESCE_NEEDED     20      /* Driver need some quiescence */
 
        uint32_t        device_flags;
 #define SWITCH_FOUND           BIT_0
@@ -3003,6 +3010,8 @@ typedef struct scsi_qla_host {
 
 #define CMD_SP(Cmnd)           ((Cmnd)->SCp.ptr)
 
+#define QLA_SG_ALL     1024
+
 enum nexus_wait_type {
        WAIT_HOST = 0,
        WAIT_TARGET,