From 9131c473f0875bb592df04c7c5c7a3373c65465d Mon Sep 17 00:00:00 2001

From: Himanshu Madhani <hmadhani@redhat.com>

Date: Thu, 1 Aug 2019 15:55:01 -0400

Subject: [PATCH 041/124] [scsi] scsi: qla2xxx: Secure flash update support for

 ISP28XX

Message-id: <20190801155618.12650-42-hmadhani@redhat.com>

Patchwork-id: 267827

O-Subject: [RHEL 7.8 e-stor PATCH 041/118] scsi: qla2xxx: Secure flash update support for ISP28XX

Bugzilla: 1729270

RH-Acked-by: Jarod Wilson <jarod@redhat.com>

RH-Acked-by: Tony Camuso <tcamuso@redhat.com>

From: Michael Hernandez <mhernandez@marvell.com>

Bugzilla 1729270

This patch adds support for Secure flash update with ISP28xx.

Signed-off-by: Michael Hernandez <mhernandez@marvell.com>

Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

(cherry picked from commit 3f006ac342c033c795aa0ec2d0dde63975e2144b)

Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>

Signed-off-by: Jan Stancek <jstancek@redhat.com>

---

 drivers/scsi/qla2xxx/qla_def.h  |  31 +++-

 drivers/scsi/qla2xxx/qla_fw.h   |   8 +

 drivers/scsi/qla2xxx/qla_gbl.h  |  22 ++-

 drivers/scsi/qla2xxx/qla_init.c |  47 ++++-

 drivers/scsi/qla2xxx/qla_mbx.c  | 141 +++++++++++++++

 drivers/scsi/qla2xxx/qla_mr.c   |   7 +-

 drivers/scsi/qla2xxx/qla_nx.c   |   4 +-

 drivers/scsi/qla2xxx/qla_os.c   |  18 +-

 drivers/scsi/qla2xxx/qla_sup.c  | 387 +++++++++++++++++++++++++++++++++++++---

 9 files changed, 616 insertions(+), 49 deletions(-)

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h

index be2699dc5b56..ead433fe0ff4 100644

--- a/drivers/scsi/qla2xxx/qla_def.h

+++ b/drivers/scsi/qla2xxx/qla_def.h

@@ -1043,6 +1043,7 @@ struct mbx_cmd_32 {

 #define MBC_GET_FIRMWARE_VERSION	8	/* Get firmware revision. */

 #define MBC_LOAD_RISC_RAM		9	/* Load RAM command. */

 #define MBC_DUMP_RISC_RAM		0xa	/* Dump RAM command. */

+#define MBC_SECURE_FLASH_UPDATE		0xa	/* Secure Flash Update(28xx) */

 #define MBC_LOAD_RISC_RAM_EXTENDED	0xb	/* Load RAM extended. */

 #define MBC_DUMP_RISC_RAM_EXTENDED	0xc	/* Dump RAM extended. */

 #define MBC_WRITE_RAM_WORD_EXTENDED	0xd	/* Write RAM word extended */

@@ -3145,10 +3146,10 @@ struct rsp_que;

 struct isp_operations {

 	int (*pci_config) (struct scsi_qla_host *);

-	void (*reset_chip) (struct scsi_qla_host *);

+	int (*reset_chip)(struct scsi_qla_host *);

 	int (*chip_diag) (struct scsi_qla_host *);

 	void (*config_rings) (struct scsi_qla_host *);

-	void (*reset_adapter) (struct scsi_qla_host *);

+	int (*reset_adapter)(struct scsi_qla_host *);

 	int (*nvram_config) (struct scsi_qla_host *);

 	void (*update_fw_options) (struct scsi_qla_host *);

 	int (*load_risc) (struct scsi_qla_host *, uint32_t *);

@@ -3634,6 +3635,8 @@ struct qla_hw_data {

 		uint32_t	rida_fmt2:1;

 		uint32_t	purge_mbox:1;

 		uint32_t        n2n_bigger:1;

+		uint32_t	secure_adapter:1;

+		uint32_t	secure_fw:1;

 	} flags;

 	uint16_t max_exchg;

@@ -3922,6 +3925,9 @@ struct qla_hw_data {

 	void		*sfp_data;

 	dma_addr_t	sfp_data_dma;

+	void		*flt;

+	dma_addr_t	flt_dma;

+

 #define XGMAC_DATA_SIZE	4096

 	void		*xgmac_data;

 	dma_addr_t	xgmac_data_dma;

@@ -4368,6 +4374,7 @@ typedef struct scsi_qla_host {

 #define N2N_LOGIN_NEEDED	30

 #define IOCB_WORK_ACTIVE	31

 #define SET_ZIO_THRESHOLD_NEEDED 32

+#define ISP_ABORT_TO_ROM	33

 	unsigned long	pci_flags;

 #define PFLG_DISCONNECTED	0	/* PCI device removed */

@@ -4553,6 +4560,24 @@ struct qla2_sgx {

 	}					\

 }

+

+#define SFUB_CHECKSUM_SIZE	4

+

+struct secure_flash_update_block {

+	uint32_t	block_info;

+	uint32_t	signature_lo;

+	uint32_t	signature_hi;

+	uint32_t	signature_upper[0x3e];

+};

+

+struct secure_flash_update_block_pk {

+	uint32_t	block_info;

+	uint32_t	signature_lo;

+	uint32_t	signature_hi;

+	uint32_t	signature_upper[0x3e];

+	uint32_t	public_key[0x41];

+};

+

 /*

  * Macros to help code, maintain, etc.

  */

@@ -4753,6 +4778,8 @@ struct sff_8247_a0 {

 	IS_QLA83XX(_vha->hw) || IS_QLA27XX(_vha->hw) || \

 	 IS_QLA28XX(_vha->hw)))

+#define FLASH_SEMAPHORE_REGISTER_ADDR   0x00101016

+

 #define SAVE_TOPO(_ha) { \

 	if (_ha->current_topology)				\

 		_ha->prev_topology = _ha->current_topology;     \

diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h

index 9dbd0dce5a29..d53cd7875a85 100644

--- a/drivers/scsi/qla2xxx/qla_fw.h

+++ b/drivers/scsi/qla2xxx/qla_fw.h

@@ -1536,6 +1536,10 @@ struct qla_flt_region {

 	uint32_t end;

 };

+#define FLT_REGION_SIZE		16

+#define FLT_MAX_REGIONS		0xFF

+#define FLT_REGIONS_SIZE	(FLT_REGION_SIZE * FLT_MAX_REGIONS)

+

 /* Flash NPIV Configuration Table ********************************************/

 struct qla_npiv_header {

@@ -1725,6 +1729,10 @@ struct access_chip_rsp_84xx {

 #define LR_DIST_FW_SHIFT	(LR_DIST_FW_POS - LR_DIST_NV_POS)

 #define LR_DIST_FW_FIELD(x)	((x) << LR_DIST_FW_SHIFT & 0xf000)

+/* FAC semaphore defines */

+#define FAC_SEMAPHORE_UNLOCK    0

+#define FAC_SEMAPHORE_LOCK      1

+

 struct nvram_81xx {

 	/* NVRAM header. */

 	uint8_t id[4];

diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h

index d20801e01008..e271e24fce23 100644

--- a/drivers/scsi/qla2xxx/qla_gbl.h

+++ b/drivers/scsi/qla2xxx/qla_gbl.h

@@ -18,14 +18,14 @@ extern int qla2100_pci_config(struct scsi_qla_host *);

 extern int qla2300_pci_config(struct scsi_qla_host *);

 extern int qla24xx_pci_config(scsi_qla_host_t *);

 extern int qla25xx_pci_config(scsi_qla_host_t *);

-extern void qla2x00_reset_chip(struct scsi_qla_host *);

-extern void qla24xx_reset_chip(struct scsi_qla_host *);

+extern int qla2x00_reset_chip(struct scsi_qla_host *);

+extern int qla24xx_reset_chip(struct scsi_qla_host *);

 extern int qla2x00_chip_diag(struct scsi_qla_host *);

 extern int qla24xx_chip_diag(struct scsi_qla_host *);

 extern void qla2x00_config_rings(struct scsi_qla_host *);

 extern void qla24xx_config_rings(struct scsi_qla_host *);

-extern void qla2x00_reset_adapter(struct scsi_qla_host *);

-extern void qla24xx_reset_adapter(struct scsi_qla_host *);

+extern int qla2x00_reset_adapter(struct scsi_qla_host *);

+extern int qla24xx_reset_adapter(struct scsi_qla_host *);

 extern int qla2x00_nvram_config(struct scsi_qla_host *);

 extern int qla24xx_nvram_config(struct scsi_qla_host *);

 extern int qla81xx_nvram_config(struct scsi_qla_host *);

@@ -470,6 +470,8 @@ qla81xx_fac_do_write_enable(scsi_qla_host_t *, int);

 extern int

 qla81xx_fac_erase_sector(scsi_qla_host_t *, uint32_t, uint32_t);

+extern int qla81xx_fac_semaphore_access(scsi_qla_host_t *, int);

+

 extern int

 qla2x00_get_xgmac_stats(scsi_qla_host_t *, dma_addr_t, uint16_t, uint16_t *);

@@ -515,6 +517,14 @@ extern int qla27xx_get_zio_threshold(scsi_qla_host_t *, uint16_t *);

 extern int qla27xx_set_zio_threshold(scsi_qla_host_t *, uint16_t);

 int qla24xx_res_count_wait(struct scsi_qla_host *, uint16_t *, int);

+extern int qla28xx_secure_flash_update(scsi_qla_host_t *, uint16_t, uint16_t,

+    uint32_t, dma_addr_t, uint32_t);

+

+extern int qla2xxx_read_remote_register(scsi_qla_host_t *, uint32_t,

+    uint32_t *);

+extern int qla2xxx_write_remote_register(scsi_qla_host_t *, uint32_t,

+    uint32_t);

+

 /*

  * Global Function Prototypes in qla_isr.c source file.

  */

@@ -720,7 +730,7 @@ extern void qla24xx_wrt_rsp_reg(struct qla_hw_data *, uint16_t, uint16_t);

 /* qlafx00 related functions */

 extern int qlafx00_pci_config(struct scsi_qla_host *);

 extern int qlafx00_initialize_adapter(struct scsi_qla_host *);

-extern void qlafx00_soft_reset(scsi_qla_host_t *);

+extern int qlafx00_soft_reset(scsi_qla_host_t *);

 extern int qlafx00_chip_diag(scsi_qla_host_t *);

 extern void qlafx00_config_rings(struct scsi_qla_host *);

 extern char *qlafx00_pci_info_str(struct scsi_qla_host *, char *);

@@ -763,7 +773,7 @@ extern int qla82xx_pci_region_offset(struct pci_dev *, int);

 extern int qla82xx_iospace_config(struct qla_hw_data *);

 /* Initialization related functions */

-extern void qla82xx_reset_chip(struct scsi_qla_host *);

+extern int qla82xx_reset_chip(struct scsi_qla_host *);

 extern void qla82xx_config_rings(struct scsi_qla_host *);

 extern void qla82xx_watchdog(scsi_qla_host_t *);

 extern int qla82xx_start_firmware(scsi_qla_host_t *);

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c

index 4307556b933b..d4199cd560e2 100644

--- a/drivers/scsi/qla2xxx/qla_init.c

+++ b/drivers/scsi/qla2xxx/qla_init.c

@@ -2102,6 +2102,7 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)

 	int	rval;

 	struct qla_hw_data *ha = vha->hw;

 	struct req_que *req = ha->req_q_map[0];

+	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;

 	memset(&vha->qla_stats, 0, sizeof(vha->qla_stats));

 	memset(&vha->fc_host_stat, 0, sizeof(vha->fc_host_stat));

@@ -2136,6 +2137,15 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)

 	ha->isp_ops->reset_chip(vha);

+	/* Check for secure flash support */

+	if (IS_QLA28XX(ha)) {

+		if (RD_REG_DWORD(&reg->mailbox12) & BIT_0) {

+			ql_log(ql_log_info, vha, 0xffff, "Adapter is Secure\n");

+			ha->flags.secure_adapter = 1;

+		}

+	}

+

+

 	rval = qla2xxx_get_flash_info(vha);

 	if (rval) {

 		ql_log(ql_log_fatal, vha, 0x004f,

@@ -2452,7 +2462,7 @@ qla2x00_isp_firmware(scsi_qla_host_t *vha)

  *

  * Returns 0 on success.

  */

-void

+int

 qla2x00_reset_chip(scsi_qla_host_t *vha)

 {

 	unsigned long   flags = 0;

@@ -2460,9 +2470,10 @@ qla2x00_reset_chip(scsi_qla_host_t *vha)

 	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;

 	uint32_t	cnt;

 	uint16_t	cmd;

+	int rval = QLA_FUNCTION_FAILED;

 	if (unlikely(pci_channel_offline(ha->pdev)))

-		return;

+		return rval;

 	ha->isp_ops->disable_intrs(ha);

@@ -2588,6 +2599,8 @@ qla2x00_reset_chip(scsi_qla_host_t *vha)

 	}

 	spin_unlock_irqrestore(&ha->hardware_lock, flags);

+

+	return QLA_SUCCESS;

 }

 /**

@@ -2828,14 +2841,15 @@ acquired:

  *

  * Returns 0 on success.

  */

-void

+int

 qla24xx_reset_chip(scsi_qla_host_t *vha)

 {

 	struct qla_hw_data *ha = vha->hw;

+	int rval = QLA_FUNCTION_FAILED;

 	if (pci_channel_offline(ha->pdev) &&

 	    ha->flags.pci_channel_io_perm_failure) {

-		return;

+		return rval;

 	}

 	ha->isp_ops->disable_intrs(ha);

@@ -2843,7 +2857,9 @@ qla24xx_reset_chip(scsi_qla_host_t *vha)

 	qla25xx_manipulate_risc_semaphore(vha);

 	/* Perform RISC reset. */

-	qla24xx_reset_risc(vha);

+	rval = qla24xx_reset_risc(vha);

+

+	return rval;

 }

 /**

@@ -6685,6 +6701,14 @@ qla2x00_abort_isp(scsi_qla_host_t *vha)

 	if (vha->flags.online) {

 		qla2x00_abort_isp_cleanup(vha);

+		if (test_and_clear_bit(ISP_ABORT_TO_ROM, &vha->dpc_flags)) {

+			ha->flags.chip_reset_done = 1;

+			vha->flags.online = 1;

+			status = 0;

+			clear_bit(ISP_ABORT_RETRY, &vha->dpc_flags);

+			return status;

+		}

+

 		if (IS_QLA8031(ha)) {

 			ql_dbg(ql_dbg_p3p, vha, 0xb05c,

 			    "Clearing fcoe driver presence.\n");

@@ -6925,7 +6949,7 @@ qla25xx_init_queues(struct qla_hw_data *ha)

 * Input:

 *      ha = adapter block pointer.

 */

-void

+int

 qla2x00_reset_adapter(scsi_qla_host_t *vha)

 {

 	unsigned long flags = 0;

@@ -6941,17 +6965,20 @@ qla2x00_reset_adapter(scsi_qla_host_t *vha)

 	WRT_REG_WORD(&reg->hccr, HCCR_RELEASE_RISC);

 	RD_REG_WORD(&reg->hccr);			/* PCI Posting. */

 	spin_unlock_irqrestore(&ha->hardware_lock, flags);

+

+	return QLA_SUCCESS;

 }

-void

+int

 qla24xx_reset_adapter(scsi_qla_host_t *vha)

 {

 	unsigned long flags = 0;

 	struct qla_hw_data *ha = vha->hw;

 	struct device_reg_24xx __iomem *reg = &ha->iobase->isp24;

+	int rval = QLA_SUCCESS;

 	if (IS_P3P_TYPE(ha))

-		return;

+		return rval;

 	vha->flags.online = 0;

 	ha->isp_ops->disable_intrs(ha);

@@ -6965,6 +6992,8 @@ qla24xx_reset_adapter(scsi_qla_host_t *vha)

 	if (IS_NOPOLLING_TYPE(ha))

 		ha->isp_ops->enable_intrs(ha);

+

+	return rval;

 }

 /* On sparc systems, obtain port and node WWN from firmware

@@ -8202,7 +8231,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)

 	if (IS_P3P_TYPE(ha) || IS_QLA8031(ha))

 		ha->vpd_size = FA_VPD_SIZE_82XX;

-	if (IS_QLA28XX(ha))

+	if (IS_QLA28XX(ha) || IS_QLA27XX(ha))

 		qla28xx_get_aux_images(vha, &active_regions);

 	/* Get VPD data into cache */

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c

index 4fa8b2b08768..2b2678e1b043 100644

--- a/drivers/scsi/qla2xxx/qla_mbx.c

+++ b/drivers/scsi/qla2xxx/qla_mbx.c

@@ -1145,6 +1145,13 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha)

 		ha->fw_shared_ram_end = (mcp->mb[21] << 16) | mcp->mb[20];

 		ha->fw_ddr_ram_start = (mcp->mb[23] << 16) | mcp->mb[22];

 		ha->fw_ddr_ram_end = (mcp->mb[25] << 16) | mcp->mb[24];

+		if (IS_QLA28XX(ha)) {

+			if (mcp->mb[16] & BIT_10) {

+				ql_log(ql_log_info, vha, 0xffff,

+				    "FW support secure flash updates\n");

+				ha->flags.secure_fw = 1;

+			}

+		}

 	}

 failed:

@@ -4596,6 +4603,42 @@ qla81xx_fac_erase_sector(scsi_qla_host_t *vha, uint32_t start, uint32_t finish)

 }

 int

+qla81xx_fac_semaphore_access(scsi_qla_host_t *vha, int lock)

+{

+	int rval = QLA_SUCCESS;

+	mbx_cmd_t mc;

+	mbx_cmd_t *mcp = &mc;

+	struct qla_hw_data *ha = vha->hw;

+

+	if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha) &&

+	    !IS_QLA27XX(ha) && !IS_QLA28XX(ha))

+		return rval;

+

+	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e2,

+	    "Entered %s.\n", __func__);

+

+	mcp->mb[0] = MBC_FLASH_ACCESS_CTRL;

+	mcp->mb[1] = (lock ? FAC_OPT_CMD_LOCK_SEMAPHORE :

+	    FAC_OPT_CMD_UNLOCK_SEMAPHORE);

+	mcp->out_mb = MBX_1|MBX_0;

+	mcp->in_mb = MBX_1|MBX_0;

+	mcp->tov = MBX_TOV_SECONDS;

+	mcp->flags = 0;

+	rval = qla2x00_mailbox_command(vha, mcp);

+

+	if (rval != QLA_SUCCESS) {

+		ql_dbg(ql_dbg_mbx, vha, 0x10e3,

+		    "Failed=%x mb[0]=%x mb[1]=%x mb[2]=%x.\n",

+		    rval, mcp->mb[0], mcp->mb[1], mcp->mb[2]);

+	} else {

+		ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e4,

+		    "Done %s.\n", __func__);

+	}

+

+	return rval;

+}

+

+int

 qla81xx_restart_mpi_firmware(scsi_qla_host_t *vha)

 {

 	int rval = 0;

@@ -6534,3 +6577,101 @@ int qla24xx_res_count_wait(struct scsi_qla_host *vha,

 done:

 	return rval;

 }

+

+int qla28xx_secure_flash_update(scsi_qla_host_t *vha, uint16_t opts,

+    uint16_t region, uint32_t len, dma_addr_t sfub_dma_addr,

+    uint32_t sfub_len)

+{

+	int		rval;

+	mbx_cmd_t mc;

+	mbx_cmd_t *mcp = &mc;

+

+	mcp->mb[0] = MBC_SECURE_FLASH_UPDATE;

+	mcp->mb[1] = opts;

+	mcp->mb[2] = region;

+	mcp->mb[3] = MSW(len);

+	mcp->mb[4] = LSW(len);

+	mcp->mb[5] = MSW(sfub_dma_addr);

+	mcp->mb[6] = LSW(sfub_dma_addr);

+	mcp->mb[7] = MSW(MSD(sfub_dma_addr));

+	mcp->mb[8] = LSW(MSD(sfub_dma_addr));

+	mcp->mb[9] = sfub_len;

+	mcp->out_mb =

+	    MBX_9|MBX_8|MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;

+	mcp->in_mb = MBX_2|MBX_1|MBX_0;

+	mcp->tov = MBX_TOV_SECONDS;

+	mcp->flags = 0;

+	rval = qla2x00_mailbox_command(vha, mcp);

+

+	if (rval != QLA_SUCCESS) {

+		ql_dbg(ql_dbg_mbx, vha, 0xffff, "%s(%ld): failed rval 0x%x, %x %x %x",

+			__func__, vha->host_no, rval, mcp->mb[0], mcp->mb[1],

+			mcp->mb[2]);

+	}

+

+	return rval;

+}

+

+int qla2xxx_write_remote_register(scsi_qla_host_t *vha, uint32_t addr,

+    uint32_t data)

+{

+	int rval;

+	mbx_cmd_t mc;

+	mbx_cmd_t *mcp = &mc;

+

+	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e8,

+	    "Entered %s.\n", __func__);

+

+	mcp->mb[0] = MBC_WRITE_REMOTE_REG;

+	mcp->mb[1] = LSW(addr);

+	mcp->mb[2] = MSW(addr);

+	mcp->mb[3] = LSW(data);

+	mcp->mb[4] = MSW(data);

+	mcp->out_mb = MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;

+	mcp->in_mb = MBX_1|MBX_0;

+	mcp->tov = MBX_TOV_SECONDS;

+	mcp->flags = 0;

+	rval = qla2x00_mailbox_command(vha, mcp);

+

+	if (rval != QLA_SUCCESS) {

+		ql_dbg(ql_dbg_mbx, vha, 0x10e9,

+		    "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);

+	} else {

+		ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ea,

+		    "Done %s.\n", __func__);

+	}

+

+	return rval;

+}

+

+int qla2xxx_read_remote_register(scsi_qla_host_t *vha, uint32_t addr,

+    uint32_t *data)

+{

+	int rval;

+	mbx_cmd_t mc;

+	mbx_cmd_t *mcp = &mc;

+

+	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10e8,

+	    "Entered %s.\n", __func__);

+

+	mcp->mb[0] = MBC_READ_REMOTE_REG;

+	mcp->mb[1] = LSW(addr);

+	mcp->mb[2] = MSW(addr);

+	mcp->out_mb = MBX_2|MBX_1|MBX_0;

+	mcp->in_mb = MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;

+	mcp->tov = MBX_TOV_SECONDS;

+	mcp->flags = 0;

+	rval = qla2x00_mailbox_command(vha, mcp);

+

+	*data = (uint32_t)((((uint32_t)mcp->mb[4]) << 16) | mcp->mb[3]);

+

+	if (rval != QLA_SUCCESS) {

+		ql_dbg(ql_dbg_mbx, vha, 0x10e9,

+		    "Failed=%x mb[0]=%x.\n", rval, mcp->mb[0]);

+	} else {

+		ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x10ea,

+		    "Done %s.\n", __func__);

+	}

+

+	return rval;

+}

diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c

index 527d255999cd..a3464a76e0b4 100644

--- a/drivers/scsi/qla2xxx/qla_mr.c

+++ b/drivers/scsi/qla2xxx/qla_mr.c

@@ -627,17 +627,20 @@ qlafx00_soc_cpu_reset(scsi_qla_host_t *vha)

  *

  * Returns 0 on success.

  */

-void

+int

 qlafx00_soft_reset(scsi_qla_host_t *vha)

 {

 	struct qla_hw_data *ha = vha->hw;

+	int rval = QLA_FUNCTION_FAILED;

 	if (unlikely(pci_channel_offline(ha->pdev) &&

 	    ha->flags.pci_channel_io_perm_failure))

-		return;

+		return rval;

 	ha->isp_ops->disable_intrs(ha);

 	qlafx00_soc_cpu_reset(vha);

+

+	return QLA_SUCCESS;

 }

 /**

diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c

index ff624c06824e..687c4cb49ecb 100644

--- a/drivers/scsi/qla2xxx/qla_nx.c

+++ b/drivers/scsi/qla2xxx/qla_nx.c

@@ -1752,11 +1752,13 @@ qla82xx_pci_config(scsi_qla_host_t *vha)

  *

  * Returns 0 on success.

  */

-void

+int

 qla82xx_reset_chip(scsi_qla_host_t *vha)

 {

 	struct qla_hw_data *ha = vha->hw;

 	ha->isp_ops->disable_intrs(ha);

+

+	return QLA_SUCCESS;

 }

 void qla82xx_config_rings(struct scsi_qla_host *vha)

diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c

index 354977d41097..f5933550586d 100644

--- a/drivers/scsi/qla2xxx/qla_os.c

+++ b/drivers/scsi/qla2xxx/qla_os.c

@@ -41,7 +41,7 @@ static struct kmem_cache *ctx_cachep;

 /*

  * error level for logging

  */

-uint ql_errlev = ql_log_all;

+uint ql_errlev = 0x8001;

 static int ql2xenableclass2;

 module_param(ql2xenableclass2, int, S_IRUGO|S_IRUSR);

@@ -4395,8 +4395,20 @@ qla2x00_mem_alloc(struct qla_hw_data *ha, uint16_t req_len, uint16_t rsp_len,

 		goto fail_sfp_data;

 	}

+	ha->flt = dma_alloc_coherent(&ha->pdev->dev,

+	    sizeof(struct qla_flt_header) + FLT_REGIONS_SIZE, &ha->flt_dma,

+	    GFP_KERNEL);

+	if (!ha->flt) {

+		ql_dbg_pci(ql_dbg_init, ha->pdev, 0x011b,

+		    "Unable to allocate memory for FLT.\n");

+		goto fail_flt_buffer;

+	}

+

 	return 0;

+fail_flt_buffer:

+	dma_free_coherent(&ha->pdev->dev, SFP_DEV_SIZE,

+	    ha->sfp_data, ha->sfp_data_dma);

 fail_sfp_data:

 	kfree(ha->loop_id_map);

 fail_loop_id_map:

@@ -4805,6 +4817,10 @@ qla2x00_mem_free(struct qla_hw_data *ha)

 		dma_free_coherent(&ha->pdev->dev, SFP_DEV_SIZE, ha->sfp_data,

 		    ha->sfp_data_dma);

+	if (ha->flt)

+		dma_free_coherent(&ha->pdev->dev, SFP_DEV_SIZE,

+		    ha->flt, ha->flt_dma);

+

 	if (ha->ms_iocb)

 		dma_pool_free(ha->s_dma_pool, ha->ms_iocb, ha->ms_iocb_dma);

diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c

index 8191f3599f79..ec14d10bff4c 100644

--- a/drivers/scsi/qla2xxx/qla_sup.c

+++ b/drivers/scsi/qla2xxx/qla_sup.c

@@ -634,7 +634,7 @@ end:

 static void

 qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)

 {

-	const char *loc, *locations[] = { "DEF", "FLT" };

+	const char *locations[] = { "DEF", "FLT" }, *loc = locations[1];

 	const uint32_t def_fw[] =

 		{ FA_RISC_CODE_ADDR, FA_RISC_CODE_ADDR, FA_RISC_CODE_ADDR_81 };

 	const uint32_t def_boot[] =

@@ -664,20 +664,13 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)

 	const uint32_t fcp_prio_cfg1[] =

 		{ FA_FCP_PRIO1_ADDR, FA_FCP_PRIO1_ADDR_25,

 			0 };

-	uint32_t def;

-	uint16_t *wptr;

-	uint16_t cnt, chksum;

-	uint32_t start;

-	struct qla_flt_header *flt;

-	struct qla_flt_region *region;

-	struct qla_hw_data *ha = vha->hw;

-	struct req_que *req = ha->req_q_map[0];

-	def = 0;

-	if (IS_QLA25XX(ha))

-		def = 1;

-	else if (IS_QLA81XX(ha))

-		def = 2;

+	struct qla_hw_data *ha = vha->hw;

+	uint32_t def = IS_QLA81XX(ha) ? 2 : IS_QLA25XX(ha) ? 1 : 0;

+	struct qla_flt_header *flt = (void *)ha->flt;

+	struct qla_flt_region *region = (void *)&flt[1];

+	uint16_t *wptr, cnt, chksum;

+	uint32_t start;

 	/* Assign FCP prio region since older adapters may not have FLT, or

 	   FCP prio region in it's FLT.

@@ -686,12 +679,11 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)

 	    fcp_prio_cfg0[def] : fcp_prio_cfg1[def];

 	ha->flt_region_flt = flt_addr;

-	wptr = (uint16_t *)req->ring;

-	flt = (struct qla_flt_header *)req->ring;

-	region = (struct qla_flt_region *)&flt[1];

-	ha->isp_ops->read_optrom(vha, (uint8_t *)req->ring,

-	    flt_addr << 2, OPTROM_BURST_SIZE);

-	if (*wptr == cpu_to_le16(0xffff))

+	wptr = (uint16_t *)ha->flt;

+	qla24xx_read_flash_data(vha, (void *)flt, flt_addr,

+	    (sizeof(struct qla_flt_header) + FLT_REGIONS_SIZE) >> 2);

+

+	if (le16_to_cpu(*wptr) == 0xffff)

 		goto no_flash_data;

 	if (flt->version != cpu_to_le16(1)) {

 		ql_log(ql_log_warn, vha, 0x0047,

@@ -701,7 +693,7 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)

 		goto no_flash_data;

 	}

-	cnt = (sizeof(struct qla_flt_header) + le16_to_cpu(flt->length)) >> 1;

+	cnt = (sizeof(*flt) + le16_to_cpu(flt->length)) / sizeof(*wptr);

 	for (chksum = 0; cnt--; wptr++)

 		chksum += le16_to_cpu(*wptr);

 	if (chksum) {

@@ -712,16 +704,18 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr)

 		goto no_flash_data;

 	}

-	loc = locations[1];

-	cnt = le16_to_cpu(flt->length) / sizeof(struct qla_flt_region);

+	cnt = le16_to_cpu(flt->length) / sizeof(*region);

 	for ( ; cnt; cnt--, region++) {

 		/* Store addresses as DWORD offsets. */

 		start = le32_to_cpu(region->start) >> 2;

 		ql_dbg(ql_dbg_init, vha, 0x0049,

 		    "FLT[%#x]: start=%#x end=%#x size=%#x.\n",

-		    le16_to_cpu(region->code),

-		    start, le32_to_cpu(region->end) >> 2,

-		    le32_to_cpu(region->size));

+		    le16_to_cpu(region->code), start,

+		    le32_to_cpu(region->end) >> 2,

+		    le32_to_cpu(region->size) >> 2);

+		if (region->attribute)

+			ql_log(ql_dbg_init, vha, 0xffff,

+			    "Region %x is secure\n", region->code);

 		switch (le16_to_cpu(region->code)) {

 		case FLT_REG_FCOE_FW:

@@ -2623,6 +2617,338 @@ qla24xx_read_optrom_data(struct scsi_qla_host *vha, void *buf,

 	return buf;

 }

+static int

+qla28xx_extract_sfub_and_verify(struct scsi_qla_host *vha, uint32_t *buf,

+    uint32_t len, uint32_t buf_size_without_sfub, uint8_t *sfub_buf)

+{

+	uint32_t *p, check_sum = 0;