Commit a28d9e4e authored by Joe Carnuccio's avatar Joe Carnuccio Committed by Martin K. Petersen

scsi: qla2xxx: Add support for multiple fwdump templates/segments

This patch adds multipe firmware dump template and segments support for
ISP27XX/28XX.
Signed-off-by: default avatarJoe Carnuccio <joe.carnuccio@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f8f97b0c
...@@ -84,8 +84,7 @@ qla24xx_fcp_prio_cfg_valid(scsi_qla_host_t *vha, ...@@ -84,8 +84,7 @@ qla24xx_fcp_prio_cfg_valid(scsi_qla_host_t *vha,
return 0; return 0;
} }
if (bcode[0] != 'H' || bcode[1] != 'Q' || bcode[2] != 'O' || if (memcmp(bcode, "HQOS", 4)) {
bcode[3] != 'S') {
/* Invalid FCP priority data header*/ /* Invalid FCP priority data header*/
ql_dbg(ql_dbg_user, vha, 0x7052, ql_dbg(ql_dbg_user, vha, 0x7052,
"Invalid FCP Priority data header. bcode=0x%x.\n", "Invalid FCP Priority data header. bcode=0x%x.\n",
......
...@@ -4030,9 +4030,11 @@ struct qla_hw_data { ...@@ -4030,9 +4030,11 @@ struct qla_hw_data {
uint8_t pep_version[3]; uint8_t pep_version[3];
/* Firmware dump template */ /* Firmware dump template */
void *fw_dump_template; struct fwdt {
uint32_t fw_dump_template_len; void *template;
/* Firmware dump information. */ ulong length;
ulong dump_size;
} fwdt[2];
struct qla2xxx_fw_dump *fw_dump; struct qla2xxx_fw_dump *fw_dump;
uint32_t fw_dump_len; uint32_t fw_dump_len;
bool fw_dumped; bool fw_dumped;
...@@ -4075,7 +4077,6 @@ struct qla_hw_data { ...@@ -4075,7 +4077,6 @@ struct qla_hw_data {
uint16_t product_id[4]; uint16_t product_id[4];
uint8_t model_number[16+1]; uint8_t model_number[16+1];
#define BINZERO "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
char model_desc[80]; char model_desc[80];
uint8_t adapter_id[16+1]; uint8_t adapter_id[16+1];
......
...@@ -611,7 +611,7 @@ extern void qla82xx_fw_dump(scsi_qla_host_t *, int); ...@@ -611,7 +611,7 @@ extern void qla82xx_fw_dump(scsi_qla_host_t *, int);
extern void qla8044_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); extern void qla27xx_fwdump(scsi_qla_host_t *, int);
extern ulong qla27xx_fwdt_calculate_dump_size(struct scsi_qla_host *); extern ulong qla27xx_fwdt_calculate_dump_size(struct scsi_qla_host *, void *);
extern int qla27xx_fwdt_template_valid(void *); extern int qla27xx_fwdt_template_valid(void *);
extern ulong qla27xx_fwdt_template_size(void *); extern ulong qla27xx_fwdt_template_size(void *);
......
This diff is collapsed.
...@@ -4647,6 +4647,9 @@ qla2x00_free_exchoffld_buffer(struct qla_hw_data *ha) ...@@ -4647,6 +4647,9 @@ qla2x00_free_exchoffld_buffer(struct qla_hw_data *ha)
static void static void
qla2x00_free_fw_dump(struct qla_hw_data *ha) qla2x00_free_fw_dump(struct qla_hw_data *ha)
{ {
struct fwdt *fwdt = ha->fwdt;
uint j;
if (ha->fce) if (ha->fce)
dma_free_coherent(&ha->pdev->dev, dma_free_coherent(&ha->pdev->dev,
FCE_SIZE, ha->fce, ha->fce_dma); FCE_SIZE, ha->fce, ha->fce_dma);
...@@ -4657,8 +4660,6 @@ qla2x00_free_fw_dump(struct qla_hw_data *ha) ...@@ -4657,8 +4660,6 @@ qla2x00_free_fw_dump(struct qla_hw_data *ha)
if (ha->fw_dump) if (ha->fw_dump)
vfree(ha->fw_dump); vfree(ha->fw_dump);
if (ha->fw_dump_template)
vfree(ha->fw_dump_template);
ha->fce = NULL; ha->fce = NULL;
ha->fce_dma = 0; ha->fce_dma = 0;
...@@ -4669,8 +4670,13 @@ qla2x00_free_fw_dump(struct qla_hw_data *ha) ...@@ -4669,8 +4670,13 @@ qla2x00_free_fw_dump(struct qla_hw_data *ha)
ha->fw_dump_reading = 0; ha->fw_dump_reading = 0;
ha->fw_dump = NULL; ha->fw_dump = NULL;
ha->fw_dump_len = 0; ha->fw_dump_len = 0;
ha->fw_dump_template = NULL;
ha->fw_dump_template_len = 0; for (j = 0; j < 2; j++, fwdt++) {
if (fwdt->template)
vfree(fwdt->template);
fwdt->template = NULL;
fwdt->length = 0;
}
} }
/* /*
......
...@@ -2633,6 +2633,8 @@ qla25xx_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf, ...@@ -2633,6 +2633,8 @@ qla25xx_read_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,
goto slow_read; goto slow_read;
try_fast: try_fast:
if (offset & 0xff)
goto slow_read;
optrom = dma_alloc_coherent(&ha->pdev->dev, OPTROM_BURST_SIZE, optrom = dma_alloc_coherent(&ha->pdev->dev, OPTROM_BURST_SIZE,
&optrom_dma, GFP_KERNEL); &optrom_dma, GFP_KERNEL);
if (!optrom) { if (!optrom) {
......
...@@ -38,7 +38,6 @@ qla27xx_insert32(uint32_t value, void *buf, ulong *len) ...@@ -38,7 +38,6 @@ qla27xx_insert32(uint32_t value, void *buf, ulong *len)
static inline void static inline void
qla27xx_insertbuf(void *mem, ulong size, void *buf, ulong *len) qla27xx_insertbuf(void *mem, ulong size, void *buf, ulong *len)
{ {
if (buf && mem && size) { if (buf && mem && size) {
buf += *len; buf += *len;
memcpy(buf, mem, size); memcpy(buf, mem, size);
...@@ -855,23 +854,11 @@ qla27xx_walk_template(struct scsi_qla_host *vha, ...@@ -855,23 +854,11 @@ qla27xx_walk_template(struct scsi_qla_host *vha,
if (count) if (count)
ql_dbg(ql_dbg_misc, vha, 0xd018, ql_dbg(ql_dbg_misc, vha, 0xd018,
"%s: entry residual count (%lx)\n", __func__, count); "%s: entry count residual=+%lu\n", __func__, count);
if (ent) if (ent)
ql_dbg(ql_dbg_misc, vha, 0xd019, ql_dbg(ql_dbg_misc, vha, 0xd019,
"%s: missing end entry (%lx)\n", __func__, count); "%s: missing end entry\n", __func__);
if (buf && *len != vha->hw->fw_dump_len)
ql_dbg(ql_dbg_misc, vha, 0xd01b,
"%s: length=%#lx residual=%+ld\n",
__func__, *len, vha->hw->fw_dump_len - *len);
if (buf) {
ql_log(ql_log_warn, vha, 0xd015,
"Firmware dump saved to temp buffer (%lu/%p)\n",
vha->host_no, vha->hw->fw_dump);
qla2x00_post_uevent_work(vha, QLA_UEVENT_CODE_FW_DUMP);
}
} }
static void static void
...@@ -894,8 +881,8 @@ qla27xx_driver_info(struct qla27xx_fwdt_template *tmp) ...@@ -894,8 +881,8 @@ qla27xx_driver_info(struct qla27xx_fwdt_template *tmp)
} }
static void static void
qla27xx_firmware_info(struct qla27xx_fwdt_template *tmp, qla27xx_firmware_info(struct scsi_qla_host *vha,
struct scsi_qla_host *vha) struct qla27xx_fwdt_template *tmp)
{ {
tmp->firmware_version[0] = vha->hw->fw_major_version; tmp->firmware_version[0] = vha->hw->fw_major_version;
tmp->firmware_version[1] = vha->hw->fw_minor_version; tmp->firmware_version[1] = vha->hw->fw_minor_version;
...@@ -912,7 +899,7 @@ ql27xx_edit_template(struct scsi_qla_host *vha, ...@@ -912,7 +899,7 @@ ql27xx_edit_template(struct scsi_qla_host *vha,
{ {
qla27xx_time_stamp(tmp); qla27xx_time_stamp(tmp);
qla27xx_driver_info(tmp); qla27xx_driver_info(tmp);
qla27xx_firmware_info(tmp, vha); qla27xx_firmware_info(vha, tmp);
} }
static inline uint32_t static inline uint32_t
...@@ -943,26 +930,26 @@ qla27xx_verify_template_header(struct qla27xx_fwdt_template *tmp) ...@@ -943,26 +930,26 @@ qla27xx_verify_template_header(struct qla27xx_fwdt_template *tmp)
return le32_to_cpu(tmp->template_type) == TEMPLATE_TYPE_FWDUMP; return le32_to_cpu(tmp->template_type) == TEMPLATE_TYPE_FWDUMP;
} }
static void static ulong
qla27xx_execute_fwdt_template(struct scsi_qla_host *vha) qla27xx_execute_fwdt_template(struct scsi_qla_host *vha,
struct qla27xx_fwdt_template *tmp, void *buf)
{ {
struct qla27xx_fwdt_template *tmp = vha->hw->fw_dump_template; ulong len = 0;
ulong len;
if (qla27xx_fwdt_template_valid(tmp)) { if (qla27xx_fwdt_template_valid(tmp)) {
len = tmp->template_size; len = tmp->template_size;
tmp = memcpy(vha->hw->fw_dump, tmp, len); tmp = memcpy(buf, tmp, len);
ql27xx_edit_template(vha, tmp); ql27xx_edit_template(vha, tmp);
qla27xx_walk_template(vha, tmp, tmp, &len); qla27xx_walk_template(vha, tmp, buf, &len);
vha->hw->fw_dump_len = len;
vha->hw->fw_dumped = 1;
} }
return len;
} }
ulong ulong
qla27xx_fwdt_calculate_dump_size(struct scsi_qla_host *vha) qla27xx_fwdt_calculate_dump_size(struct scsi_qla_host *vha, void *p)
{ {
struct qla27xx_fwdt_template *tmp = vha->hw->fw_dump_template; struct qla27xx_fwdt_template *tmp = p;
ulong len = 0; ulong len = 0;
if (qla27xx_fwdt_template_valid(tmp)) { if (qla27xx_fwdt_template_valid(tmp)) {
...@@ -1012,17 +999,41 @@ qla27xx_fwdump(scsi_qla_host_t *vha, int hardware_locked) ...@@ -1012,17 +999,41 @@ qla27xx_fwdump(scsi_qla_host_t *vha, int hardware_locked)
spin_lock_irqsave(&vha->hw->hardware_lock, flags); spin_lock_irqsave(&vha->hw->hardware_lock, flags);
#endif #endif
if (!vha->hw->fw_dump) if (!vha->hw->fw_dump) {
ql_log(ql_log_warn, vha, 0xd01e, "fwdump buffer missing.\n"); ql_log(ql_log_warn, vha, 0xd01e, "-> fwdump no buffer\n");
else if (!vha->hw->fw_dump_template) } else if (vha->hw->fw_dumped) {
ql_log(ql_log_warn, vha, 0xd01f, "fwdump template missing.\n"); ql_log(ql_log_warn, vha, 0xd01f,
else if (vha->hw->fw_dumped) "-> Firmware already dumped (%p) -- ignoring request\n",
ql_log(ql_log_warn, vha, 0xd300, vha->hw->fw_dump);
"Firmware has been previously dumped (%p)," } else {
" -- ignoring request\n", vha->hw->fw_dump); struct fwdt *fwdt = vha->hw->fwdt;
else { uint j;
QLA_FW_STOPPED(vha->hw); ulong len;
qla27xx_execute_fwdt_template(vha); void *buf = vha->hw->fw_dump;
for (j = 0; j < 2; j++, fwdt++, buf += len) {
ql_log(ql_log_warn, vha, 0xd011,
"-> fwdt%u running...\n", j);
if (!fwdt->template) {
ql_log(ql_log_warn, vha, 0xd012,
"-> fwdt%u no template\n", j);
break;
}
len = qla27xx_execute_fwdt_template(vha,
fwdt->template, buf);
if (len != fwdt->dump_size) {
ql_log(ql_log_warn, vha, 0xd013,
"-> fwdt%u fwdump residual=%+ld\n",
j, fwdt->dump_size - len);
}
}
vha->hw->fw_dump_len = buf - (void *)vha->hw->fw_dump;
vha->hw->fw_dumped = 1;
ql_log(ql_log_warn, vha, 0xd015,
"-> Firmware dump saved to buffer (%lu/%p) <%lx>\n",
vha->host_no, vha->hw->fw_dump, vha->hw->fw_dump_cap_flags);
qla2x00_post_uevent_work(vha, QLA_UEVENT_CODE_FW_DUMP);
} }
#ifndef __CHECKER__ #ifndef __CHECKER__
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment