1 files changed, 52 insertions, 2 deletions

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index c51bd4e5fb44..edb7a704ed77 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -34,6 +34,7 @@
 #include <scsi/scsi_bsg_fc.h>
 
 #include "qla_bsg.h"
+#include "qla_nx.h"
 #define QLA2XXX_DRIVER_NAME  "qla2xxx"
 
 /*
@@ -207,6 +208,7 @@ typedef struct srb {
  * SRB flag definitions
  */
 #define SRB_DMA_VALID           BIT_0   /* Command sent to ISP */
+#define SRB_FCP_CMND_DMA_VALID  BIT_12  /* FCP command in IOCB */
 
 /*
  * SRB extensions.
@@ -417,6 +419,7 @@ typedef union {
                 struct device_reg_2xxx isp;
                 struct device_reg_24xx isp24;
                 struct device_reg_25xxmq isp25mq;
+                struct device_reg_82xx isp82;
 } device_reg_t;
 
 #define ISP_REQ_Q_IN(ha, reg) \
@@ -2112,6 +2115,7 @@ struct isp_operations {
 
         int (*get_flash_version) (struct scsi_qla_host *, void *);
         int (*start_scsi) (srb_t *);
+        int (*abort_isp) (struct scsi_qla_host *);
 };
 
 /* MSI-X Support *************************************************************/
@@ -2386,7 +2390,8 @@ struct qla_hw_data {
 #define DT_ISP2532                      BIT_11
 #define DT_ISP8432                      BIT_12
 #define DT_ISP8001                      BIT_13
-#define DT_ISP_LAST                     (DT_ISP8001 << 1)
+#define DT_ISP8021                      BIT_14
+#define DT_ISP_LAST                     (DT_ISP8021 << 1)
 
 #define DT_IIDMA                        BIT_26
 #define DT_FWI2                         BIT_27
@@ -2409,6 +2414,7 @@ struct qla_hw_data {
 #define IS_QLA2532(ha)  (DT_MASK(ha) & DT_ISP2532)
 #define IS_QLA8432(ha)  (DT_MASK(ha) & DT_ISP8432)
 #define IS_QLA8001(ha)  (DT_MASK(ha) & DT_ISP8001)
+#define IS_QLA82XX(ha)  (DT_MASK(ha) & DT_ISP8021)
 
 #define IS_QLA23XX(ha)  (IS_QLA2300(ha) || IS_QLA2312(ha) || IS_QLA2322(ha) || \
                         IS_QLA6312(ha) || IS_QLA6322(ha))
@@ -2419,8 +2425,10 @@ struct qla_hw_data {
 #define IS_QLA24XX_TYPE(ha)     (IS_QLA24XX(ha) || IS_QLA54XX(ha) || \
                                 IS_QLA84XX(ha))
 #define IS_QLA81XX(ha)          (IS_QLA8001(ha))
+#define IS_QLA8XXX_TYPE(ha)     (IS_QLA81XX(ha) || IS_QLA82XX(ha))
 #define IS_QLA2XXX_MIDTYPE(ha)  (IS_QLA24XX(ha) || IS_QLA84XX(ha) || \
-                                IS_QLA25XX(ha) || IS_QLA81XX(ha))
+                                IS_QLA25XX(ha) || IS_QLA81XX(ha) || \
+                                IS_QLA82XX(ha))
 #define IS_MSIX_NACK_CAPABLE(ha) (IS_QLA81XX(ha))
 #define IS_NOPOLLING_TYPE(ha)   ((IS_QLA25XX(ha) || IS_QLA81XX(ha)) && \
                                 (ha)->flags.msix_enabled)
@@ -2603,6 +2611,7 @@ struct qla_hw_data {
         uint32_t        flt_region_npiv_conf;
         uint32_t        flt_region_gold_fw;
         uint32_t        flt_region_fcp_prio;
+        uint32_t        flt_region_bootload;
 
         /* Needed for BEACON */
         uint16_t        beacon_blink_led;
@@ -2634,6 +2643,38 @@ struct qla_hw_data {
 
         /* FCP_CMND priority support */
         struct qla_fcp_prio_cfg *fcp_prio_cfg;
+
+        struct dma_pool *dl_dma_pool;
+#define DSD_LIST_DMA_POOL_SIZE  512
+
+        struct dma_pool *fcp_cmnd_dma_pool;
+        mempool_t       *ctx_mempool;
+#define FCP_CMND_DMA_POOL_SIZE 512
+
+        unsigned long   nx_pcibase;             /* Base I/O address */
+        uint8_t         *nxdb_rd_ptr;           /* Doorbell read pointer */
+        unsigned long   nxdb_wr_ptr;            /* Door bell write pointer */
+        unsigned long   first_page_group_start;
+        unsigned long   first_page_group_end;
+
+        uint32_t        crb_win;
+        uint32_t        curr_window;
+        uint32_t        ddr_mn_window;
+        unsigned long   mn_win_crb;
+        unsigned long   ms_win_crb;
+        int             qdr_sn_window;
+        uint32_t        nx_dev_init_timeout;
+        uint32_t        nx_reset_timeout;
+        rwlock_t        hw_lock;
+        uint16_t        portnum;                /* port number */
+        int             link_width;
+        struct fw_blob  *hablob;
+        struct qla82xx_legacy_intr_set nx_legacy_intr;
+
+        uint16_t        gbl_dsd_inuse;
+        uint16_t        gbl_dsd_avail;
+        struct list_head gbl_dsd_list;
+#define NUM_DSD_CHAIN 4096
 };
 
 /*
@@ -2686,10 +2727,13 @@ typedef struct scsi_qla_host {
 #define VP_DPC_NEEDED           14      /* wake up for VP dpc handling */
 #define UNLOADING               15
 #define NPIV_CONFIG_NEEDED      16
+#define ISP_UNRECOVERABLE       17
+#define FCOE_CTX_RESET_NEEDED   18      /* Initiate FCoE context reset */
 
         uint32_t        device_flags;
 #define SWITCH_FOUND            BIT_0
 #define DFLG_NO_CABLE           BIT_1
+#define DFLG_DEV_FAILED         BIT_5
 
         /* ISP configuration data. */
         uint16_t        loop_id;                /* Host adapter loop id */
@@ -2747,6 +2791,8 @@ typedef struct scsi_qla_host {
 #define VP_ERR_ADAP_NORESOURCES 5
         struct qla_hw_data *hw;
         struct req_que *req;
+        int             fw_heartbeat_counter;
+        int             seconds_since_last_heartbeat;
 } scsi_qla_host_t;
 
 /*
@@ -2799,6 +2845,10 @@ typedef struct scsi_qla_host {
 #define OPTROM_SIZE_24XX        0x100000
 #define OPTROM_SIZE_25XX        0x200000
 #define OPTROM_SIZE_81XX        0x400000
+#define OPTROM_SIZE_82XX        0x800000
+
+#define OPTROM_BURST_SIZE       0x1000
+#define OPTROM_BURST_DWORDS     (OPTROM_BURST_SIZE / 4)
 
 #include "qla_gbl.h"
 #include "qla_dbg.h"