1 files changed, 20 insertions, 2 deletions

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index a1ca590ba447..0c9f36c8a248 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -1711,6 +1711,14 @@ struct ct_fdmi_hba_attributes {
 #define FDMI_PORT_OS_DEVICE_NAME        5
 #define FDMI_PORT_HOST_NAME             6
 
+#define FDMI_PORT_SPEED_1GB             0x1
+#define FDMI_PORT_SPEED_2GB             0x2
+#define FDMI_PORT_SPEED_10GB            0x4
+#define FDMI_PORT_SPEED_4GB             0x8
+#define FDMI_PORT_SPEED_8GB             0x10
+#define FDMI_PORT_SPEED_16GB            0x20
+#define FDMI_PORT_SPEED_UNKNOWN         0x8000
+
 struct ct_fdmi_port_attr {
         uint16_t type;
         uint16_t len;
@@ -2201,6 +2209,7 @@ typedef struct scsi_qla_host {
 #define SWITCH_FOUND                    BIT_3
 #define DFLG_NO_CABLE                   BIT_4
 
+#define PCI_DEVICE_ID_QLOGIC_ISP2532    0x2532
         uint32_t        device_type;
 #define DT_ISP2100                      BIT_0
 #define DT_ISP2200                      BIT_1
@@ -2213,8 +2222,11 @@ typedef struct scsi_qla_host {
 #define DT_ISP2432                      BIT_8
 #define DT_ISP5422                      BIT_9
 #define DT_ISP5432                      BIT_10
-#define DT_ISP_LAST                     (DT_ISP5432 << 1)
+#define DT_ISP2532                      BIT_11
+#define DT_ISP_LAST                     (DT_ISP2532 << 1)
 
+#define DT_IIDMA                        BIT_26
+#define DT_FWI2                         BIT_27
 #define DT_ZIO_SUPPORTED                BIT_28
 #define DT_OEM_001                      BIT_29
 #define DT_ISP2200A                     BIT_30
@@ -2232,12 +2244,16 @@ typedef struct scsi_qla_host {
 #define IS_QLA2432(ha)  (DT_MASK(ha) & DT_ISP2432)
 #define IS_QLA5422(ha)  (DT_MASK(ha) & DT_ISP5422)
 #define IS_QLA5432(ha)  (DT_MASK(ha) & DT_ISP5432)
+#define IS_QLA2532(ha)  (DT_MASK(ha) & DT_ISP2532)
 
 #define IS_QLA23XX(ha)  (IS_QLA2300(ha) || IS_QLA2312(ha) || IS_QLA2322(ha) || \
                          IS_QLA6312(ha) || IS_QLA6322(ha))
 #define IS_QLA24XX(ha)  (IS_QLA2422(ha) || IS_QLA2432(ha))
 #define IS_QLA54XX(ha)  (IS_QLA5422(ha) || IS_QLA5432(ha))
+#define IS_QLA25XX(ha)  (IS_QLA2532(ha))
 
+#define IS_IIDMA_CAPABLE(ha)    ((ha)->device_type & DT_IIDMA)
+#define IS_FWI2_CAPABLE(ha)     ((ha)->device_type & DT_FWI2)
 #define IS_ZIO_SUPPORTED(ha)    ((ha)->device_type & DT_ZIO_SUPPORTED)
 #define IS_OEM_001(ha)          ((ha)->device_type & DT_OEM_001)
 #define HAS_EXTENDED_IDS(ha)    ((ha)->device_type & DT_EXTENDED_IDS)
@@ -2274,7 +2290,7 @@ typedef struct scsi_qla_host {
         uint16_t        rsp_ring_index;     /* Current index. */
         uint16_t        response_q_length;
 
-        struct isp_operations isp_ops;
+        struct isp_operations *isp_ops;
 
         /* Outstandings ISP commands. */
         srb_t           *outstanding_cmds[MAX_OUTSTANDING_COMMANDS];
@@ -2298,6 +2314,7 @@ typedef struct scsi_qla_host {
 #define PORT_SPEED_1GB  0x00
 #define PORT_SPEED_2GB  0x01
 #define PORT_SPEED_4GB  0x03
+#define PORT_SPEED_8GB  0x04
         uint16_t        link_data_rate;         /* F/W operating speed */
 
         uint8_t         current_topology;
@@ -2564,6 +2581,7 @@ typedef struct scsi_qla_host {
 #define OPTROM_SIZE_2300        0x20000
 #define OPTROM_SIZE_2322        0x100000
 #define OPTROM_SIZE_24XX        0x100000
+#define OPTROM_SIZE_25XX        0x200000
 
 #include "qla_gbl.h"
 #include "qla_dbg.h"