I'm getting this error from this patch:
CC [M] drivers/scsi/qla2xxx/qla_bsg.o
drivers/scsi/qla2xxx/qla_bsg.c: In function ‘qla2x00_process_loopback’:
drivers/scsi/qla2xxx/qla_bsg.c:584: warning: ‘rval’ may be used
uninitialized in this function
It looks like this hunk of code.
On Tue, 2010-05-04 at 15:01 -0700, giridhar.malavali@xxxxxxxxxx wrote:
> static int
> qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
> {
> struct Scsi_Host *host = bsg_job->shost;
> scsi_qla_host_t *vha = shost_priv(host);
> struct qla_hw_data *ha = vha->hw;
> - int rval;
> + int rval, ret;
> uint8_t command_sent;
> char *type;
> struct msg_echo_lb elreq;
> uint16_t response[MAILBOX_REGISTER_COUNT];
> + uint16_t config[4], new_config[4];
> uint8_t *fw_sts_ptr;
> uint8_t *req_data = NULL;
> dma_addr_t req_data_dma;
> @@ -568,7 +661,54 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
>
> elreq.options = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1];
>
> - if (ha->current_topology != ISP_CFG_F) {
> + if ((ha->current_topology == ISP_CFG_F ||
> + (IS_QLA81XX(ha) &&
> + le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE
> + && req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&
> + elreq.options == EXTERNAL_LOOPBACK) {
> + type = "FC_BSG_HST_VENDOR_ECHO_DIAG";
> + DEBUG2(qla_printk(KERN_INFO, ha,
> + "scsi(%ld) bsg rqst type: %s\n", vha->host_no, type));
> + command_sent = INT_DEF_LB_ECHO_CMD;
> + rval = qla2x00_echo_test(vha, &elreq, response);
> +
> + } else {
> + if (IS_QLA81XX(ha)) {
> + memset(config, 0, sizeof(config));
> + memset(new_config, 0, sizeof(new_config));
> + ret = qla81xx_get_port_config(vha, config);
> + if (ret != QLA_SUCCESS) {
> + DEBUG2(printk(KERN_ERR
> + "%s(%lu): Get port config failed\n",
> + __func__, vha->host_no));
> + bsg_job->reply->reply_payload_rcv_len = 0;
> + bsg_job->reply->result = (DID_ERROR << 16);
> + goto done_free_dma_req;
Specifically, here and a few others below. If ret indicates the command
failed, shouldn't we be setting rval to pass the error upwards ... it's
currently uninitialised, I think?
James
> + }
> + }
> +
> + if (elreq.options != EXTERNAL_LOOPBACK && IS_QLA81XX(ha)) {
> + DEBUG2(qla_printk(KERN_INFO, ha,
> + "Internal: current port config = %x\n", config[0]));
> + ret = qla81xx_set_internal_loopback(vha, config,
> + new_config);
> + if (ret) {
> + bsg_job->reply->reply_payload_rcv_len = 0;
> + bsg_job->reply->result = (DID_ERROR << 16);
> + goto done_free_dma_req;
> + }
> + } else {
> + /* For external loopback to work
> + * ensure internal loopback is disabled
> + */
> + ret = qla81xx_reset_internal_loopback(vha, config, 1);
> + if (ret) {
> + bsg_job->reply->reply_payload_rcv_len = 0;
> + bsg_job->reply->result = (DID_ERROR << 16);
> + goto done_free_dma_req;
> + }
> + }
> +
> type = "FC_BSG_HST_VENDOR_LOOPBACK";
> DEBUG2(qla_printk(KERN_INFO, ha,
> "scsi(%ld) bsg rqst type: %s\n",
> @@ -577,20 +717,34 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
> command_sent = INT_DEF_LB_LOOPBACK_CMD;
> rval = qla2x00_loopback_test(vha, &elreq, response);
> if (IS_QLA81XX(ha)) {
> + if (new_config[1]) {
> + /* Revert back to original port config
> + * Also clear internal loopback
> + */
> + qla81xx_reset_internal_loopback(vha,
> + new_config, 0);
> + }
> +
> if (response[0] == MBS_COMMAND_ERROR &&
> - response[1] == MBS_LB_RESET) {
> + response[1] == MBS_LB_RESET) {
> DEBUG2(printk(KERN_ERR "%s(%ld): ABORTing "
> - "ISP\n", __func__, vha->host_no));
> + "ISP\n", __func__, vha->host_no));
> set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
> qla2xxx_wake_dpc(vha);
> + qla2x00_wait_for_chip_reset(vha);
> + /* Also reset the MPI */
> + if (qla81xx_restart_mpi_firmware(vha) !=
> + QLA_SUCCESS) {
> + qla_printk(KERN_INFO, ha,
> + "MPI reset failed for host%ld.\n",
> + vha->host_no);
> + }
> +
> + bsg_job->reply->reply_payload_rcv_len = 0;
> + bsg_job->reply->result = (DID_ERROR << 16);
> + goto done_free_dma_req;
> }
> }
> - } else {
> - type = "FC_BSG_HST_VENDOR_ECHO_DIAG";
> - DEBUG2(qla_printk(KERN_INFO, ha,
> - "scsi(%ld) bsg rqst type: %s\n", vha->host_no, type));
> - command_sent = INT_DEF_LB_ECHO_CMD;
> - rval = qla2x00_echo_test(vha, &elreq, response);
> }
>
> if (rval) {
> diff --git a/drivers/scsi/qla2xxx/qla_bsg.h b/drivers/scsi/qla2xxx/qla_bsg.h
> index 76ed92d..1f096da 100644
> --- a/drivers/scsi/qla2xxx/qla_bsg.h
> +++ b/drivers/scsi/qla2xxx/qla_bsg.h
> @@ -19,6 +19,13 @@
> #define INT_DEF_LB_LOOPBACK_CMD 0
> #define INT_DEF_LB_ECHO_CMD 1
>
> +/* Loopback related definations */
> +#define EXTERNAL_LOOPBACK 0xF2
> +#define ENABLE_INTERNAL_LOOPBACK 0x02
> +#define INTERNAL_LOOPBACK_MASK 0x000E
> +#define MAX_ELS_FRAME_PAYLOAD 252
> +#define ELS_OPCODE_BYTE 0x10
> +
> /* BSG Vendor specific definations */
> #define A84_ISSUE_WRITE_TYPE_CMD 0
> #define A84_ISSUE_READ_TYPE_CMD 1
> diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
> index 8396109..4d8a7b9 100644
> --- a/drivers/scsi/qla2xxx/qla_def.h
> +++ b/drivers/scsi/qla2xxx/qla_def.h
> @@ -713,6 +713,8 @@ typedef struct {
> #define MBC_SEND_RNFT_ELS 0x5e /* Send RNFT ELS request */
> #define MBC_GET_LINK_PRIV_STATS 0x6d /* Get link & private data. */
> #define MBC_SET_VENDOR_ID 0x76 /* Set Vendor ID. */
> +#define MBC_SET_PORT_CONFIG 0x122 /* Set port configuration */
> +#define MBC_GET_PORT_CONFIG 0x123 /* Get port configuration */
>
> /* Firmware return data sizes */
> #define FCAL_MAP_SIZE 128
> @@ -2630,6 +2632,8 @@ struct qla_hw_data {
> struct mutex vport_lock; /* Virtual port synchronization */
> struct completion mbx_cmd_comp; /* Serialize mbx access */
> struct completion mbx_intr_comp; /* Used for completion notification */
> + struct completion dcbx_comp; /* For set port config notification */
> + int notify_dcbx_comp;
>
> /* Basic firmware related information. */
> uint16_t fw_major_version;
> diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
> index 8217c3b..6ff36f1 100644
> --- a/drivers/scsi/qla2xxx/qla_gbl.h
> +++ b/drivers/scsi/qla2xxx/qla_gbl.h
> @@ -357,6 +357,11 @@ qla2x00_write_ram_word(scsi_qla_host_t *, uint32_t, uint32_t);
> extern int qla2x00_get_data_rate(scsi_qla_host_t *);
> extern int qla24xx_set_fcp_prio(scsi_qla_host_t *, uint16_t, uint16_t,
> uint16_t *);
> +extern int
> +qla81xx_get_port_config(scsi_qla_host_t *, uint16_t *);
> +
> +extern int
> +qla81xx_set_port_config(scsi_qla_host_t *, uint16_t *);
>
> /*
> * Global Function Prototypes in qla_isr.c source file.
> diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
> index be3d8be..2fe0250 100644
> --- a/drivers/scsi/qla2xxx/qla_isr.c
> +++ b/drivers/scsi/qla2xxx/qla_isr.c
> @@ -545,10 +545,13 @@ skip_rio:
> if (IS_QLA2100(ha))
> break;
>
> - if (IS_QLA8XXX_TYPE(ha))
> + if (IS_QLA8XXX_TYPE(ha)) {
> DEBUG2(printk("scsi(%ld): DCBX Completed -- %04x %04x "
> "%04x\n", vha->host_no, mb[1], mb[2], mb[3]));
> - else
> + if (ha->notify_dcbx_comp)
> + complete(&ha->dcbx_comp);
> +
> + } else
> DEBUG2(printk("scsi(%ld): Asynchronous P2P MODE "
> "received.\n", vha->host_no));
>
> diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
> index f3650d0..f593afa 100644
> --- a/drivers/scsi/qla2xxx/qla_mbx.c
> +++ b/drivers/scsi/qla2xxx/qla_mbx.c
> @@ -3950,6 +3950,72 @@ qla2x00_get_data_rate(scsi_qla_host_t *vha)
> }
>
> int
> +qla81xx_get_port_config(scsi_qla_host_t *vha, uint16_t *mb)
> +{
> + int rval;
> + mbx_cmd_t mc;
> + mbx_cmd_t *mcp = &mc;
> + struct qla_hw_data *ha = vha->hw;
> +
> + DEBUG11(printk(KERN_INFO
> + "%s(%ld): entered.\n", __func__, vha->host_no));
> +
> + if (!IS_QLA81XX(ha))
> + return QLA_FUNCTION_FAILED;
> + mcp->mb[0] = MBC_GET_PORT_CONFIG;
> + mcp->out_mb = MBX_0;
> + mcp->in_mb = MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
> + mcp->tov = MBX_TOV_SECONDS;
> + mcp->flags = 0;
> +
> + rval = qla2x00_mailbox_command(vha, mcp);
> +
> + if (rval != QLA_SUCCESS) {
> + DEBUG2_3_11(printk(KERN_WARNING
> + "%s(%ld): failed=%x (%x).\n", __func__,
> + vha->host_no, rval, mcp->mb[0]));
> + } else {
> + /* Copy all bits to preserve original value */
> + memcpy(mb, &mcp->mb[1], sizeof(uint16_t) * 4);
> +
> + DEBUG11(printk(KERN_INFO
> + "%s(%ld): done.\n", __func__, vha->host_no));
> + }
> + return rval;
> +}
> +
> +int
> +qla81xx_set_port_config(scsi_qla_host_t *vha, uint16_t *mb)
> +{
> + int rval;
> + mbx_cmd_t mc;
> + mbx_cmd_t *mcp = &mc;
> +
> + DEBUG11(printk(KERN_INFO
> + "%s(%ld): entered.\n", __func__, vha->host_no));
> +
> + mcp->mb[0] = MBC_SET_PORT_CONFIG;
> + /* Copy all bits to preserve original setting */
> + memcpy(&mcp->mb[1], mb, sizeof(uint16_t) * 4);
> + mcp->out_mb = MBX_4|MBX_3|MBX_2|MBX_1|MBX_0;
> + mcp->in_mb = MBX_0;
> + mcp->tov = MBX_TOV_SECONDS;
> + mcp->flags = 0;
> + rval = qla2x00_mailbox_command(vha, mcp);
> +
> + if (rval != QLA_SUCCESS) {
> + DEBUG2_3_11(printk(KERN_WARNING
> + "%s(%ld): failed=%x (%x).\n", __func__,
> + vha->host_no, rval, mcp->mb[0]));
> + } else
> + DEBUG11(printk(KERN_INFO
> + "%s(%ld): done.\n", __func__, vha->host_no));
> +
> + return rval;
> +}
> +
> +
> +int
> qla24xx_set_fcp_prio(scsi_qla_host_t *vha, uint16_t loop_id, uint16_t priority,
> uint16_t *mb)
> {
> diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
> index be1a8fc..58e6102 100644
> --- a/drivers/scsi/qla2xxx/qla_os.c
> +++ b/drivers/scsi/qla2xxx/qla_os.c
> @@ -2113,6 +2113,7 @@ qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
> init_completion(&ha->mbx_cmd_comp);
> complete(&ha->mbx_cmd_comp);
> init_completion(&ha->mbx_intr_comp);
> + init_completion(&ha->dcbx_comp);
>
> set_bit(0, (unsigned long *) ha->vp_idx_map);
>
> --
> 1.6.2.rc1.30.gd43c
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
