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

Commit 1d634965 authored May 24, 2017 by Joe Carnuccio Committed by Martin K. Petersen May 24, 2017

scsi: qla2xxx: Set bit 15 for DIAG_ECHO_TEST MBC



Set bit (BIT_15) to send right ECHO payload information for Diagnostic
Echo Test command.

Cc: <stable@vger.kernel.org> # v4.10+
Signed-off-by: Joe Carnuccio <joe.carnuccio@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent ce6c668b

drivers/scsi/qla2xxx/qla_bsg.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -730,6 +730,8 @@ qla2x00_process_loopback(struct bsg_job *bsg_job)
		return -EIO;
		}

		memset(&elreq, 0, sizeof(elreq));

		elreq.req_sg_cnt = dma_map_sg(&ha->pdev->dev,
		bsg_job->request_payload.sg_list, bsg_job->request_payload.sg_cnt,
		DMA_TO_DEVICE);
		@@ -795,9 +797,8 @@ qla2x00_process_loopback(struct bsg_job *bsg_job)

		if (atomic_read(&vha->loop_state) == LOOP_READY &&
		(ha->current_topology == ISP_CFG_F \|\|
		((IS_QLA81XX(ha) \|\| IS_QLA8031(ha) \|\| IS_QLA8044(ha)) &&
		le32_to_cpu((uint32_t )req_data) == ELS_OPCODE_BYTE
		&& req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&
		(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";
		ql_dbg(ql_dbg_user, vha, 0x701e,

drivers/scsi/qla2xxx/qla_mbx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4812,9 +4812,9 @@ qla2x00_echo_test(scsi_qla_host_t vha, struct msg_echo_lb mreq,

		memset(mcp->mb, 0 , sizeof(mcp->mb));
		mcp->mb[0] = MBC_DIAGNOSTIC_ECHO;
		mcp->mb[1] = mreq->options \| BIT_6; /* BIT_6 specifies 64bit address */
		/* BIT_6 specifies 64bit address */
		mcp->mb[1] = mreq->options \| BIT_15 \| BIT_6;
		if (IS_CNA_CAPABLE(ha)) {
		mcp->mb[1] \|= BIT_15;
		mcp->mb[2] = vha->fcoe_fcf_idx;
		}
		mcp->mb[16] = LSW(mreq->rcv_dma);