Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 02:05:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[SCSI] qla2xxx: Collapse EFT/FCE copy procedures during a firmware dump.

Browse Source 
In preparation for new ISP types with varying dump procedures.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Andrew Vasquez 2009-01-05 11:18:08 -08:00 committed by James Bottomley
parent 3fd67cdf9e
commit bb99de6703
3 changed files with 53 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
drivers/scsi/qla2xxx/qla_dbg.c
View File

@ -310,6 +310,43 @@ qla2xxx_read_window(struct device_reg_2xxx __iomem *reg, uint32_t count,
*buf++ = htons(RD_REG_WORD(dmp_reg++)); *buf++ = htons(RD_REG_WORD(dmp_reg++));
} }
static inline void *
qla24xx_copy_eft(struct qla_hw_data *ha, void *ptr)
{
if (!ha->eft)
return ptr;
memcpy(ptr, ha->eft, ntohl(ha->fw_dump->eft_size));
return ptr + ntohl(ha->fw_dump->eft_size);
}
static inline void *
qla25xx_copy_fce(struct qla_hw_data *ha, void *ptr, uint32_t **last_chain)
{
uint32_t cnt;
uint32_t *iter_reg;
struct qla2xxx_fce_chain *fcec = ptr;
if (!ha->fce)
return ptr;
*last_chain = &fcec->type;
fcec->type = __constant_htonl(DUMP_CHAIN_FCE);
fcec->chain_size = htonl(sizeof(struct qla2xxx_fce_chain) +
fce_calc_size(ha->fce_bufs));
fcec->size = htonl(fce_calc_size(ha->fce_bufs));
fcec->addr_l = htonl(LSD(ha->fce_dma));
fcec->addr_h = htonl(MSD(ha->fce_dma));
iter_reg = fcec->eregs;
for (cnt = 0; cnt < 8; cnt++)
*iter_reg++ = htonl(ha->fce_mb[cnt]);
memcpy(iter_reg, ha->fce, ntohl(fcec->size));
return iter_reg;
}
/** /**
* qla2300_fw_dump() - Dumps binary data from the 2300 firmware. * qla2300_fw_dump() - Dumps binary data from the 2300 firmware.
* @ha: HA context * @ha: HA context
@ -913,8 +950,8 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
goto qla24xx_fw_dump_failed_0; goto qla24xx_fw_dump_failed_0;
nxt = qla2xxx_copy_queues(ha, nxt); nxt = qla2xxx_copy_queues(ha, nxt);
if (ha->eft)
memcpy(nxt, ha->eft, ntohl(ha->fw_dump->eft_size)); qla24xx_copy_eft(ha, nxt);
qla24xx_fw_dump_failed_0: qla24xx_fw_dump_failed_0:
if (rval != QLA_SUCCESS) { if (rval != QLA_SUCCESS) {
@ -950,7 +987,7 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
struct qla25xx_fw_dump *fw; struct qla25xx_fw_dump *fw;
uint32_t ext_mem_cnt; uint32_t ext_mem_cnt;
void *nxt; void *nxt;
struct qla2xxx_fce_chain *fcec; uint32_t *last_chain = NULL;
struct qla2xxx_mq_chain *mq = NULL; struct qla2xxx_mq_chain *mq = NULL;
uint32_t qreg_size; uint32_t qreg_size;
uint8_t req_cnt, rsp_cnt, que_cnt; uint8_t req_cnt, rsp_cnt, que_cnt;
@ -1012,6 +1049,7 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
que_cnt = req_cnt > rsp_cnt ? req_cnt : rsp_cnt; que_cnt = req_cnt > rsp_cnt ? req_cnt : rsp_cnt;
mq->count = htonl(que_cnt); mq->count = htonl(que_cnt);
mq->chain_size = htonl(qreg_size); mq->chain_size = htonl(qreg_size);
last_chain = &mq->type;
mq->type = __constant_htonl(DUMP_CHAIN_MQ); mq->type = __constant_htonl(DUMP_CHAIN_MQ);
for (cnt = 0; cnt < que_cnt; cnt++) { for (cnt = 0; cnt < que_cnt; cnt++) {
reg25 = (struct device_reg_25xxmq *) ((void *) reg25 = (struct device_reg_25xxmq *) ((void *)
@ -1249,37 +1287,22 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked)
if (rval != QLA_SUCCESS) if (rval != QLA_SUCCESS)
goto qla25xx_fw_dump_failed_0; goto qla25xx_fw_dump_failed_0;
/* Fibre Channel Trace Buffer. */
nxt = qla2xxx_copy_queues(ha, nxt); nxt = qla2xxx_copy_queues(ha, nxt);
if (ha->eft)
memcpy(nxt, ha->eft, ntohl(ha->fw_dump->eft_size));
/* Fibre Channel Event Buffer. */ nxt = qla24xx_copy_eft(ha, nxt);
if (!ha->fce)
goto qla25xx_fw_dump_failed_0;
ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);
/* Chain entries. */
if (ha->mqenable) { if (ha->mqenable) {
nxt = nxt + ntohl(ha->fw_dump->eft_size);
memcpy(nxt, mq, qreg_size); memcpy(nxt, mq, qreg_size);
kfree(mq); kfree(mq);
fcec = nxt + qreg_size; nxt += qreg_size;
} else {
fcec = nxt + ntohl(ha->fw_dump->eft_size);
} }
fcec->type = __constant_htonl(DUMP_CHAIN_FCE | DUMP_CHAIN_LAST);
fcec->chain_size = htonl(sizeof(struct qla2xxx_fce_chain) +
fce_calc_size(ha->fce_bufs));
fcec->size = htonl(fce_calc_size(ha->fce_bufs));
fcec->addr_l = htonl(LSD(ha->fce_dma));
fcec->addr_h = htonl(MSD(ha->fce_dma));
iter_reg = fcec->eregs; qla25xx_copy_fce(ha, nxt, &last_chain);
for (cnt = 0; cnt < 8; cnt++) if (last_chain) {
*iter_reg++ = htonl(ha->fce_mb[cnt]); ha->fw_dump->version |= __constant_htonl(DUMP_CHAIN_VARIANT);
*last_chain |= __constant_htonl(DUMP_CHAIN_LAST);
memcpy(iter_reg, ha->fce, ntohl(fcec->size)); }
qla25xx_fw_dump_failed_0: qla25xx_fw_dump_failed_0:
if (rval != QLA_SUCCESS) { if (rval != QLA_SUCCESS) {

1
drivers/scsi/qla2xxx/qla_def.h
View File

@ -2477,6 +2477,7 @@ struct qla_hw_data {
dma_addr_t eft_dma; dma_addr_t eft_dma;
void *eft; void *eft;
uint32_t chain_offset;
struct dentry *dfs_dir; struct dentry *dfs_dir;
struct dentry *dfs_fce; struct dentry *dfs_fce;
dma_addr_t fce_dma; dma_addr_t fce_dma;

4
drivers/scsi/qla2xxx/qla_init.c
View File

@ -850,7 +850,9 @@ cont_alloc:
dump_size = offsetof(struct qla2xxx_fw_dump, isp); dump_size = offsetof(struct qla2xxx_fw_dump, isp);
dump_size += fixed_size + mem_size + req_q_size + rsp_q_size + dump_size += fixed_size + mem_size + req_q_size + rsp_q_size +
mq_size + eft_size + fce_size; eft_size;
ha->chain_offset = dump_size;
dump_size += mq_size + fce_size;
ha->fw_dump = vmalloc(dump_size); ha->fw_dump = vmalloc(dump_size);
if (!ha->fw_dump) { if (!ha->fw_dump) {