Skip to content

L
linux
Commit bd432bb5 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files
Options

scsi: qla2xxx: Leave a blank line after declarations 

This patch improves readability of the qla2xxx source code.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Cc: Giridhar Malavali <gmalavali@marvell.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Acked-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 2703eaaf
Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 2 deletions
drivers/scsi/qla2xxx/qla_attr.c
View file @ bd432bb5
...@@ -674,6 +674,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj, ...@@ -674,6 +674,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
int type; int type;
uint32_t idc_control; uint32_t idc_control;
uint8_t *tmp_data = NULL; uint8_t *tmp_data = NULL;
if (off != 0) if (off != 0)
return -EINVAL; return -EINVAL;
...@@ -1079,6 +1080,7 @@ qla2x00_isp_name_show(struct device *dev, struct device_attribute *attr, ...@@ -1079,6 +1080,7 @@ qla2x00_isp_name_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
return scnprintf(buf, PAGE_SIZE, "ISP%04X\n", vha->hw->pdev->device); return scnprintf(buf, PAGE_SIZE, "ISP%04X\n", vha->hw->pdev->device);
} }
...@@ -1112,6 +1114,7 @@ qla2x00_model_desc_show(struct device *dev, struct device_attribute *attr, ...@@ -1112,6 +1114,7 @@ qla2x00_model_desc_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
return scnprintf(buf, PAGE_SIZE, "%s\n", vha->hw->model_desc); return scnprintf(buf, PAGE_SIZE, "%s\n", vha->hw->model_desc);
} }
...@@ -1324,6 +1327,7 @@ qla2x00_optrom_bios_version_show(struct device *dev, ...@@ -1324,6 +1327,7 @@ qla2x00_optrom_bios_version_show(struct device *dev,
{ {
scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->bios_revision[1], return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->bios_revision[1],
ha->bios_revision[0]); ha->bios_revision[0]);
} }
...@@ -1334,6 +1338,7 @@ qla2x00_optrom_efi_version_show(struct device *dev, ...@@ -1334,6 +1338,7 @@ qla2x00_optrom_efi_version_show(struct device *dev,
{ {
scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->efi_revision[1], return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->efi_revision[1],
ha->efi_revision[0]); ha->efi_revision[0]);
} }
...@@ -1344,6 +1349,7 @@ qla2x00_optrom_fcode_version_show(struct device *dev, ...@@ -1344,6 +1349,7 @@ qla2x00_optrom_fcode_version_show(struct device *dev,
{ {
scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->fcode_revision[1], return scnprintf(buf, PAGE_SIZE, "%d.%02d\n", ha->fcode_revision[1],
ha->fcode_revision[0]); ha->fcode_revision[0]);
} }
...@@ -1354,6 +1360,7 @@ qla2x00_optrom_fw_version_show(struct device *dev, ...@@ -1354,6 +1360,7 @@ qla2x00_optrom_fw_version_show(struct device *dev,
{ {
scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d %d\n", return scnprintf(buf, PAGE_SIZE, "%d.%02d.%02d %d\n",
ha->fw_revision[0], ha->fw_revision[1], ha->fw_revision[2], ha->fw_revision[0], ha->fw_revision[1], ha->fw_revision[2],
ha->fw_revision[3]); ha->fw_revision[3]);
...@@ -1380,6 +1387,7 @@ qla2x00_total_isp_aborts_show(struct device *dev, ...@@ -1380,6 +1387,7 @@ qla2x00_total_isp_aborts_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
scsi_qla_host_t *vha = shost_priv(class_to_shost(dev)); scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
return scnprintf(buf, PAGE_SIZE, "%d\n", return scnprintf(buf, PAGE_SIZE, "%d\n",
vha->qla_stats.total_isp_aborts); vha->qla_stats.total_isp_aborts);
} }
...@@ -2819,6 +2827,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable) ...@@ -2819,6 +2827,7 @@ qla24xx_vport_create(struct fc_vport *fc_vport, bool disable)
if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) { if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) {
if (ha->fw_attributes & BIT_4) { if (ha->fw_attributes & BIT_4) {
int prot = 0, guard; int prot = 0, guard;
vha->flags.difdix_supported = 1; vha->flags.difdix_supported = 1;
ql_dbg(ql_dbg_user, vha, 0x7082, ql_dbg(ql_dbg_user, vha, 0x7082,
"Registered for DIF/DIX type 1 and 3 protection.\n"); "Registered for DIF/DIX type 1 and 3 protection.\n");
......
drivers/scsi/qla2xxx/qla_bsg.c
View file @ bd432bb5
...@@ -1534,6 +1534,7 @@ qla2x00_update_fru_versions(struct bsg_job *bsg_job) ...@@ -1534,6 +1534,7 @@ qla2x00_update_fru_versions(struct bsg_job *bsg_job)
uint32_t count; uint32_t count;
dma_addr_t sfp_dma; dma_addr_t sfp_dma;
void *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma); void *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);
if (!sfp) { if (!sfp) {
bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_NO_MEMORY; EXT_STATUS_NO_MEMORY;
...@@ -1584,6 +1585,7 @@ qla2x00_read_fru_status(struct bsg_job *bsg_job) ...@@ -1584,6 +1585,7 @@ qla2x00_read_fru_status(struct bsg_job *bsg_job)
struct qla_status_reg *sr = (void *)bsg; struct qla_status_reg *sr = (void *)bsg;
dma_addr_t sfp_dma; dma_addr_t sfp_dma;
uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma); uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);
if (!sfp) { if (!sfp) {
bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_NO_MEMORY; EXT_STATUS_NO_MEMORY;
...@@ -1634,6 +1636,7 @@ qla2x00_write_fru_status(struct bsg_job *bsg_job) ...@@ -1634,6 +1636,7 @@ qla2x00_write_fru_status(struct bsg_job *bsg_job)
struct qla_status_reg *sr = (void *)bsg; struct qla_status_reg *sr = (void *)bsg;
dma_addr_t sfp_dma; dma_addr_t sfp_dma;
uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma); uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);
if (!sfp) { if (!sfp) {
bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_NO_MEMORY; EXT_STATUS_NO_MEMORY;
...@@ -1680,6 +1683,7 @@ qla2x00_write_i2c(struct bsg_job *bsg_job) ...@@ -1680,6 +1683,7 @@ qla2x00_write_i2c(struct bsg_job *bsg_job)
struct qla_i2c_access *i2c = (void *)bsg; struct qla_i2c_access *i2c = (void *)bsg;
dma_addr_t sfp_dma; dma_addr_t sfp_dma;
uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma); uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);
if (!sfp) { if (!sfp) {
bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_NO_MEMORY; EXT_STATUS_NO_MEMORY;
...@@ -1725,6 +1729,7 @@ qla2x00_read_i2c(struct bsg_job *bsg_job) ...@@ -1725,6 +1729,7 @@ qla2x00_read_i2c(struct bsg_job *bsg_job)
struct qla_i2c_access *i2c = (void *)bsg; struct qla_i2c_access *i2c = (void *)bsg;
dma_addr_t sfp_dma; dma_addr_t sfp_dma;
uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma); uint8_t *sfp = dma_pool_alloc(ha->s_dma_pool, GFP_KERNEL, &sfp_dma);
if (!sfp) { if (!sfp) {
bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_NO_MEMORY; EXT_STATUS_NO_MEMORY;
......
drivers/scsi/qla2xxx/qla_dfs.c
View file @ bd432bb5
...@@ -41,6 +41,7 @@ static int ...@@ -41,6 +41,7 @@ static int
qla2x00_dfs_tgt_sess_open(struct inode *inode, struct file *file) qla2x00_dfs_tgt_sess_open(struct inode *inode, struct file *file)
{ {
scsi_qla_host_t *vha = inode->i_private; scsi_qla_host_t *vha = inode->i_private;
return single_open(file, qla2x00_dfs_tgt_sess_show, vha); return single_open(file, qla2x00_dfs_tgt_sess_show, vha);
} }
...@@ -161,6 +162,7 @@ static int ...@@ -161,6 +162,7 @@ static int
qla_dfs_fw_resource_cnt_open(struct inode *inode, struct file *file) qla_dfs_fw_resource_cnt_open(struct inode *inode, struct file *file)
{ {
struct scsi_qla_host *vha = inode->i_private; struct scsi_qla_host *vha = inode->i_private;
return single_open(file, qla_dfs_fw_resource_cnt_show, vha); return single_open(file, qla_dfs_fw_resource_cnt_show, vha);
} }
...@@ -250,6 +252,7 @@ static int ...@@ -250,6 +252,7 @@ static int
qla_dfs_tgt_counters_open(struct inode *inode, struct file *file) qla_dfs_tgt_counters_open(struct inode *inode, struct file *file)
{ {
struct scsi_qla_host *vha = inode->i_private; struct scsi_qla_host *vha = inode->i_private;
return single_open(file, qla_dfs_tgt_counters_show, vha); return single_open(file, qla_dfs_tgt_counters_show, vha);
} }
......
drivers/scsi/qla2xxx/qla_gs.c
View file @ bd432bb5
...@@ -1385,6 +1385,7 @@ qla2x00_mgmt_svr_login(scsi_qla_host_t *vha) ...@@ -1385,6 +1385,7 @@ qla2x00_mgmt_svr_login(scsi_qla_host_t *vha)
int ret, rval; int ret, rval;
uint16_t mb[MAILBOX_REGISTER_COUNT]; uint16_t mb[MAILBOX_REGISTER_COUNT];
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
ret = QLA_SUCCESS; ret = QLA_SUCCESS;
if (vha->flags.management_server_logged_in) if (vha->flags.management_server_logged_in)
return ret; return ret;
...@@ -1423,6 +1424,7 @@ qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *vha, uint32_t req_size, ...@@ -1423,6 +1424,7 @@ qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *vha, uint32_t req_size,
{ {
ms_iocb_entry_t *ms_pkt; ms_iocb_entry_t *ms_pkt;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
ms_pkt = ha->ms_iocb; ms_pkt = ha->ms_iocb;
memset(ms_pkt, 0, sizeof(ms_iocb_entry_t)); memset(ms_pkt, 0, sizeof(ms_iocb_entry_t));
......
drivers/scsi/qla2xxx/qla_init.c
View file @ bd432bb5
...@@ -1482,6 +1482,7 @@ int qla24xx_post_newsess_work(struct scsi_qla_host *vha, port_id_t *id, ...@@ -1482,6 +1482,7 @@ int qla24xx_post_newsess_work(struct scsi_qla_host *vha, port_id_t *id,
u8 *port_name, u8 *node_name, void *pla, u8 fc4_type) u8 *port_name, u8 *node_name, void *pla, u8 fc4_type)
{ {
struct qla_work_evt *e; struct qla_work_evt *e;
e = qla2x00_alloc_work(vha, QLA_EVT_NEW_SESS); e = qla2x00_alloc_work(vha, QLA_EVT_NEW_SESS);
if (!e) if (!e)
return QLA_FUNCTION_FAILED; return QLA_FUNCTION_FAILED;
...@@ -1558,6 +1559,7 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea) ...@@ -1558,6 +1559,7 @@ void qla2x00_fcport_event_handler(scsi_qla_host_t *vha, struct event_arg *ea)
return; return;
{ {
unsigned long flags; unsigned long flags;
fcport = qla2x00_find_fcport_by_nportid fcport = qla2x00_find_fcport_by_nportid
(vha, &ea->id, 1); (vha, &ea->id, 1);
if (fcport) { if (fcport) {
...@@ -4844,6 +4846,7 @@ qla2x00_configure_loop(scsi_qla_host_t *vha) ...@@ -4844,6 +4846,7 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)
int rval; int rval;
unsigned long flags, save_flags; unsigned long flags, save_flags;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
rval = QLA_SUCCESS; rval = QLA_SUCCESS;
/* Get Initiator ID */ /* Get Initiator ID */
...@@ -6406,6 +6409,7 @@ qla83xx_initiating_reset(scsi_qla_host_t *vha) ...@@ -6406,6 +6409,7 @@ qla83xx_initiating_reset(scsi_qla_host_t *vha)
qla83xx_idc_audit(vha, IDC_AUDIT_TIMESTAMP); qla83xx_idc_audit(vha, IDC_AUDIT_TIMESTAMP);
} else { } else {
const char *state = qla83xx_dev_state_to_string(dev_state); const char *state = qla83xx_dev_state_to_string(dev_state);
ql_log(ql_log_info, vha, 0xb057, "HW State: %s.\n", state); ql_log(ql_log_info, vha, 0xb057, "HW State: %s.\n", state);
/* SV: XXX: Is timeout required here? */ /* SV: XXX: Is timeout required here? */
...@@ -8210,6 +8214,7 @@ void ...@@ -8210,6 +8214,7 @@ void
qla84xx_put_chip(struct scsi_qla_host *vha) qla84xx_put_chip(struct scsi_qla_host *vha)
{ {
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
if (ha->cs84xx) if (ha->cs84xx)
kref_put(&ha->cs84xx->kref, __qla84xx_chip_release); kref_put(&ha->cs84xx->kref, __qla84xx_chip_release);
} }
......
drivers/scsi/qla2xxx/qla_iocb.c
View file @ bd432bb5
...@@ -1107,6 +1107,7 @@ qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp, ...@@ -1107,6 +1107,7 @@ qla24xx_walk_and_build_prot_sglist(struct qla_hw_data *ha, srb_t *sp,
if (sp) { if (sp) {
struct scsi_cmnd *cmd = GET_CMD_SP(sp); struct scsi_cmnd *cmd = GET_CMD_SP(sp);
sgl = scsi_prot_sglist(cmd); sgl = scsi_prot_sglist(cmd);
vha = sp->vha; vha = sp->vha;
difctx = sp->u.scmd.ctx; difctx = sp->u.scmd.ctx;
...@@ -3385,6 +3386,7 @@ qla82xx_start_scsi(srb_t *sp) ...@@ -3385,6 +3386,7 @@ qla82xx_start_scsi(srb_t *sp)
cmd_pkt->entry_status = (uint8_t) rsp->id; cmd_pkt->entry_status = (uint8_t) rsp->id;
} else { } else {
struct cmd_type_7 *cmd_pkt; struct cmd_type_7 *cmd_pkt;
req_cnt = qla24xx_calc_iocbs(vha, tot_dsds); req_cnt = qla24xx_calc_iocbs(vha, tot_dsds);
if (req->cnt < (req_cnt + 2)) { if (req->cnt < (req_cnt + 2)) {
cnt = (uint16_t)RD_REG_DWORD_RELAXED( cnt = (uint16_t)RD_REG_DWORD_RELAXED(
......
drivers/scsi/qla2xxx/qla_isr.c
View file @ bd432bb5
...@@ -840,6 +840,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb) ...@@ -840,6 +840,7 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)
if (ha->flags.fawwpn_enabled && if (ha->flags.fawwpn_enabled &&
(ha->current_topology == ISP_CFG_F)) { (ha->current_topology == ISP_CFG_F)) {
void *wwpn = ha->init_cb->port_name; void *wwpn = ha->init_cb->port_name;
memcpy(vha->port_name, wwpn, WWN_SIZE); memcpy(vha->port_name, wwpn, WWN_SIZE);
fc_host_port_name(vha->host) = fc_host_port_name(vha->host) =
wwn_to_u64(vha->port_name); wwn_to_u64(vha->port_name);
...@@ -2250,6 +2251,7 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt, ...@@ -2250,6 +2251,7 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt,
struct fc_bsg_reply *bsg_reply; struct fc_bsg_reply *bsg_reply;
sts_entry_t *sts; sts_entry_t *sts;
struct sts_entry_24xx *sts24; struct sts_entry_24xx *sts24;
sts = (sts_entry_t *) pkt; sts = (sts_entry_t *) pkt;
sts24 = (struct sts_entry_24xx *) pkt; sts24 = (struct sts_entry_24xx *) pkt;
...@@ -3085,6 +3087,7 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha, ...@@ -3085,6 +3087,7 @@ void qla24xx_process_response_queue(struct scsi_qla_host *vha,
/* Adjust ring index */ /* Adjust ring index */
if (IS_P3P_TYPE(ha)) { if (IS_P3P_TYPE(ha)) {
struct device_reg_82xx __iomem *reg = &ha->iobase->isp82; struct device_reg_82xx __iomem *reg = &ha->iobase->isp82;
WRT_REG_DWORD(&reg->rsp_q_out[0], rsp->ring_index); WRT_REG_DWORD(&reg->rsp_q_out[0], rsp->ring_index);
} else { } else {
WRT_REG_DWORD(rsp->rsp_q_out, rsp->ring_index); WRT_REG_DWORD(rsp->rsp_q_out, rsp->ring_index);
......
drivers/scsi/qla2xxx/qla_mbx.c
View file @ bd432bb5
...@@ -5730,6 +5730,7 @@ qla8044_md_get_template(scsi_qla_host_t *vha) ...@@ -5730,6 +5730,7 @@ qla8044_md_get_template(scsi_qla_host_t *vha)
mbx_cmd_t *mcp = &mc; mbx_cmd_t *mcp = &mc;
int rval = QLA_FUNCTION_FAILED; int rval = QLA_FUNCTION_FAILED;
int offset = 0, size = MINIDUMP_SIZE_36K; int offset = 0, size = MINIDUMP_SIZE_36K;
ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0xb11f, ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0xb11f,
"Entered %s.\n", __func__); "Entered %s.\n", __func__);
......
drivers/scsi/qla2xxx/qla_mr.c
View file @ bd432bb5
...@@ -1323,6 +1323,7 @@ qlafx00_configure_devices(scsi_qla_host_t *vha) ...@@ -1323,6 +1323,7 @@ qlafx00_configure_devices(scsi_qla_host_t *vha)
{ {
int rval; int rval;
unsigned long flags; unsigned long flags;
rval = QLA_SUCCESS; rval = QLA_SUCCESS;
flags = vha->dpc_flags; flags = vha->dpc_flags;
...@@ -3308,6 +3309,7 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb) ...@@ -3308,6 +3309,7 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)
fx_iocb.flags = fxio->u.fxiocb.flags; fx_iocb.flags = fxio->u.fxiocb.flags;
} else { } else {
struct scatterlist *sg; struct scatterlist *sg;
bsg_job = sp->u.bsg_job; bsg_job = sp->u.bsg_job;
bsg_request = bsg_job->request; bsg_request = bsg_job->request;
piocb_rqst = (struct qla_mt_iocb_rqst_fx00 *) piocb_rqst = (struct qla_mt_iocb_rqst_fx00 *)
......
drivers/scsi/qla2xxx/qla_nvme.c
View file @ bd432bb5
...@@ -357,6 +357,7 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) ...@@ -357,6 +357,7 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp)
if (unlikely(!fd->sqid)) { if (unlikely(!fd->sqid)) {
struct nvme_fc_cmd_iu *cmd = fd->cmdaddr; struct nvme_fc_cmd_iu *cmd = fd->cmdaddr;
if (cmd->sqe.common.opcode == nvme_admin_async_event) { if (cmd->sqe.common.opcode == nvme_admin_async_event) {
nvme->u.nvme.aen_op = 1; nvme->u.nvme.aen_op = 1;
atomic_inc(&ha->nvme_active_aen_cnt); atomic_inc(&ha->nvme_active_aen_cnt);
......
drivers/scsi/qla2xxx/qla_nx.c
View file @ bd432bb5
...@@ -608,6 +608,7 @@ qla82xx_pci_set_window(struct qla_hw_data *ha, unsigned long long addr) ...@@ -608,6 +608,7 @@ qla82xx_pci_set_window(struct qla_hw_data *ha, unsigned long long addr)
} else if (addr_in_range(addr, QLA82XX_ADDR_OCM0, } else if (addr_in_range(addr, QLA82XX_ADDR_OCM0,
QLA82XX_ADDR_OCM0_MAX)) { QLA82XX_ADDR_OCM0_MAX)) {
unsigned int temp1; unsigned int temp1;
if ((addr & 0x00ff800) == 0xff800) { if ((addr & 0x00ff800) == 0xff800) {
ql_log(ql_log_warn, vha, 0xb004, ql_log(ql_log_warn, vha, 0xb004,
"%s: QM access not handled.\n", __func__); "%s: QM access not handled.\n", __func__);
...@@ -990,6 +991,7 @@ static int ...@@ -990,6 +991,7 @@ static int
qla82xx_read_status_reg(struct qla_hw_data *ha, uint32_t *val) qla82xx_read_status_reg(struct qla_hw_data *ha, uint32_t *val)
{ {
scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev); scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_INSTR_OPCODE, M25P_INSTR_RDSR); qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_INSTR_OPCODE, M25P_INSTR_RDSR);
qla82xx_wait_rom_busy(ha); qla82xx_wait_rom_busy(ha);
if (qla82xx_wait_rom_done(ha)) { if (qla82xx_wait_rom_done(ha)) {
...@@ -1030,6 +1032,7 @@ static int ...@@ -1030,6 +1032,7 @@ static int
qla82xx_flash_set_write_enable(struct qla_hw_data *ha) qla82xx_flash_set_write_enable(struct qla_hw_data *ha)
{ {
uint32_t val; uint32_t val;
qla82xx_wait_rom_busy(ha); qla82xx_wait_rom_busy(ha);
qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_ABYTE_CNT, 0); qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_ABYTE_CNT, 0);
qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_INSTR_OPCODE, M25P_INSTR_WREN); qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_INSTR_OPCODE, M25P_INSTR_WREN);
...@@ -1047,6 +1050,7 @@ static int ...@@ -1047,6 +1050,7 @@ static int
qla82xx_write_status_reg(struct qla_hw_data *ha, uint32_t val) qla82xx_write_status_reg(struct qla_hw_data *ha, uint32_t val)
{ {
scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev); scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
if (qla82xx_flash_set_write_enable(ha)) if (qla82xx_flash_set_write_enable(ha))
return -1; return -1;
qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_WDATA, val); qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_WDATA, val);
...@@ -1063,6 +1067,7 @@ static int ...@@ -1063,6 +1067,7 @@ static int
qla82xx_write_disable_flash(struct qla_hw_data *ha) qla82xx_write_disable_flash(struct qla_hw_data *ha)
{ {
scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev); scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_INSTR_OPCODE, M25P_INSTR_WRDI); qla82xx_wr_32(ha, QLA82XX_ROMUSB_ROM_INSTR_OPCODE, M25P_INSTR_WRDI);
if (qla82xx_wait_rom_done(ha)) { if (qla82xx_wait_rom_done(ha)) {
ql_log(ql_log_warn, vha, 0xb00f, ql_log(ql_log_warn, vha, 0xb00f,
...@@ -1435,6 +1440,7 @@ qla82xx_fw_load_from_flash(struct qla_hw_data *ha) ...@@ -1435,6 +1440,7 @@ qla82xx_fw_load_from_flash(struct qla_hw_data *ha)
long memaddr = BOOTLD_START; long memaddr = BOOTLD_START;
u64 data; u64 data;
u32 high, low; u32 high, low;
size = (IMAGE_START - BOOTLD_START) / 8; size = (IMAGE_START - BOOTLD_START) / 8;
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
...@@ -1761,6 +1767,7 @@ int ...@@ -1761,6 +1767,7 @@ int
qla82xx_reset_chip(scsi_qla_host_t *vha) qla82xx_reset_chip(scsi_qla_host_t *vha)
{ {
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
ha->isp_ops->disable_intrs(ha); ha->isp_ops->disable_intrs(ha);
return QLA_SUCCESS; return QLA_SUCCESS;
...@@ -1994,6 +2001,7 @@ qla82xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0) ...@@ -1994,6 +2001,7 @@ qla82xx_mbx_completion(scsi_qla_host_t *vha, uint16_t mb0)
uint16_t __iomem *wptr; uint16_t __iomem *wptr;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
struct device_reg_82xx __iomem *reg = &ha->iobase->isp82; struct device_reg_82xx __iomem *reg = &ha->iobase->isp82;
wptr = (uint16_t __iomem *)&reg->mailbox_out[1]; wptr = (uint16_t __iomem *)&reg->mailbox_out[1];
/* Load return mailbox registers. */ /* Load return mailbox registers. */
...@@ -2264,6 +2272,7 @@ void ...@@ -2264,6 +2272,7 @@ void
qla82xx_enable_intrs(struct qla_hw_data *ha) qla82xx_enable_intrs(struct qla_hw_data *ha)
{ {
scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev); scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
qla82xx_mbx_intr_enable(vha); qla82xx_mbx_intr_enable(vha);
spin_lock_irq(&ha->hardware_lock); spin_lock_irq(&ha->hardware_lock);
if (IS_QLA8044(ha)) if (IS_QLA8044(ha))
...@@ -2278,6 +2287,7 @@ void ...@@ -2278,6 +2287,7 @@ void
qla82xx_disable_intrs(struct qla_hw_data *ha) qla82xx_disable_intrs(struct qla_hw_data *ha)
{ {
scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev); scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
qla82xx_mbx_intr_disable(vha); qla82xx_mbx_intr_disable(vha);
spin_lock_irq(&ha->hardware_lock); spin_lock_irq(&ha->hardware_lock);
if (IS_QLA8044(ha)) if (IS_QLA8044(ha))
...@@ -4465,6 +4475,7 @@ qla82xx_beacon_on(struct scsi_qla_host *vha) ...@@ -4465,6 +4475,7 @@ qla82xx_beacon_on(struct scsi_qla_host *vha)
int rval; int rval;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
qla82xx_idc_lock(ha); qla82xx_idc_lock(ha);
rval = qla82xx_mbx_beacon_ctl(vha, 1); rval = qla82xx_mbx_beacon_ctl(vha, 1);
...@@ -4485,6 +4496,7 @@ qla82xx_beacon_off(struct scsi_qla_host *vha) ...@@ -4485,6 +4496,7 @@ qla82xx_beacon_off(struct scsi_qla_host *vha)
int rval; int rval;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
qla82xx_idc_lock(ha); qla82xx_idc_lock(ha);
rval = qla82xx_mbx_beacon_ctl(vha, 0); rval = qla82xx_mbx_beacon_ctl(vha, 0);
......
drivers/scsi/qla2xxx/qla_nx2.c
View file @ bd432bb5
...@@ -3007,10 +3007,9 @@ qla8044_minidump_process_rddfe(struct scsi_qla_host *vha, ...@@ -3007,10 +3007,9 @@ qla8044_minidump_process_rddfe(struct scsi_qla_host *vha,
uint16_t count; uint16_t count;
uint32_t poll, mask, modify_mask; uint32_t poll, mask, modify_mask;
uint32_t wait_count = 0; uint32_t wait_count = 0;
uint32_t *data_ptr = *d_ptr; uint32_t *data_ptr = *d_ptr;
struct qla8044_minidump_entry_rddfe *rddfe; struct qla8044_minidump_entry_rddfe *rddfe;
rddfe = (struct qla8044_minidump_entry_rddfe *) entry_hdr; rddfe = (struct qla8044_minidump_entry_rddfe *) entry_hdr;
addr1 = rddfe->addr_1; addr1 = rddfe->addr_1;
......
drivers/scsi/qla2xxx/qla_os.c
View file @ bd432bb5
...@@ -365,6 +365,7 @@ static void qla_init_base_qpair(struct scsi_qla_host *vha, struct req_que *req, ...@@ -365,6 +365,7 @@ static void qla_init_base_qpair(struct scsi_qla_host *vha, struct req_que *req,
struct rsp_que *rsp) struct rsp_que *rsp)
{ {
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
rsp->qpair = ha->base_qpair; rsp->qpair = ha->base_qpair;
rsp->req = req; rsp->req = req;
ha->base_qpair->hw = ha; ha->base_qpair->hw = ha;
...@@ -389,6 +390,7 @@ static int qla2x00_alloc_queues(struct qla_hw_data *ha, struct req_que *req, ...@@ -389,6 +390,7 @@ static int qla2x00_alloc_queues(struct qla_hw_data *ha, struct req_que *req,
struct rsp_que *rsp) struct rsp_que *rsp)
{ {
scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev); scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
ha->req_q_map = kcalloc(ha->max_req_queues, sizeof(struct req_que *), ha->req_q_map = kcalloc(ha->max_req_queues, sizeof(struct req_que *),
GFP_KERNEL); GFP_KERNEL);
if (!ha->req_q_map) { if (!ha->req_q_map) {
...@@ -3397,6 +3399,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -3397,6 +3399,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) { if (IS_T10_PI_CAPABLE(ha) && ql2xenabledif) {
if (ha->fw_attributes & BIT_4) { if (ha->fw_attributes & BIT_4) {
int prot = 0, guard; int prot = 0, guard;
base_vha->flags.difdix_supported = 1; base_vha->flags.difdix_supported = 1;
ql_dbg(ql_dbg_init, base_vha, 0x00f1, ql_dbg(ql_dbg_init, base_vha, 0x00f1,
"Registering for DIF/DIX type 1 and 3 protection.\n"); "Registering for DIF/DIX type 1 and 3 protection.\n");
...@@ -3889,6 +3892,7 @@ qla2x00_schedule_rport_del(struct scsi_qla_host *vha, fc_port_t *fcport, ...@@ -3889,6 +3892,7 @@ qla2x00_schedule_rport_del(struct scsi_qla_host *vha, fc_port_t *fcport,
qla2xxx_wake_dpc(base_vha); qla2xxx_wake_dpc(base_vha);
} else { } else {
int now; int now;
if (rport) { if (rport) {
ql_dbg(ql_dbg_disc, fcport->vha, 0x2109, ql_dbg(ql_dbg_disc, fcport->vha, 0x2109,
"%s %8phN. rport %p roles %x\n", "%s %8phN. rport %p roles %x\n",
...@@ -5631,6 +5635,7 @@ qla83xx_force_lock_recovery(scsi_qla_host_t *base_vha) ...@@ -5631,6 +5635,7 @@ qla83xx_force_lock_recovery(scsi_qla_host_t *base_vha)
uint32_t idc_lck_rcvry_stage_mask = 0x3; uint32_t idc_lck_rcvry_stage_mask = 0x3;
uint32_t idc_lck_rcvry_owner_mask = 0x3c; uint32_t idc_lck_rcvry_owner_mask = 0x3c;
struct qla_hw_data *ha = base_vha->hw; struct qla_hw_data *ha = base_vha->hw;
ql_dbg(ql_dbg_p3p, base_vha, 0xb086, ql_dbg(ql_dbg_p3p, base_vha, 0xb086,
"Trying force recovery of the IDC lock.\n"); "Trying force recovery of the IDC lock.\n");
......
drivers/scsi/qla2xxx/qla_target.c
View file @ bd432bb5
...@@ -184,6 +184,7 @@ static inline int qlt_issue_marker(struct scsi_qla_host *vha, int vha_locked) ...@@ -184,6 +184,7 @@ static inline int qlt_issue_marker(struct scsi_qla_host *vha, int vha_locked)
/* Send marker if required */ /* Send marker if required */
if (unlikely(vha->marker_needed != 0)) { if (unlikely(vha->marker_needed != 0)) {
int rc = qla2x00_issue_marker(vha, vha_locked); int rc = qla2x00_issue_marker(vha, vha_locked);
if (rc != QLA_SUCCESS) { if (rc != QLA_SUCCESS) {
ql_dbg(ql_dbg_tgt, vha, 0xe03d, ql_dbg(ql_dbg_tgt, vha, 0xe03d,
"qla_target(%d): issue_marker() failed\n", "qla_target(%d): issue_marker() failed\n",
...@@ -557,6 +558,7 @@ static int qla24xx_post_nack_work(struct scsi_qla_host *vha, fc_port_t *fcport, ...@@ -557,6 +558,7 @@ static int qla24xx_post_nack_work(struct scsi_qla_host *vha, fc_port_t *fcport,
struct imm_ntfy_from_isp *ntfy, int type) struct imm_ntfy_from_isp *ntfy, int type)
{ {
struct qla_work_evt *e; struct qla_work_evt *e;
e = qla2x00_alloc_work(vha, QLA_EVT_NACK); e = qla2x00_alloc_work(vha, QLA_EVT_NACK);
if (!e) if (!e)
return QLA_FUNCTION_FAILED; return QLA_FUNCTION_FAILED;
...@@ -1076,6 +1078,7 @@ void qlt_free_session_done(struct work_struct *work) ...@@ -1076,6 +1078,7 @@ void qlt_free_session_done(struct work_struct *work)
struct qlt_plogi_ack_t *con = struct qlt_plogi_ack_t *con =
sess->plogi_link[QLT_PLOGI_LINK_CONFLICT]; sess->plogi_link[QLT_PLOGI_LINK_CONFLICT];
struct imm_ntfy_from_isp *iocb; struct imm_ntfy_from_isp *iocb;
own = sess->plogi_link[QLT_PLOGI_LINK_SAME_WWN]; own = sess->plogi_link[QLT_PLOGI_LINK_SAME_WWN];
if (con) { if (con) {
...@@ -1329,6 +1332,7 @@ static int qla24xx_get_loop_id(struct scsi_qla_host *vha, const uint8_t *s_id, ...@@ -1329,6 +1332,7 @@ static int qla24xx_get_loop_id(struct scsi_qla_host *vha, const uint8_t *s_id,
res = -ENOENT; res = -ENOENT;
for (i = 0; i < entries; i++) { for (i = 0; i < entries; i++) {
struct gid_list_info *gid = (struct gid_list_info *)id_iter; struct gid_list_info *gid = (struct gid_list_info *)id_iter;
if ((gid->al_pa == s_id[2]) && if ((gid->al_pa == s_id[2]) &&
(gid->area == s_id[1]) && (gid->area == s_id[1]) &&
(gid->domain == s_id[0])) { (gid->domain == s_id[0])) {
...@@ -2485,6 +2489,7 @@ static void qlt_unmap_sg(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd) ...@@ -2485,6 +2489,7 @@ static void qlt_unmap_sg(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd)
{ {
struct qla_hw_data *ha; struct qla_hw_data *ha;
struct qla_qpair *qpair; struct qla_qpair *qpair;
if (!cmd->sg_mapped) if (!cmd->sg_mapped)
return; return;
...@@ -3913,6 +3918,7 @@ static int qlt_term_ctio_exchange(struct qla_qpair *qpair, void *ctio, ...@@ -3913,6 +3918,7 @@ static int qlt_term_ctio_exchange(struct qla_qpair *qpair, void *ctio,
if (ctio != NULL) { if (ctio != NULL) {
struct ctio7_from_24xx *c = (struct ctio7_from_24xx *)ctio; struct ctio7_from_24xx *c = (struct ctio7_from_24xx *)ctio;
term = !(c->flags & term = !(c->flags &
cpu_to_le16(OF_TERM_EXCH)); cpu_to_le16(OF_TERM_EXCH));
} else } else
...@@ -4773,6 +4779,7 @@ static int abort_cmds_for_s_id(struct scsi_qla_host *vha, port_id_t *s_id) ...@@ -4773,6 +4779,7 @@ static int abort_cmds_for_s_id(struct scsi_qla_host *vha, port_id_t *s_id)
list_for_each_entry(op, &vha->unknown_atio_list, cmd_list) { list_for_each_entry(op, &vha->unknown_atio_list, cmd_list) {
uint32_t op_key = sid_to_key(op->atio.u.isp24.fcp_hdr.s_id); uint32_t op_key = sid_to_key(op->atio.u.isp24.fcp_hdr.s_id);
if (op_key == key) { if (op_key == key) {
op->aborted = true; op->aborted = true;
count++; count++;
...@@ -4781,6 +4788,7 @@ static int abort_cmds_for_s_id(struct scsi_qla_host *vha, port_id_t *s_id) ...@@ -4781,6 +4788,7 @@ static int abort_cmds_for_s_id(struct scsi_qla_host *vha, port_id_t *s_id)
list_for_each_entry(cmd, &vha->qla_cmd_list, cmd_list) { list_for_each_entry(cmd, &vha->qla_cmd_list, cmd_list) {
uint32_t cmd_key = sid_to_key(cmd->atio.u.isp24.fcp_hdr.s_id); uint32_t cmd_key = sid_to_key(cmd->atio.u.isp24.fcp_hdr.s_id);
if (cmd_key == key) { if (cmd_key == key) {
cmd->aborted = 1; cmd->aborted = 1;
count++; count++;
...@@ -5051,6 +5059,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha, ...@@ -5051,6 +5059,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
if (sess != NULL) { if (sess != NULL) {
bool delete = false; bool delete = false;
int sec; int sec;
spin_lock_irqsave(&tgt->ha->tgt.sess_lock, flags); spin_lock_irqsave(&tgt->ha->tgt.sess_lock, flags);
switch (sess->fw_login_state) { switch (sess->fw_login_state) {
case DSC_LS_PLOGI_PEND: case DSC_LS_PLOGI_PEND:
...@@ -5203,6 +5212,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha, ...@@ -5203,6 +5212,7 @@ static int qlt_24xx_handle_els(struct scsi_qla_host *vha,
case ELS_ADISC: case ELS_ADISC:
{ {
struct qla_tgt *tgt = vha->vha_tgt.qla_tgt; struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
if (tgt->link_reinit_iocb_pending) { if (tgt->link_reinit_iocb_pending) {
qlt_send_notify_ack(ha->base_qpair, qlt_send_notify_ack(ha->base_qpair,
&tgt->link_reinit_iocb, 0, 0, 0, 0, 0, 0); &tgt->link_reinit_iocb, 0, 0, 0, 0, 0, 0);
...@@ -5266,6 +5276,7 @@ static void qlt_handle_imm_notify(struct scsi_qla_host *vha, ...@@ -5266,6 +5276,7 @@ static void qlt_handle_imm_notify(struct scsi_qla_host *vha,
case IMM_NTFY_LIP_LINK_REINIT: case IMM_NTFY_LIP_LINK_REINIT:
{ {
struct qla_tgt *tgt = vha->vha_tgt.qla_tgt; struct qla_tgt *tgt = vha->vha_tgt.qla_tgt;
ql_dbg(ql_dbg_tgt_mgt, vha, 0xf033, ql_dbg(ql_dbg_tgt_mgt, vha, 0xf033,
"qla_target(%d): LINK REINIT (loop %#x, " "qla_target(%d): LINK REINIT (loop %#x, "
"subcode %x)\n", vha->vp_idx, "subcode %x)\n", vha->vp_idx,
...@@ -5883,6 +5894,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha, ...@@ -5883,6 +5894,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,
case CTIO_TYPE7: case CTIO_TYPE7:
{ {
struct ctio7_from_24xx *entry = (struct ctio7_from_24xx *)pkt; struct ctio7_from_24xx *entry = (struct ctio7_from_24xx *)pkt;
qlt_do_ctio_completion(vha, rsp, entry->handle, qlt_do_ctio_completion(vha, rsp, entry->handle,
le16_to_cpu(entry->status)|(pkt->entry_status << 16), le16_to_cpu(entry->status)|(pkt->entry_status << 16),
entry); entry);
...@@ -5893,6 +5905,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha, ...@@ -5893,6 +5905,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,
{ {
struct atio_from_isp *atio = (struct atio_from_isp *)pkt; struct atio_from_isp *atio = (struct atio_from_isp *)pkt;
int rc; int rc;
if (atio->u.isp2x.status != if (atio->u.isp2x.status !=
cpu_to_le16(ATIO_CDB_VALID)) { cpu_to_le16(ATIO_CDB_VALID)) {
ql_dbg(ql_dbg_tgt, vha, 0xe05e, ql_dbg(ql_dbg_tgt, vha, 0xe05e,
...@@ -5941,6 +5954,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha, ...@@ -5941,6 +5954,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,
case CONTINUE_TGT_IO_TYPE: case CONTINUE_TGT_IO_TYPE:
{ {
struct ctio_to_2xxx *entry = (struct ctio_to_2xxx *)pkt; struct ctio_to_2xxx *entry = (struct ctio_to_2xxx *)pkt;
qlt_do_ctio_completion(vha, rsp, entry->handle, qlt_do_ctio_completion(vha, rsp, entry->handle,
le16_to_cpu(entry->status)|(pkt->entry_status << 16), le16_to_cpu(entry->status)|(pkt->entry_status << 16),
entry); entry);
...@@ -5950,6 +5964,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha, ...@@ -5950,6 +5964,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,
case CTIO_A64_TYPE: case CTIO_A64_TYPE:
{ {
struct ctio_to_2xxx *entry = (struct ctio_to_2xxx *)pkt; struct ctio_to_2xxx *entry = (struct ctio_to_2xxx *)pkt;
qlt_do_ctio_completion(vha, rsp, entry->handle, qlt_do_ctio_completion(vha, rsp, entry->handle,
le16_to_cpu(entry->status)|(pkt->entry_status << 16), le16_to_cpu(entry->status)|(pkt->entry_status << 16),
entry); entry);
...@@ -5964,6 +5979,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha, ...@@ -5964,6 +5979,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha,
case NOTIFY_ACK_TYPE: case NOTIFY_ACK_TYPE:
if (tgt->notify_ack_expected > 0) { if (tgt->notify_ack_expected > 0) {
struct nack_to_isp *entry = (struct nack_to_isp *)pkt; struct nack_to_isp *entry = (struct nack_to_isp *)pkt;
ql_dbg(ql_dbg_tgt, vha, 0xe036, ql_dbg(ql_dbg_tgt, vha, 0xe036,
"NOTIFY_ACK seq %08x status %x\n", "NOTIFY_ACK seq %08x status %x\n",
le16_to_cpu(entry->u.isp2x.seq_id), le16_to_cpu(entry->u.isp2x.seq_id),
...@@ -6239,6 +6255,7 @@ static struct fc_port *qlt_make_local_sess(struct scsi_qla_host *vha, ...@@ -6239,6 +6255,7 @@ static struct fc_port *qlt_make_local_sess(struct scsi_qla_host *vha,
if (rc == -ENOENT) { if (rc == -ENOENT) {
qlt_port_logo_t logo; qlt_port_logo_t logo;
sid_to_portid(s_id, &logo.id); sid_to_portid(s_id, &logo.id);
logo.cmd_count = 1; logo.cmd_count = 1;
qlt_send_first_logo(vha, &logo); qlt_send_first_logo(vha, &logo);
...@@ -6499,6 +6516,7 @@ int qlt_add_target(struct qla_hw_data *ha, struct scsi_qla_host *base_vha) ...@@ -6499,6 +6516,7 @@ int qlt_add_target(struct qla_hw_data *ha, struct scsi_qla_host *base_vha)
unsigned long flags; unsigned long flags;
struct qla_qpair *qpair = ha->queue_pair_map[i]; struct qla_qpair *qpair = ha->queue_pair_map[i];
h = &tgt->qphints[i + 1]; h = &tgt->qphints[i + 1];
INIT_LIST_HEAD(&h->hint_elem); INIT_LIST_HEAD(&h->hint_elem);
if (qpair) { if (qpair) {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7