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

Commit 349c390f authored Sep 25, 2014 by Joe Carnuccio Committed by Christoph Hellwig Sep 25, 2014

qla2xxx: ISP27xx fwdump template error print simplification.



Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

parent 40969530

drivers/scsi/qla2xxx/qla_dbg.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,9 @@
		* \| \| \| 0xb149 \|
		* \| MultiQ \| 0xc00c \| \|
		* \| Misc \| 0xd213 \| 0xd011-0xd017 \|
		* \| \| \| 0xd021,0xd024 \|
		* \| \| \| 0xd025,0xd029 \|
		* \| \| \| 0xd02a,0xd02e \|
		* \| \| \| 0xd031-0xd0ff \|
		* \| \| \| 0xd101-0xd1fe \|
		* \| \| \| 0xd214-0xd2fe \|

drivers/scsi/qla2xxx/qla_tmpl.c

+4 −27

Original line number	Diff line number	Diff line
		@@ -355,14 +355,9 @@ qla27xx_fwdt_entry_t262(struct scsi_qla_host *vha,
		ent->t262.start_addr = start;
		ent->t262.end_addr = end;
		}
		} else if (ent->t262.ram_area == T262_RAM_AREA_DDR_RAM) {
		ql_dbg(ql_dbg_misc, vha, 0xd021,
		"%s: unsupported ddr ram\n", __func__);
		qla27xx_skip_entry(ent, buf);
		goto done;
		} else {
		ql_dbg(ql_dbg_misc, vha, 0xd022,
		"%s: unknown area %u\n", __func__, ent->t262.ram_area);
		"%s: unknown area %x\n", __func__, ent->t262.ram_area);
		qla27xx_skip_entry(ent, buf);
		goto done;
		}
		@@ -377,8 +372,6 @@ qla27xx_fwdt_entry_t262(struct scsi_qla_host *vha,

		dwords = end - start + 1;
		if (buf) {
		ql_dbg(ql_dbg_misc, vha, 0xd024,
		"%s: @%lx -> (%lx dwords)\n", __func__, start, dwords);
		buf += *len;
		qla24xx_dump_ram(vha->hw, start, buf, dwords, &buf);
		}
		@@ -423,13 +416,9 @@ qla27xx_fwdt_entry_t263(struct scsi_qla_host *vha,
		count++;
		}
		}
		} else if (ent->t263.queue_type == T263_QUEUE_TYPE_ATIO) {
		ql_dbg(ql_dbg_misc, vha, 0xd025,
		"%s: unsupported atio queue\n", __func__);
		qla27xx_skip_entry(ent, buf);
		} else {
		ql_dbg(ql_dbg_misc, vha, 0xd026,
		"%s: unknown queue %u\n", __func__, ent->t263.queue_type);
		"%s: unknown queue %x\n", __func__, ent->t263.queue_type);
		qla27xx_skip_entry(ent, buf);
		}

		@@ -524,17 +513,9 @@ qla27xx_fwdt_entry_t268(struct scsi_qla_host *vha,
		"%s: missing eft\n", __func__);
		qla27xx_skip_entry(ent, buf);
		}
		} else if (ent->t268.buf_type == T268_BUF_TYPE_EXCH_BUFOFF) {
		ql_dbg(ql_dbg_misc, vha, 0xd029,
		"%s: unsupported exchange offload buffer\n", __func__);
		qla27xx_skip_entry(ent, buf);
		} else if (ent->t268.buf_type == T268_BUF_TYPE_EXTD_LOGIN) {
		ql_dbg(ql_dbg_misc, vha, 0xd02a,
		"%s: unsupported extended login buffer\n", __func__);
		qla27xx_skip_entry(ent, buf);
		} else {
		ql_dbg(ql_dbg_misc, vha, 0xd02b,
		"%s: unknown buf %x\n", __func__, ent->t268.buf_type);
		"%s: unknown buffer %x\n", __func__, ent->t268.buf_type);
		qla27xx_skip_entry(ent, buf);
		}

		@@ -670,13 +651,9 @@ qla27xx_fwdt_entry_t274(struct scsi_qla_host *vha,
		count++;
		}
		}
		} else if (ent->t274.queue_type == T274_QUEUE_TYPE_ATIO_SHAD) {
		ql_dbg(ql_dbg_misc, vha, 0xd02e,
		"%s: unsupported atio queue\n", __func__);
		qla27xx_skip_entry(ent, buf);
		} else {
		ql_dbg(ql_dbg_misc, vha, 0xd02f,
		"%s: unknown queue %u\n", __func__, ent->t274.queue_type);
		"%s: unknown queue %x\n", __func__, ent->t274.queue_type);
		qla27xx_skip_entry(ent, buf);
		}

drivers/scsi/qla2xxx/qla_tmpl.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,8 @@ struct __packed qla27xx_fwdt_entry {
		#define T268_BUF_TYPE_EXTD_TRACE 1
		#define T268_BUF_TYPE_EXCH_BUFOFF 2
		#define T268_BUF_TYPE_EXTD_LOGIN 3
		#define T268_BUF_TYPE_REQ_MIRROR 4
		#define T268_BUF_TYPE_RSP_MIRROR 5

		#define T274_QUEUE_TYPE_REQ_SHAD 1
		#define T274_QUEUE_TYPE_RSP_SHAD 2