summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/csiostor/csio_hw.h
diff options
context:
space:
mode:
authorPraveen Madhavan <praveenm@chelsio.com>2015-01-07 19:16:28 +0530
committerDavid S. Miller <davem@davemloft.net>2015-01-08 20:11:35 -0800
commitf40e74ffa3de44f7ef4c09653b070dd115ab7fbe (patch)
tree91504fbb931ed85ab919975616f3983e47d28b7c /drivers/scsi/csiostor/csio_hw.h
parent3552c319493c5a4ccfd6b767a3878e472aa27984 (diff)
csiostor:firmware upgrade fix
This patch fixes removes older means of upgrading Firmware using MAJOR version and adds newer interface version checking mechanism. Please apply this patch on net-next since it depends on previous commits. Signed-off-by: Praveen Madhavan <praveenm@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/csiostor/csio_hw.h')
-rw-r--r--drivers/scsi/csiostor/csio_hw.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/csiostor/csio_hw.h b/drivers/scsi/csiostor/csio_hw.h
index bd9720467aa3..1fe8fdee70fa 100644
--- a/drivers/scsi/csiostor/csio_hw.h
+++ b/drivers/scsi/csiostor/csio_hw.h
@@ -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),