Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ded85e2 authored Jan 05, 2009 by Andrew Vasquez Committed by James Bottomley Jan 07, 2009

[SCSI] qla2xxx: Remove support for reading/writing HW-event-log.



Software should not touch this region of flash, as the firmware
will be the only writer and consumer of the region.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

parent 574df408

drivers/scsi/qla2xxx/qla_def.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -2136,7 +2136,6 @@ struct qla_msix_entry {
		/* Work events. */
		enum qla_work_type {
		QLA_EVT_AEN,
		QLA_EVT_HWE_LOG,
		};


		@@ -2151,10 +2150,6 @@ struct qla_work_evt {
		enum fc_host_event_code code;
		u32 data;
		} aen;
		struct {
		uint16_t code;
		uint16_t d1, d2, d3;
		} hwe;
		} u;
		};

		@@ -2489,10 +2484,6 @@ struct qla_hw_data {
		uint64_t fce_wr, fce_rd;
		struct mutex fce_mutex;

		uint32_t hw_event_start;
		uint32_t hw_event_ptr;
		uint32_t hw_event_pause_errors;

		uint32_t pci_attr;
		uint16_t chip_revision;

		@@ -2533,7 +2524,6 @@ struct qla_hw_data {
		uint32_t flt_region_boot;
		uint32_t flt_region_fw;
		uint32_t flt_region_vpd_nvram;
		uint32_t flt_region_hw_event;
		uint32_t flt_region_npiv_conf;

		/* Needed for BEACON */

drivers/scsi/qla2xxx/qla_gbl.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -69,8 +69,6 @@ extern int qla2x00_loop_reset(scsi_qla_host_t *);
		extern void qla2x00_abort_all_cmds(scsi_qla_host_t *, int);
		extern int qla2x00_post_aen_work(struct scsi_qla_host *, enum
		fc_host_event_code, u32);
		extern int qla2x00_post_hwe_work(struct scsi_qla_host *, uint16_t , uint16_t,
		uint16_t, uint16_t);

		extern void qla2x00_abort_fcport_cmds(fc_port_t *);
		extern struct scsi_qla_host qla2x00_create_host(struct scsi_host_template ,
		@@ -317,9 +315,6 @@ extern uint8_t qla25xx_read_optrom_data(struct scsi_qla_host , uint8_t *,
		extern int qla2x00_get_flash_version(scsi_qla_host_t , void );
		extern int qla24xx_get_flash_version(scsi_qla_host_t , void );

		extern int qla2xxx_hw_event_log(scsi_qla_host_t *, uint16_t , uint16_t,
		uint16_t, uint16_t);

		extern int qla2xxx_get_flash_info(scsi_qla_host_t *);
		extern int qla2xxx_get_vpd_field(scsi_qla_host_t , char , char *, size_t);

drivers/scsi/qla2xxx/qla_init.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -552,10 +552,6 @@ qla24xx_reset_risc(scsi_qla_host_t *vha)
		d2 = RD_REG_DWORD(&reg->ctrl_status);
		barrier();
		}
		if (cnt == 0 \|\| hw_evt)
		qla2xxx_hw_event_log(vha, HW_EVENT_RESET_ERR,
		RD_REG_WORD(&reg->mailbox1), RD_REG_WORD(&reg->mailbox2),
		RD_REG_WORD(&reg->mailbox3));

		WRT_REG_DWORD(&reg->hccr, HCCRX_SET_RISC_RESET);
		RD_REG_DWORD(&reg->hccr);
		@@ -1665,10 +1661,6 @@ qla2x00_nvram_config(scsi_qla_host_t *vha)
		qla_printk(KERN_WARNING, ha, "Falling back to functioning (yet "
		"invalid -- WWPN) defaults.\n");

		if (chksum)
		qla2xxx_hw_event_log(vha, HW_EVENT_NVRAM_CHKSUM_ERR, 0,
		MSW(chksum), LSW(chksum));

		/*
		* Set default initialization control block.
		*/

drivers/scsi/qla2xxx/qla_isr.c

+0 −15

Original line number	Diff line number	Diff line
		@@ -362,7 +362,6 @@ qla2x00_async_event(scsi_qla_host_t vha, struct rsp_que rsp, uint16_t *mb)
		"ISP System Error - mbx1=%xh mbx2=%xh mbx3=%xh.\n",
		mb[1], mb[2], mb[3]);

		qla2x00_post_hwe_work(vha, mb[0], mb[1], mb[2], mb[3]);
		ha->isp_ops->fw_dump(vha, 1);

		if (IS_FWI2_CAPABLE(ha)) {
		@@ -387,7 +386,6 @@ qla2x00_async_event(scsi_qla_host_t vha, struct rsp_que rsp, uint16_t *mb)
		vha->host_no));
		qla_printk(KERN_WARNING, ha, "ISP Request Transfer Error.\n");

		qla2x00_post_hwe_work(vha, mb[0], mb[1], mb[2], mb[3]);
		set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
		break;

		@@ -396,7 +394,6 @@ qla2x00_async_event(scsi_qla_host_t vha, struct rsp_que rsp, uint16_t *mb)
		vha->host_no));
		qla_printk(KERN_WARNING, ha, "ISP Response Transfer Error.\n");

		qla2x00_post_hwe_work(vha, mb[0], mb[1], mb[2], mb[3]);
		set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
		break;

		@@ -1590,12 +1587,6 @@ qla24xx_intr_handler(int irq, void *dev_id)
		if (pci_channel_offline(ha->pdev))
		break;

		if (ha->hw_event_pause_errors == 0)
		qla2x00_post_hwe_work(vha, HW_EVENT_PARITY_ERR,
		0, MSW(stat), LSW(stat));
		else if (ha->hw_event_pause_errors < 0xffffffff)
		ha->hw_event_pause_errors++;

		hccr = RD_REG_DWORD(&reg->hccr);

		qla_printk(KERN_INFO, ha, "RISC paused -- HCCR=%x, "
		@@ -1740,12 +1731,6 @@ qla24xx_msix_default(int irq, void *dev_id)
		if (pci_channel_offline(ha->pdev))
		break;

		if (ha->hw_event_pause_errors == 0)
		qla2x00_post_hwe_work(vha, HW_EVENT_PARITY_ERR,
		0, MSW(stat), LSW(stat));
		else if (ha->hw_event_pause_errors < 0xffffffff)
		ha->hw_event_pause_errors++;

		hccr = RD_REG_DWORD(&reg->hccr);

		qla_printk(KERN_INFO, ha, "RISC paused -- HCCR=%x, "

drivers/scsi/qla2xxx/qla_mbx.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -568,7 +568,6 @@ int
		qla2x00_mbx_reg_test(scsi_qla_host_t *vha)
		{
		int rval;
		struct qla_hw_data *ha = vha->hw;
		mbx_cmd_t mc;
		mbx_cmd_t *mcp = &mc;

		@@ -595,14 +594,6 @@ qla2x00_mbx_reg_test(scsi_qla_host_t *vha)
		if (mcp->mb[5] != 0xA5A5 \|\| mcp->mb[6] != 0x5A5A \|\|
		mcp->mb[7] != 0x2525)
		rval = QLA_FUNCTION_FAILED;
		if (rval == QLA_FUNCTION_FAILED) {
		struct device_reg_24xx __iomem *reg =
		&ha->iobase->isp24;

		qla2xxx_hw_event_log(vha, HW_EVENT_ISP_ERR, 0,
		LSW(RD_REG_DWORD(&reg->hccr)),
		LSW(RD_REG_DWORD(&reg->istatus)));
		}
		}

		if (rval != QLA_SUCCESS) {