Commit 8ae17876 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Simplify the functions for dumping firmware 

Instead of passing an argument to the firmware dumping functions that tells
these functions whether or not to obtain the hardware lock, obtain that
lock before calling these functions. This patch fixes the following
recently introduced C=2 build error:

  CHECK   drivers/scsi/qla2xxx/qla_tmpl.c
drivers/scsi/qla2xxx/qla_tmpl.c:1133:1: error: Expected ; at end of statement
drivers/scsi/qla2xxx/qla_tmpl.c:1133:1: error: got }
drivers/scsi/qla2xxx/qla_tmpl.h:247:0: error: Expected } at end of function
drivers/scsi/qla2xxx/qla_tmpl.h:247:0: error: got end-of-input

Link: https://lore.kernel.org/r/20200518211712.11395-4-bvanassche@acm.org


Fixes: cbb01c2f ("scsi: qla2xxx: Fix MPI failure AEN (8200) handling")
Cc: Arun Easi <aeasi@marvell.com>
Cc: Nilesh Javali <njavali@marvell.com>
Cc: Himanshu Madhani <himanshu.madhani@oracle.com>
Cc: Martin Wilck <mwilck@suse.com>
Cc: Roman Bolshakov <r.bolshakov@yadro.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarDaniel Wagner <dwagner@suse.de>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fbbc95a4

drivers/scsi/qla2xxx/qla_bsg.c

+2 −2
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ qla81xx_set_loopback_mode(scsi_qla_host_t *vha, uint16_t *config, 
		 * dump and reset the chip.

		 */

		if (ret) {

			ha->isp_ops->fw_dump(vha, 0);

			qla2xxx_dump_fw(vha);

			set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);

		}

		rval = -EINVAL;
@@ -896,7 +896,7 @@ qla2x00_process_loopback(struct bsg_job *bsg_job) 
					 * doesn't work take FCoE dump and then

					 * reset the chip.

					 */

					ha->isp_ops->fw_dump(vha, 0);

					qla2xxx_dump_fw(vha);

					set_bit(ISP_ABORT_NEEDED,

					    &vha->dpc_flags);

				}

drivers/scsi/qla2xxx/qla_dbg.c

+39 −114
Original line number Diff line number Diff line
@@ -716,35 +716,37 @@ qla2xxx_dump_post_process(scsi_qla_host_t *vha, int rval) 
	}

}



void qla2xxx_dump_fw(scsi_qla_host_t *vha)

{

	unsigned long flags;



	spin_lock_irqsave(&vha->hw->hardware_lock, flags);

	vha->hw->isp_ops->fw_dump(vha);

	spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);

}



/**

 * qla2300_fw_dump() - Dumps binary data from the 2300 firmware.

 * @vha: HA context

 * @hardware_locked: Called with the hardware_lock

 */

void

qla2300_fw_dump(scsi_qla_host_t *vha, int hardware_locked)

qla2300_fw_dump(scsi_qla_host_t *vha)

{

	int		rval;

	uint32_t	cnt;

	struct qla_hw_data *ha = vha->hw;

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

	uint16_t __iomem *dmp_reg;

	unsigned long	flags;

	struct qla2300_fw_dump	*fw;

	void		*nxt;

	struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);



	flags = 0;



#ifndef __CHECKER__

	if (!hardware_locked)

		spin_lock_irqsave(&ha->hardware_lock, flags);

#endif

	lockdep_assert_held(&ha->hardware_lock);



	if (!ha->fw_dump) {

		ql_log(ql_log_warn, vha, 0xd002,

		    "No buffer available for dump.\n");

		goto qla2300_fw_dump_failed;

		return;

	}



	if (ha->fw_dumped) {
@@ -752,7 +754,7 @@ qla2300_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
		    "Firmware has been previously dumped (%p) "

		    "-- ignoring request.\n",

		    ha->fw_dump);

		goto qla2300_fw_dump_failed;

		return;

	}

	fw = &ha->fw_dump->isp.isp23;

	qla2xxx_prep_dump(ha, ha->fw_dump);
@@ -876,48 +878,31 @@ qla2300_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
		qla2xxx_copy_queues(ha, nxt);



	qla2xxx_dump_post_process(base_vha, rval);



qla2300_fw_dump_failed:

#ifndef __CHECKER__

	if (!hardware_locked)

		spin_unlock_irqrestore(&ha->hardware_lock, flags);

#else

	;

#endif

}



/**

 * qla2100_fw_dump() - Dumps binary data from the 2100/2200 firmware.

 * @vha: HA context

 * @hardware_locked: Called with the hardware_lock

 */

void

qla2100_fw_dump(scsi_qla_host_t *vha, int hardware_locked)

qla2100_fw_dump(scsi_qla_host_t *vha)

{

	int		rval;

	uint32_t	cnt, timer;

	uint16_t	risc_address;

	uint16_t	mb0, mb2;

	uint16_t	risc_address = 0;

	uint16_t	mb0 = 0, mb2 = 0;

	struct qla_hw_data *ha = vha->hw;

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

	uint16_t __iomem *dmp_reg;

	unsigned long	flags;

	struct qla2100_fw_dump	*fw;

	struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);



	risc_address = 0;

	mb0 = mb2 = 0;

	flags = 0;



#ifndef __CHECKER__

	if (!hardware_locked)

		spin_lock_irqsave(&ha->hardware_lock, flags);

#endif

	lockdep_assert_held(&ha->hardware_lock);



	if (!ha->fw_dump) {

		ql_log(ql_log_warn, vha, 0xd004,

		    "No buffer available for dump.\n");

		goto qla2100_fw_dump_failed;

		return;

	}



	if (ha->fw_dumped) {
@@ -925,7 +910,7 @@ qla2100_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
		    "Firmware has been previously dumped (%p) "

		    "-- ignoring request.\n",

		    ha->fw_dump);

		goto qla2100_fw_dump_failed;

		return;

	}

	fw = &ha->fw_dump->isp.isp21;

	qla2xxx_prep_dump(ha, ha->fw_dump);
@@ -1080,18 +1065,10 @@ qla2100_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
		qla2xxx_copy_queues(ha, &fw->risc_ram[cnt]);



	qla2xxx_dump_post_process(base_vha, rval);



qla2100_fw_dump_failed:

#ifndef __CHECKER__

	if (!hardware_locked)

		spin_unlock_irqrestore(&ha->hardware_lock, flags);

#else

	;

#endif

}



void

qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)

qla24xx_fw_dump(scsi_qla_host_t *vha)

{

	int		rval;

	uint32_t	cnt;
@@ -1100,28 +1077,23 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
	uint32_t __iomem *dmp_reg;

	uint32_t	*iter_reg;

	uint16_t __iomem *mbx_reg;

	unsigned long	flags;

	struct qla24xx_fw_dump *fw;

	void		*nxt;

	void		*nxt_chain;

	uint32_t	*last_chain = NULL;

	struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);



	lockdep_assert_held(&ha->hardware_lock);



	if (IS_P3P_TYPE(ha))

		return;



	flags = 0;

	ha->fw_dump_cap_flags = 0;



#ifndef __CHECKER__

	if (!hardware_locked)

		spin_lock_irqsave(&ha->hardware_lock, flags);

#endif



	if (!ha->fw_dump) {

		ql_log(ql_log_warn, vha, 0xd006,

		    "No buffer available for dump.\n");

		goto qla24xx_fw_dump_failed;

		return;

	}



	if (ha->fw_dumped) {
@@ -1129,7 +1101,7 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
		    "Firmware has been previously dumped (%p) "

		    "-- ignoring request.\n",

		    ha->fw_dump);

		goto qla24xx_fw_dump_failed;

		return;

	}

	QLA_FW_STOPPED(ha);

	fw = &ha->fw_dump->isp.isp24;
@@ -1339,18 +1311,10 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 


qla24xx_fw_dump_failed_0:

	qla2xxx_dump_post_process(base_vha, rval);



qla24xx_fw_dump_failed:

#ifndef __CHECKER__

	if (!hardware_locked)

		spin_unlock_irqrestore(&ha->hardware_lock, flags);

#else

	;

#endif

}



void

qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)

qla25xx_fw_dump(scsi_qla_host_t *vha)

{

	int		rval;

	uint32_t	cnt;
@@ -1359,24 +1323,19 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
	uint32_t __iomem *dmp_reg;

	uint32_t	*iter_reg;

	uint16_t __iomem *mbx_reg;

	unsigned long	flags;

	struct qla25xx_fw_dump *fw;

	void		*nxt, *nxt_chain;

	uint32_t	*last_chain = NULL;

	struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);



	flags = 0;

	ha->fw_dump_cap_flags = 0;

	lockdep_assert_held(&ha->hardware_lock);



#ifndef __CHECKER__

	if (!hardware_locked)

		spin_lock_irqsave(&ha->hardware_lock, flags);

#endif

	ha->fw_dump_cap_flags = 0;



	if (!ha->fw_dump) {

		ql_log(ql_log_warn, vha, 0xd008,

		    "No buffer available for dump.\n");

		goto qla25xx_fw_dump_failed;

		return;

	}



	if (ha->fw_dumped) {
@@ -1384,7 +1343,7 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
		    "Firmware has been previously dumped (%p) "

		    "-- ignoring request.\n",

		    ha->fw_dump);

		goto qla25xx_fw_dump_failed;

		return;

	}

	QLA_FW_STOPPED(ha);

	fw = &ha->fw_dump->isp.isp25;
@@ -1665,18 +1624,10 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 


qla25xx_fw_dump_failed_0:

	qla2xxx_dump_post_process(base_vha, rval);



qla25xx_fw_dump_failed:

#ifndef __CHECKER__

	if (!hardware_locked)

		spin_unlock_irqrestore(&ha->hardware_lock, flags);

#else

	;

#endif

}



void

qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)

qla81xx_fw_dump(scsi_qla_host_t *vha)

{

	int		rval;

	uint32_t	cnt;
@@ -1685,24 +1636,19 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
	uint32_t __iomem *dmp_reg;

	uint32_t	*iter_reg;

	uint16_t __iomem *mbx_reg;

	unsigned long	flags;

	struct qla81xx_fw_dump *fw;

	void		*nxt, *nxt_chain;

	uint32_t	*last_chain = NULL;

	struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);



	flags = 0;

	ha->fw_dump_cap_flags = 0;

	lockdep_assert_held(&ha->hardware_lock);



#ifndef __CHECKER__

	if (!hardware_locked)

		spin_lock_irqsave(&ha->hardware_lock, flags);

#endif

	ha->fw_dump_cap_flags = 0;



	if (!ha->fw_dump) {

		ql_log(ql_log_warn, vha, 0xd00a,

		    "No buffer available for dump.\n");

		goto qla81xx_fw_dump_failed;

		return;

	}



	if (ha->fw_dumped) {
@@ -1710,7 +1656,7 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
		    "Firmware has been previously dumped (%p) "

		    "-- ignoring request.\n",

		    ha->fw_dump);

		goto qla81xx_fw_dump_failed;

		return;

	}

	fw = &ha->fw_dump->isp.isp81;

	qla2xxx_prep_dump(ha, ha->fw_dump);
@@ -1993,18 +1939,10 @@ qla81xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 


qla81xx_fw_dump_failed_0:

	qla2xxx_dump_post_process(base_vha, rval);



qla81xx_fw_dump_failed:

#ifndef __CHECKER__

	if (!hardware_locked)

		spin_unlock_irqrestore(&ha->hardware_lock, flags);

#else

	;

#endif

}



void

qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)

qla83xx_fw_dump(scsi_qla_host_t *vha)

{

	int		rval;

	uint32_t	cnt;
@@ -2013,31 +1951,26 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
	uint32_t __iomem *dmp_reg;

	uint32_t	*iter_reg;

	uint16_t __iomem *mbx_reg;

	unsigned long	flags;

	struct qla83xx_fw_dump *fw;

	void		*nxt, *nxt_chain;

	uint32_t	*last_chain = NULL;

	struct scsi_qla_host *base_vha = pci_get_drvdata(ha->pdev);



	flags = 0;

	ha->fw_dump_cap_flags = 0;

	lockdep_assert_held(&ha->hardware_lock);



#ifndef __CHECKER__

	if (!hardware_locked)

		spin_lock_irqsave(&ha->hardware_lock, flags);

#endif

	ha->fw_dump_cap_flags = 0;



	if (!ha->fw_dump) {

		ql_log(ql_log_warn, vha, 0xd00c,

		    "No buffer available for dump!!!\n");

		goto qla83xx_fw_dump_failed;

		return;

	}



	if (ha->fw_dumped) {

		ql_log(ql_log_warn, vha, 0xd00d,

		    "Firmware has been previously dumped (%p) -- ignoring "

		    "request...\n", ha->fw_dump);

		goto qla83xx_fw_dump_failed;

		return;

	}

	QLA_FW_STOPPED(ha);

	fw = &ha->fw_dump->isp.isp83;
@@ -2507,14 +2440,6 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 


qla83xx_fw_dump_failed_0:

	qla2xxx_dump_post_process(base_vha, rval);



qla83xx_fw_dump_failed:

#ifndef __CHECKER__

	if (!hardware_locked)

		spin_unlock_irqrestore(&ha->hardware_lock, flags);

#else

	;

#endif

}



/****************************************************************************/

drivers/scsi/qla2xxx/qla_def.h

+1 −1
Original line number Diff line number Diff line
@@ -3222,7 +3222,7 @@ struct isp_operations { 
	int (*write_nvram)(struct scsi_qla_host *, void *, uint32_t,

		uint32_t);



	void (*fw_dump) (struct scsi_qla_host *, int);

	void (*fw_dump)(struct scsi_qla_host *vha);

	void (*mpi_fw_dump)(struct scsi_qla_host *, int);



	int (*beacon_on) (struct scsi_qla_host *);

drivers/scsi/qla2xxx/qla_gbl.h

+11 −10
Original line number Diff line number Diff line
@@ -637,15 +637,16 @@ extern int qla24xx_read_fcp_prio_cfg(scsi_qla_host_t *); 
/*

 * Global Function Prototypes in qla_dbg.c source file.

 */

extern void qla2100_fw_dump(scsi_qla_host_t *, int);

extern void qla2300_fw_dump(scsi_qla_host_t *, int);

extern void qla24xx_fw_dump(scsi_qla_host_t *, int);

extern void qla25xx_fw_dump(scsi_qla_host_t *, int);

extern void qla81xx_fw_dump(scsi_qla_host_t *, int);

extern void qla82xx_fw_dump(scsi_qla_host_t *, int);

extern void qla8044_fw_dump(scsi_qla_host_t *, int);



extern void qla27xx_fwdump(scsi_qla_host_t *, int);

void qla2xxx_dump_fw(scsi_qla_host_t *vha);

void qla2100_fw_dump(scsi_qla_host_t *vha);

void qla2300_fw_dump(scsi_qla_host_t *vha);

void qla24xx_fw_dump(scsi_qla_host_t *vha);

void qla25xx_fw_dump(scsi_qla_host_t *vha);

void qla81xx_fw_dump(scsi_qla_host_t *vha);

void qla82xx_fw_dump(scsi_qla_host_t *vha);

void qla8044_fw_dump(scsi_qla_host_t *vha);



void qla27xx_fwdump(scsi_qla_host_t *vha);

extern void qla27xx_mpi_fwdump(scsi_qla_host_t *, int);

extern ulong qla27xx_fwdt_calculate_dump_size(struct scsi_qla_host *, void *);

extern int qla27xx_fwdt_template_valid(void *);
@@ -873,7 +874,7 @@ extern int qla2x00_get_idma_speed(scsi_qla_host_t *, uint16_t, 
	uint16_t *, uint16_t *);



/* 83xx related functions */

extern void qla83xx_fw_dump(scsi_qla_host_t *, int);

void qla83xx_fw_dump(scsi_qla_host_t *vha);



/* Minidump related functions */

extern int qla82xx_md_get_template_size(scsi_qla_host_t *);

drivers/scsi/qla2xxx/qla_isr.c

+6 −6
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ qla2100_intr_handler(int irq, void *dev_id) 
			WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);

			RD_REG_WORD(&reg->hccr);



			ha->isp_ops->fw_dump(vha, 1);

			ha->isp_ops->fw_dump(vha);

			set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);

			break;

		} else if ((RD_REG_WORD(&reg->istatus) & ISR_RISC_INT) == 0)
@@ -351,7 +351,7 @@ qla2300_intr_handler(int irq, void *dev_id) 
			WRT_REG_WORD(&reg->hccr, HCCR_RESET_RISC);

			RD_REG_WORD(&reg->hccr);



			ha->isp_ops->fw_dump(vha, 1);

			ha->isp_ops->fw_dump(vha);

			set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);

			break;

		} else if ((stat & HSR_RISC_INT) == 0)
@@ -777,7 +777,7 @@ qla27xx_handle_8200_aen(scsi_qla_host_t *vha, uint16_t *mb) 
	       "MPI Heartbeat stop. FW dump needed\n");



	if (ql2xfulldump_on_mpifail) {

		ha->isp_ops->fw_dump(vha, 1);

		ha->isp_ops->fw_dump(vha);

		reset_isp_needed = 1;

	}
@@ -908,7 +908,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) 
		if ((IS_QLA27XX(ha) || IS_QLA28XX(ha)) &&

		    RD_REG_WORD(&reg24->mailbox7) & BIT_8)

			ha->isp_ops->mpi_fw_dump(vha, 1);

		ha->isp_ops->fw_dump(vha, 1);

		ha->isp_ops->fw_dump(vha);

		ha->flags.fw_init_done = 0;

		QLA_FW_STOPPED(ha);
@@ -3473,7 +3473,7 @@ qla24xx_intr_handler(int irq, void *dev_id) 


			qla2xxx_check_risc_status(vha);



			ha->isp_ops->fw_dump(vha, 1);

			ha->isp_ops->fw_dump(vha);

			set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);

			break;

		} else if ((stat & HSRX_RISC_INT) == 0)
@@ -3602,7 +3602,7 @@ qla24xx_msix_default(int irq, void *dev_id) 


			qla2xxx_check_risc_status(vha);



			ha->isp_ops->fw_dump(vha, 1);

			ha->isp_ops->fw_dump(vha);

			set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);

			break;

		} else if ((stat & HSRX_RISC_INT) == 0)