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

Commit 64f61d99 authored Feb 15, 2019 by Joe Carnuccio Committed by Martin K. Petersen Feb 19, 2019

scsi: qla2xxx: Add new FW dump template entry types



This patch adds new firmware dump template entries for ISP27XX firmware
dump.

Signed-off-by: Joe Carnuccio <joe.carnuccio@cavium.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 5241f7ca

drivers/scsi/qla2xxx/qla_tmpl.c

+118 −73

Original line number	Diff line number	Diff line
		@@ -221,7 +221,13 @@ qla27xx_skip_entry(struct qla27xx_fwdt_entry ent, void buf)
		ent->hdr.driver_flags \|= DRIVER_FLAG_SKIP_ENTRY;
		}

		static int
		static inline struct qla27xx_fwdt_entry *
		qla27xx_next_entry(struct qla27xx_fwdt_entry *ent)
		{
		return (void *)ent + ent->hdr.size;
		}

		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t0(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -229,10 +235,10 @@ qla27xx_fwdt_entry_t0(struct scsi_qla_host *vha,
		"%s: nop [%lx]\n", __func__, *len);
		qla27xx_skip_entry(ent, buf);

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t255(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -241,10 +247,10 @@ qla27xx_fwdt_entry_t255(struct scsi_qla_host *vha,
		qla27xx_skip_entry(ent, buf);

		/* terminate */
		return true;
		return NULL;
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t256(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -255,10 +261,10 @@ qla27xx_fwdt_entry_t256(struct scsi_qla_host *vha,
		qla27xx_read_window(reg, ent->t256.base_addr, ent->t256.pci_offset,
		ent->t256.reg_count, ent->t256.reg_width, buf, len);

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t257(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -269,10 +275,10 @@ qla27xx_fwdt_entry_t257(struct scsi_qla_host *vha,
		qla27xx_write_reg(reg, IOBASE_ADDR, ent->t257.base_addr, buf);
		qla27xx_write_reg(reg, ent->t257.pci_offset, ent->t257.write_data, buf);

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t258(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -284,10 +290,10 @@ qla27xx_fwdt_entry_t258(struct scsi_qla_host *vha,
		qla27xx_read_window(reg, ent->t258.base_addr, ent->t258.pci_offset,
		ent->t258.reg_count, ent->t258.reg_width, buf, len);

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t259(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -299,10 +305,10 @@ qla27xx_fwdt_entry_t259(struct scsi_qla_host *vha,
		qla27xx_write_reg(reg, ent->t259.banksel_offset, ent->t259.bank, buf);
		qla27xx_write_reg(reg, ent->t259.pci_offset, ent->t259.write_data, buf);

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t260(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -313,10 +319,10 @@ qla27xx_fwdt_entry_t260(struct scsi_qla_host *vha,
		qla27xx_insert32(ent->t260.pci_offset, buf, len);
		qla27xx_read_reg(reg, ent->t260.pci_offset, buf, len);

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t261(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -326,10 +332,10 @@ qla27xx_fwdt_entry_t261(struct scsi_qla_host *vha,
		"%s: wrpci [%lx]\n", __func__, *len);
		qla27xx_write_reg(reg, ent->t261.pci_offset, ent->t261.write_data, buf);

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t262(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -362,6 +368,11 @@ 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_MISC) {
		if (buf) {
		ent->t262.start_addr = start;
		ent->t262.end_addr = end;
		}
		} else {
		ql_dbg(ql_dbg_misc, vha, 0xd022,
		"%s: unknown area %x\n", __func__, ent->t262.ram_area);
		@@ -384,10 +395,10 @@ qla27xx_fwdt_entry_t262(struct scsi_qla_host *vha,
		}
		len += dwords sizeof(uint32_t);
		done:
		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t263(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -450,10 +461,10 @@ qla27xx_fwdt_entry_t263(struct scsi_qla_host *vha,
		qla27xx_skip_entry(ent, buf);
		}

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t264(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -478,10 +489,10 @@ qla27xx_fwdt_entry_t264(struct scsi_qla_host *vha,
		qla27xx_skip_entry(ent, buf);
		}

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t265(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -492,10 +503,10 @@ qla27xx_fwdt_entry_t265(struct scsi_qla_host *vha,
		if (buf)
		qla24xx_pause_risc(reg, vha->hw);

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t266(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -504,10 +515,10 @@ qla27xx_fwdt_entry_t266(struct scsi_qla_host *vha,
		if (buf)
		qla24xx_soft_reset(vha->hw);

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t267(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -517,10 +528,10 @@ qla27xx_fwdt_entry_t267(struct scsi_qla_host *vha,
		"%s: dis intr [%lx]\n", __func__, *len);
		qla27xx_write_reg(reg, ent->t267.pci_offset, ent->t267.data, buf);

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t268(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -587,10 +598,10 @@ qla27xx_fwdt_entry_t268(struct scsi_qla_host *vha,
		break;
		}

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t269(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -604,10 +615,10 @@ qla27xx_fwdt_entry_t269(struct scsi_qla_host *vha,
		if (buf)
		ent->t269.scratch_size = 5 * sizeof(uint32_t);

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t270(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -625,10 +636,10 @@ qla27xx_fwdt_entry_t270(struct scsi_qla_host *vha,
		addr += sizeof(uint32_t);
		}

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t271(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -642,10 +653,10 @@ qla27xx_fwdt_entry_t271(struct scsi_qla_host *vha,
		qla27xx_write_reg(reg, 0xc4, data, buf);
		qla27xx_write_reg(reg, 0xc0, addr, buf);

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t272(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -662,10 +673,10 @@ qla27xx_fwdt_entry_t272(struct scsi_qla_host *vha,
		}
		len += dwords sizeof(uint32_t);

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t273(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -685,10 +696,10 @@ qla27xx_fwdt_entry_t273(struct scsi_qla_host *vha,
		addr += sizeof(uint32_t);
		}

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t274(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -746,10 +757,10 @@ qla27xx_fwdt_entry_t274(struct scsi_qla_host *vha,
		qla27xx_skip_entry(ent, buf);
		}

		return false;
		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t275(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		@@ -763,7 +774,7 @@ qla27xx_fwdt_entry_t275(struct scsi_qla_host *vha,
		qla27xx_skip_entry(ent, buf);
		goto done;
		}
		if (offset + ent->t275.length > ent->hdr.entry_size) {
		if (offset + ent->t275.length > ent->hdr.size) {
		ql_dbg(ql_dbg_misc, vha, 0xd030,
		"%s: buffer overflow\n", __func__);
		qla27xx_skip_entry(ent, buf);
		@@ -772,30 +783,71 @@ qla27xx_fwdt_entry_t275(struct scsi_qla_host *vha,

		qla27xx_insertbuf(ent->t275.buffer, ent->t275.length, buf, len);
		done:
		return false;
		return qla27xx_next_entry(ent);
		}

		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t276(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		uint type = vha->hw->pdev->device >> 4 & 0xf;
		uint func = vha->hw->port_no & 0x3;

		ql_dbg(ql_dbg_misc + ql_dbg_verbose, vha, 0xd214,
		"%s: cond [%lx]\n", __func__, *len);

		if (type != ent->t276.cond1 \|\| func != ent->t276.cond2) {
		ent = qla27xx_next_entry(ent);
		qla27xx_skip_entry(ent, buf);
		}

		return qla27xx_next_entry(ent);
		}

		static int
		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t277(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);

		ql_dbg(ql_dbg_misc + ql_dbg_verbose, vha, 0xd215,
		"%s: rdpep [%lx]\n", __func__, *len);
		qla27xx_insert32(ent->t277.wr_cmd_data, buf, len);
		qla27xx_write_reg(reg, ent->t277.cmd_addr, ent->t277.wr_cmd_data, buf);
		qla27xx_read_reg(reg, ent->t277.data_addr, buf, len);

		return qla27xx_next_entry(ent);
		}

		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_t278(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		struct device_reg_24xx __iomem *reg = qla27xx_isp_reg(vha);

		ql_dbg(ql_dbg_misc + ql_dbg_verbose, vha, 0xd216,
		"%s: wrpep [%lx]\n", __func__, *len);
		qla27xx_write_reg(reg, ent->t278.data_addr, ent->t278.wr_data, buf);
		qla27xx_write_reg(reg, ent->t278.cmd_addr, ent->t278.wr_cmd_data, buf);

		return qla27xx_next_entry(ent);
		}

		static struct qla27xx_fwdt_entry *
		qla27xx_fwdt_entry_other(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_entry ent, void buf, ulong *len)
		{
		ql_dbg(ql_dbg_misc, vha, 0xd2ff,
		"%s: type %x [%lx]\n", __func__, ent->hdr.entry_type, *len);
		"%s: type %x [%lx]\n", __func__, ent->hdr.type, *len);
		qla27xx_skip_entry(ent, buf);

		return false;
		return qla27xx_next_entry(ent);
		}

		struct qla27xx_fwdt_entry_call {
		static struct {
		uint type;
		int (*call)(
		struct scsi_qla_host *,
		struct qla27xx_fwdt_entry *,
		void *,
		ulong *);
		};

		static struct qla27xx_fwdt_entry_call ql27xx_fwdt_entry_call_list[] = {
		typeof(qla27xx_fwdt_entry_other)(*call);
		} qla27xx_fwdt_entry_call[] = {
		{ ENTRY_TYPE_NOP, qla27xx_fwdt_entry_t0 },
		{ ENTRY_TYPE_TMP_END, qla27xx_fwdt_entry_t255 },
		{ ENTRY_TYPE_RD_IOB_T1, qla27xx_fwdt_entry_t256 },
		@@ -818,13 +870,16 @@ static struct qla27xx_fwdt_entry_call ql27xx_fwdt_entry_call_list[] = {
		{ ENTRY_TYPE_PCICFG, qla27xx_fwdt_entry_t273 },
		{ ENTRY_TYPE_GET_SHADOW, qla27xx_fwdt_entry_t274 },
		{ ENTRY_TYPE_WRITE_BUF, qla27xx_fwdt_entry_t275 },
		{ ENTRY_TYPE_CONDITIONAL, qla27xx_fwdt_entry_t276 },
		{ ENTRY_TYPE_RDPEPREG, qla27xx_fwdt_entry_t277 },
		{ ENTRY_TYPE_WRPEPREG, qla27xx_fwdt_entry_t278 },
		{ -1, qla27xx_fwdt_entry_other }
		};

		static inline int (*qla27xx_find_entry(uint type))
		(struct scsi_qla_host , struct qla27xx_fwdt_entry , void , ulong )
		static inline
		typeof(qla27xx_fwdt_entry_call->call)(qla27xx_find_entry(uint type))
		{
		struct qla27xx_fwdt_entry_call *list = ql27xx_fwdt_entry_call_list;
		typeof(qla27xx_fwdt_entry_call) list = qla27xx_fwdt_entry_call;

		while (list->type < type)
		list++;
		@@ -834,14 +889,6 @@ static inline int (*qla27xx_find_entry(uint type))
		return qla27xx_fwdt_entry_other;
		}

		static inline void *
		qla27xx_next_entry(void *p)
		{
		struct qla27xx_fwdt_entry *ent = p;

		return p + ent->hdr.entry_size;
		}

		static void
		qla27xx_walk_template(struct scsi_qla_host *vha,
		struct qla27xx_fwdt_template tmp, void buf, ulong *len)
		@@ -852,18 +899,16 @@ qla27xx_walk_template(struct scsi_qla_host *vha,
		ql_dbg(ql_dbg_misc, vha, 0xd01a,
		"%s: entry count %lx\n", __func__, count);
		while (count--) {
		if (buf && *len >= vha->hw->fw_dump_len)
		break;
		if (qla27xx_find_entry(ent->hdr.entry_type)(vha, ent, buf, len))
		ent = qla27xx_find_entry(ent->hdr.type)(vha, ent, buf, len);
		if (!ent)
		break;
		ent = qla27xx_next_entry(ent);
		}

		if (count)
		ql_dbg(ql_dbg_misc, vha, 0xd018,
		"%s: entry residual count (%lx)\n", __func__, count);

		if (ent->hdr.entry_type != ENTRY_TYPE_TMP_END)
		if (ent)
		ql_dbg(ql_dbg_misc, vha, 0xd019,
		"%s: missing end entry (%lx)\n", __func__, count);

drivers/scsi/qla2xxx/qla_tmpl.h

+24 −2

Original line number	Diff line number	Diff line
		@@ -54,6 +54,9 @@ struct __packed qla27xx_fwdt_template {
		#define ENTRY_TYPE_PCICFG 273
		#define ENTRY_TYPE_GET_SHADOW 274
		#define ENTRY_TYPE_WRITE_BUF 275
		#define ENTRY_TYPE_CONDITIONAL 276
		#define ENTRY_TYPE_RDPEPREG 277
		#define ENTRY_TYPE_WRPEPREG 278

		#define CAPTURE_FLAG_PHYS_ONLY BIT_0
		#define CAPTURE_FLAG_PHYS_VIRT BIT_1
		@@ -62,8 +65,8 @@ struct __packed qla27xx_fwdt_template {

		struct __packed qla27xx_fwdt_entry {
		struct __packed {
		uint32_t entry_type;
		uint32_t entry_size;
		uint32_t type;
		uint32_t size;
		uint32_t reserved_1;

		uint8_t capture_flags;
		@@ -199,6 +202,24 @@ struct __packed qla27xx_fwdt_entry {
		uint32_t length;
		uint8_t buffer[];
		} t275;

		struct __packed {
		uint32_t cond1;
		uint32_t cond2;
		} t276;

		struct __packed {
		uint32_t cmd_addr;
		uint32_t wr_cmd_data;
		uint32_t data_addr;
		} t277;

		struct __packed {
		uint32_t cmd_addr;
		uint32_t wr_cmd_data;
		uint32_t data_addr;
		uint32_t wr_data;
		} t278;
		};
		};

		@@ -206,6 +227,7 @@ struct __packed qla27xx_fwdt_entry {
		#define T262_RAM_AREA_EXTERNAL_RAM 2
		#define T262_RAM_AREA_SHARED_RAM 3
		#define T262_RAM_AREA_DDR_RAM 4
		#define T262_RAM_AREA_MISC 5

		#define T263_QUEUE_TYPE_REQ 1
		#define T263_QUEUE_TYPE_RSP 2