csiostor:firmware upgrade fix

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / csiostor / csio_hw.h

diff --git a/drivers/scsi/csiostor/csio_hw.h b/drivers/scsi/csiostor/csio_hw.h
index 68248da1b9afcaf7f0cdb7ca5c249070c6c7cb3e..1fe8fdee70fa35054a4b7224b2695b2e64583ff1 100644 (file)
--- a/drivers/scsi/csiostor/csio_hw.h
+++ b/drivers/scsi/csiostor/csio_hw.h
@@ -117,10 +117,10 @@ extern int csio_msi;
 #define CSIO_ASIC_DEVID_PROTO_MASK             0xFF00
 #define CSIO_ASIC_DEVID_TYPE_MASK              0x00FF
 
-#define CSIO_GLBL_INTR_MASK            (CIM | MPS | PL | PCIE | MC | EDC0 | \
-                                        EDC1 | LE | TP | MA | PM_TX | PM_RX | \
-                                        ULP_RX | CPL_SWITCH | SGE | \
-                                        ULP_TX | SF)
+#define CSIO_GLBL_INTR_MASK    (CIM_F | MPS_F | PL_F | PCIE_F | MC_F | \
+                                EDC0_F | EDC1_F | LE_F | TP_F | MA_F | \
+                                PM_TX_F | PM_RX_F | ULP_RX_F | \
+                                CPL_SWITCH_F | SGE_F | ULP_TX_F | SF_F)
 
 /*
  * Hard parameters used to initialize the card in the absence of a
@@ -201,9 +201,8 @@ enum {
        SF_ERASE_SECTOR = 0xd8,       /* erase sector */
 
        FW_START_SEC = 8,             /* first flash sector for FW */
-       FW_END_SEC = 15,              /* last flash sector for FW */
        FW_IMG_START = FW_START_SEC * SF_SEC_SIZE,
-       FW_MAX_SIZE = (FW_END_SEC - FW_START_SEC + 1) * SF_SEC_SIZE,
+       FW_MAX_SIZE = 16 * SF_SEC_SIZE,
 
        FLASH_CFG_MAX_SIZE    = 0x10000 , /* max size of the flash config file*/
        FLASH_CFG_OFFSET      = 0x1f0000,
@@ -221,7 +220,7 @@ enum {
         * Location of firmware image in FLASH.
         */
        FLASH_FW_START_SEC = 8,
-       FLASH_FW_NSECS = 8,
+       FLASH_FW_NSECS = 16,
        FLASH_FW_START = FLASH_START(FLASH_FW_START_SEC),
        FLASH_FW_MAX_SIZE = FLASH_MAX_SIZE(FLASH_FW_NSECS),