leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: don't use fc_bsg_job::request and fc_bsg_job::reply directly

Browse Source 
Don't use fc_bsg_job::request and fc_bsg_job::reply directly, but use
helper variables bsg_request and bsg_reply. This will be helpful when
transitioning to bsg-lib.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Johannes Thumshirn 2016-11-17 10:31:12 +01:00 committed by Martin K. Petersen
parent eb34094820
commit 01e0e15c8b
10 changed files with 398 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/s390/scsi/zfcp_fc.c
View File

@ -900,8 +900,9 @@ static struct zfcp_fc_wka_port *zfcp_fc_job_wka_port(struct fc_bsg_job *job)
u32 preamble_word1; u32 preamble_word1;
u8 gs_type; u8 gs_type;
struct zfcp_adapter *adapter; struct zfcp_adapter *adapter;
struct fc_bsg_request *bsg_request = job->request;
preamble_word1 = job->request->rqst_data.r_ct.preamble_word1; preamble_word1 = bsg_request->rqst_data.r_ct.preamble_word1;
gs_type = (preamble_word1 & 0xff000000) >> 24; gs_type = (preamble_word1 & 0xff000000) >> 24;
adapter = (struct zfcp_adapter *) job->shost->hostdata[0]; adapter = (struct zfcp_adapter *) job->shost->hostdata[0];
@ -938,6 +939,7 @@ static int zfcp_fc_exec_els_job(struct fc_bsg_job *job,
{ {
struct zfcp_fsf_ct_els *els = job->dd_data; struct zfcp_fsf_ct_els *els = job->dd_data;
struct fc_rport *rport = job->rport; struct fc_rport *rport = job->rport;
struct fc_bsg_request *bsg_request = job->request;
struct zfcp_port *port; struct zfcp_port *port;
u32 d_id; u32 d_id;
@ -949,7 +951,7 @@ static int zfcp_fc_exec_els_job(struct fc_bsg_job *job,
d_id = port->d_id; d_id = port->d_id;
put_device(&port->dev); put_device(&port->dev);
} else } else
d_id = ntoh24(job->request->rqst_data.h_els.port_id); d_id = ntoh24(bsg_request->rqst_data.h_els.port_id);
els->handler = zfcp_fc_ct_els_job_handler; els->handler = zfcp_fc_ct_els_job_handler;
return zfcp_fsf_send_els(adapter, d_id, els, job->req->timeout / HZ); return zfcp_fsf_send_els(adapter, d_id, els, job->req->timeout / HZ);
@ -983,6 +985,7 @@ int zfcp_fc_exec_bsg_job(struct fc_bsg_job *job)
struct Scsi_Host *shost; struct Scsi_Host *shost;
struct zfcp_adapter *adapter; struct zfcp_adapter *adapter;
struct zfcp_fsf_ct_els *ct_els = job->dd_data; struct zfcp_fsf_ct_els *ct_els = job->dd_data;
struct fc_bsg_request *bsg_request = job->request;
shost = job->rport ? rport_to_shost(job->rport) : job->shost; shost = job->rport ? rport_to_shost(job->rport) : job->shost;
adapter = (struct zfcp_adapter *)shost->hostdata[0]; adapter = (struct zfcp_adapter *)shost->hostdata[0];
@ -994,7 +997,7 @@ int zfcp_fc_exec_bsg_job(struct fc_bsg_job *job)
ct_els->resp = job->reply_payload.sg_list; ct_els->resp = job->reply_payload.sg_list;
ct_els->handler_data = job; ct_els->handler_data = job;
switch (job->request->msgcode) { switch (bsg_request->msgcode) {
case FC_BSG_RPT_ELS: case FC_BSG_RPT_ELS:
case FC_BSG_HST_ELS_NOLOGIN: case FC_BSG_HST_ELS_NOLOGIN:
return zfcp_fc_exec_els_job(job, adapter); return zfcp_fc_exec_els_job(job, adapter);

38
drivers/scsi/bfa/bfad_bsg.c
View File

@ -3132,7 +3132,9 @@ bfad_iocmd_handler(struct bfad_s *bfad, unsigned int cmd, void *iocmd,
static int static int
bfad_im_bsg_vendor_request(struct fc_bsg_job *job) bfad_im_bsg_vendor_request(struct fc_bsg_job *job)
{ {
uint32_t vendor_cmd = job->request->rqst_data.h_vendor.vendor_cmd[0]; struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
uint32_t vendor_cmd = bsg_request->rqst_data.h_vendor.vendor_cmd[0];
struct bfad_im_port_s *im_port = struct bfad_im_port_s *im_port =
(struct bfad_im_port_s *) job->shost->hostdata[0]; (struct bfad_im_port_s *) job->shost->hostdata[0];
struct bfad_s *bfad = im_port->bfad; struct bfad_s *bfad = im_port->bfad;
@ -3175,8 +3177,8 @@ bfad_im_bsg_vendor_request(struct fc_bsg_job *job)
/* Fill the BSG job reply data */ /* Fill the BSG job reply data */
job->reply_len = job->reply_payload.payload_len; job->reply_len = job->reply_payload.payload_len;
job->reply->reply_payload_rcv_len = job->reply_payload.payload_len; bsg_reply->reply_payload_rcv_len = job->reply_payload.payload_len;
job->reply->result = rc; bsg_reply->result = rc;
job->job_done(job); job->job_done(job);
return rc; return rc;
@ -3184,9 +3186,9 @@ error:
/* free the command buffer */ /* free the command buffer */
kfree(payload_kbuf); kfree(payload_kbuf);
out: out:
job->reply->result = rc; bsg_reply->result = rc;
job->reply_len = sizeof(uint32_t); job->reply_len = sizeof(uint32_t);
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
return rc; return rc;
} }
@ -3362,17 +3364,19 @@ bfad_im_bsg_els_ct_request(struct fc_bsg_job *job)
struct bfad_fcxp *drv_fcxp; struct bfad_fcxp *drv_fcxp;
struct bfa_fcs_lport_s *fcs_port; struct bfa_fcs_lport_s *fcs_port;
struct bfa_fcs_rport_s *fcs_rport; struct bfa_fcs_rport_s *fcs_rport;
uint32_t command_type = job->request->msgcode; struct fc_bsg_request *bsg_request = bsg_request;
struct fc_bsg_reply *bsg_reply = job->reply;
uint32_t command_type = bsg_request->msgcode;
unsigned long flags; unsigned long flags;
struct bfad_buf_info *rsp_buf_info; struct bfad_buf_info *rsp_buf_info;
void *req_kbuf = NULL, *rsp_kbuf = NULL; void *req_kbuf = NULL, *rsp_kbuf = NULL;
int rc = -EINVAL; int rc = -EINVAL;
job->reply_len = sizeof(uint32_t); /* Atleast uint32_t reply_len */ job->reply_len = sizeof(uint32_t); /* Atleast uint32_t reply_len */
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
/* Get the payload passed in from userspace */ /* Get the payload passed in from userspace */
bsg_data = (struct bfa_bsg_data *) (((char *)job->request) + bsg_data = (struct bfa_bsg_data *) (((char *)bsg_request) +
sizeof(struct fc_bsg_request)); sizeof(struct fc_bsg_request));
if (bsg_data == NULL) if (bsg_data == NULL)
goto out; goto out;
@ -3517,13 +3521,13 @@ bfad_im_bsg_els_ct_request(struct fc_bsg_job *job)
/* fill the job->reply data */ /* fill the job->reply data */
if (drv_fcxp->req_status == BFA_STATUS_OK) { if (drv_fcxp->req_status == BFA_STATUS_OK) {
job->reply_len = drv_fcxp->rsp_len; job->reply_len = drv_fcxp->rsp_len;
job->reply->reply_payload_rcv_len = drv_fcxp->rsp_len; bsg_reply->reply_payload_rcv_len = drv_fcxp->rsp_len;
job->reply->reply_data.ctels_reply.status = FC_CTELS_STATUS_OK; bsg_reply->reply_data.ctels_reply.status = FC_CTELS_STATUS_OK;
} else { } else {
job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
sizeof(struct fc_bsg_ctels_reply); sizeof(struct fc_bsg_ctels_reply);
job->reply_len = sizeof(uint32_t); job->reply_len = sizeof(uint32_t);
job->reply->reply_data.ctels_reply.status = bsg_reply->reply_data.ctels_reply.status =
FC_CTELS_STATUS_REJECT; FC_CTELS_STATUS_REJECT;
} }
@ -3549,7 +3553,7 @@ out_free_mem:
kfree(bsg_fcpt); kfree(bsg_fcpt);
kfree(drv_fcxp); kfree(drv_fcxp);
out: out:
job->reply->result = rc; bsg_reply->result = rc;
if (rc == BFA_STATUS_OK) if (rc == BFA_STATUS_OK)
job->job_done(job); job->job_done(job);
@ -3560,9 +3564,11 @@ out:
int int
bfad_im_bsg_request(struct fc_bsg_job *job) bfad_im_bsg_request(struct fc_bsg_job *job)
{ {
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
uint32_t rc = BFA_STATUS_OK; uint32_t rc = BFA_STATUS_OK;
switch (job->request->msgcode) { switch (bsg_request->msgcode) {
case FC_BSG_HST_VENDOR: case FC_BSG_HST_VENDOR:
/* Process BSG HST Vendor requests */ /* Process BSG HST Vendor requests */
rc = bfad_im_bsg_vendor_request(job); rc = bfad_im_bsg_vendor_request(job);
@ -3575,8 +3581,8 @@ bfad_im_bsg_request(struct fc_bsg_job *job)
rc = bfad_im_bsg_els_ct_request(job); rc = bfad_im_bsg_els_ct_request(job);
break; break;
default: default:
job->reply->result = rc = -EINVAL; bsg_reply->result = rc = -EINVAL;
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
break; break;
} }

22
drivers/scsi/ibmvscsi/ibmvfc.c
View File

@ -1827,28 +1827,30 @@ static int ibmvfc_bsg_request(struct fc_bsg_job *job)
struct ibmvfc_event *evt; struct ibmvfc_event *evt;
union ibmvfc_iu rsp_iu; union ibmvfc_iu rsp_iu;
unsigned long flags, port_id = -1; unsigned long flags, port_id = -1;
unsigned int code = job->request->msgcode; struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
unsigned int code = bsg_request->msgcode;
int rc = 0, req_seg, rsp_seg, issue_login = 0; int rc = 0, req_seg, rsp_seg, issue_login = 0;
u32 fc_flags, rsp_len; u32 fc_flags, rsp_len;
ENTER; ENTER;
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
if (rport) if (rport)
port_id = rport->port_id; port_id = rport->port_id;
switch (code) { switch (code) {
case FC_BSG_HST_ELS_NOLOGIN: case FC_BSG_HST_ELS_NOLOGIN:
port_id = (job->request->rqst_data.h_els.port_id[0] << 16) | port_id = (bsg_request->rqst_data.h_els.port_id[0] << 16) |
(job->request->rqst_data.h_els.port_id[1] << 8) | (bsg_request->rqst_data.h_els.port_id[1] << 8) |
job->request->rqst_data.h_els.port_id[2]; bsg_request->rqst_data.h_els.port_id[2];
case FC_BSG_RPT_ELS: case FC_BSG_RPT_ELS:
fc_flags = IBMVFC_FC_ELS; fc_flags = IBMVFC_FC_ELS;
break; break;
case FC_BSG_HST_CT: case FC_BSG_HST_CT:
issue_login = 1; issue_login = 1;
port_id = (job->request->rqst_data.h_ct.port_id[0] << 16) | port_id = (bsg_request->rqst_data.h_ct.port_id[0] << 16) |
(job->request->rqst_data.h_ct.port_id[1] << 8) | (bsg_request->rqst_data.h_ct.port_id[1] << 8) |
job->request->rqst_data.h_ct.port_id[2]; bsg_request->rqst_data.h_ct.port_id[2];
case FC_BSG_RPT_CT: case FC_BSG_RPT_CT:
fc_flags = IBMVFC_FC_CT_IU; fc_flags = IBMVFC_FC_CT_IU;
break; break;
@ -1937,12 +1939,12 @@ static int ibmvfc_bsg_request(struct fc_bsg_job *job)
if (rsp_iu.passthru.common.status) if (rsp_iu.passthru.common.status)
rc = -EIO; rc = -EIO;
else else
job->reply->reply_payload_rcv_len = rsp_len; bsg_reply->reply_payload_rcv_len = rsp_len;
spin_lock_irqsave(vhost->host->host_lock, flags); spin_lock_irqsave(vhost->host->host_lock, flags);
ibmvfc_free_event(evt); ibmvfc_free_event(evt);
spin_unlock_irqrestore(vhost->host->host_lock, flags); spin_unlock_irqrestore(vhost->host->host_lock, flags);
job->reply->result = rc; bsg_reply->result = rc;
job->job_done(job); job->job_done(job);
rc = 0; rc = 0;
out: out:

23
drivers/scsi/libfc/fc_lport.c
View File

@ -1902,13 +1902,14 @@ static void fc_lport_bsg_resp(struct fc_seq *sp, struct fc_frame *fp,
{ {
struct fc_bsg_info *info = info_arg; struct fc_bsg_info *info = info_arg;
struct fc_bsg_job *job = info->job; struct fc_bsg_job *job = info->job;
struct fc_bsg_reply *bsg_reply = job->reply;
struct fc_lport *lport = info->lport; struct fc_lport *lport = info->lport;
struct fc_frame_header *fh; struct fc_frame_header *fh;
size_t len; size_t len;
void *buf; void *buf;
if (IS_ERR(fp)) { if (IS_ERR(fp)) {
job->reply->result = (PTR_ERR(fp) == -FC_EX_CLOSED) ? bsg_reply->result = (PTR_ERR(fp) == -FC_EX_CLOSED) ?
-ECONNABORTED : -ETIMEDOUT; -ECONNABORTED : -ETIMEDOUT;
job->reply_len = sizeof(uint32_t); job->reply_len = sizeof(uint32_t);
job->state_flags |= FC_RQST_STATE_DONE; job->state_flags |= FC_RQST_STATE_DONE;
@ -1929,23 +1930,23 @@ static void fc_lport_bsg_resp(struct fc_seq *sp, struct fc_frame *fp,
(unsigned short)fc_frame_payload_op(fp); (unsigned short)fc_frame_payload_op(fp);
/* Save the reply status of the job */ /* Save the reply status of the job */
job->reply->reply_data.ctels_reply.status = bsg_reply->reply_data.ctels_reply.status =
(cmd == info->rsp_code) ? (cmd == info->rsp_code) ?
FC_CTELS_STATUS_OK : FC_CTELS_STATUS_REJECT; FC_CTELS_STATUS_OK : FC_CTELS_STATUS_REJECT;
} }
job->reply->reply_payload_rcv_len += bsg_reply->reply_payload_rcv_len +=
fc_copy_buffer_to_sglist(buf, len, info->sg, &info->nents, fc_copy_buffer_to_sglist(buf, len, info->sg, &info->nents,
&info->offset, NULL); &info->offset, NULL);
if (fr_eof(fp) == FC_EOF_T && if (fr_eof(fp) == FC_EOF_T &&
(ntoh24(fh->fh_f_ctl) & (FC_FC_LAST_SEQ | FC_FC_END_SEQ)) == (ntoh24(fh->fh_f_ctl) & (FC_FC_LAST_SEQ | FC_FC_END_SEQ)) ==
(FC_FC_LAST_SEQ | FC_FC_END_SEQ)) { (FC_FC_LAST_SEQ | FC_FC_END_SEQ)) {
if (job->reply->reply_payload_rcv_len > if (bsg_reply->reply_payload_rcv_len >
job->reply_payload.payload_len) job->reply_payload.payload_len)
job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
job->reply_payload.payload_len; job->reply_payload.payload_len;
job->reply->result = 0; bsg_reply->result = 0;
job->state_flags |= FC_RQST_STATE_DONE; job->state_flags |= FC_RQST_STATE_DONE;
job->job_done(job); job->job_done(job);
kfree(info); kfree(info);
@ -2082,6 +2083,8 @@ static int fc_lport_ct_request(struct fc_bsg_job *job,
*/ */
int fc_lport_bsg_request(struct fc_bsg_job *job) int fc_lport_bsg_request(struct fc_bsg_job *job)
{ {
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
struct request *rsp = job->req->next_rq; struct request *rsp = job->req->next_rq;
struct Scsi_Host *shost = job->shost; struct Scsi_Host *shost = job->shost;
struct fc_lport *lport = shost_priv(shost); struct fc_lport *lport = shost_priv(shost);
@ -2090,13 +2093,13 @@ int fc_lport_bsg_request(struct fc_bsg_job *job)
int rc = -EINVAL; int rc = -EINVAL;
u32 did, tov; u32 did, tov;
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
if (rsp) if (rsp)
rsp->resid_len = job->reply_payload.payload_len; rsp->resid_len = job->reply_payload.payload_len;
mutex_lock(&lport->lp_mutex); mutex_lock(&lport->lp_mutex);
switch (job->request->msgcode) { switch (bsg_request->msgcode) {
case FC_BSG_RPT_ELS: case FC_BSG_RPT_ELS:
rport = job->rport; rport = job->rport;
if (!rport) if (!rport)
@ -2118,7 +2121,7 @@ int fc_lport_bsg_request(struct fc_bsg_job *job)
break; break;
case FC_BSG_HST_CT: case FC_BSG_HST_CT:
did = ntoh24(job->request->rqst_data.h_ct.port_id); did = ntoh24(bsg_request->rqst_data.h_ct.port_id);
if (did == FC_FID_DIR_SERV) { if (did == FC_FID_DIR_SERV) {
rdata = lport->dns_rdata; rdata = lport->dns_rdata;
if (!rdata) if (!rdata)
@ -2136,7 +2139,7 @@ int fc_lport_bsg_request(struct fc_bsg_job *job)
break; break;
case FC_BSG_HST_ELS_NOLOGIN: case FC_BSG_HST_ELS_NOLOGIN:
did = ntoh24(job->request->rqst_data.h_els.port_id); did = ntoh24(bsg_request->rqst_data.h_els.port_id);
rc = fc_lport_els_request(job, lport, did, lport->e_d_tov); rc = fc_lport_els_request(job, lport, did, lport->e_d_tov);
break; break;
} }

199
drivers/scsi/lpfc/lpfc_bsg.c
View File

@ -299,6 +299,7 @@ lpfc_bsg_send_mgmt_cmd_cmp(struct lpfc_hba *phba,
{ {
struct bsg_job_data *dd_data; struct bsg_job_data *dd_data;
struct fc_bsg_job *job; struct fc_bsg_job *job;
struct fc_bsg_reply *bsg_reply;
IOCB_t *rsp; IOCB_t *rsp;
struct lpfc_dmabuf *bmp, *cmp, *rmp; struct lpfc_dmabuf *bmp, *cmp, *rmp;
struct lpfc_nodelist *ndlp; struct lpfc_nodelist *ndlp;
@ -313,6 +314,7 @@ lpfc_bsg_send_mgmt_cmd_cmp(struct lpfc_hba *phba,
spin_lock_irqsave(&phba->ct_ev_lock, flags); spin_lock_irqsave(&phba->ct_ev_lock, flags);
job = dd_data->set_job; job = dd_data->set_job;
if (job) { if (job) {
bsg_reply = job->reply;
/* Prevent timeout handling from trying to abort job */ /* Prevent timeout handling from trying to abort job */
job->dd_data = NULL; job->dd_data = NULL;
} }
@ -351,7 +353,7 @@ lpfc_bsg_send_mgmt_cmd_cmp(struct lpfc_hba *phba,
} }
} else { } else {
rsp_size = rsp->un.genreq64.bdl.bdeSize; rsp_size = rsp->un.genreq64.bdl.bdeSize;
job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
lpfc_bsg_copy_data(rmp, &job->reply_payload, lpfc_bsg_copy_data(rmp, &job->reply_payload,
rsp_size, 0); rsp_size, 0);
} }
@ -368,7 +370,7 @@ lpfc_bsg_send_mgmt_cmd_cmp(struct lpfc_hba *phba,
/* Complete the job if the job is still active */ /* Complete the job if the job is still active */
if (job) { if (job) {
job->reply->result = rc; bsg_reply->result = rc;
job->job_done(job); job->job_done(job);
} }
return; return;
@ -385,6 +387,7 @@ lpfc_bsg_send_mgmt_cmd(struct fc_bsg_job *job)
struct lpfc_hba *phba = vport->phba; struct lpfc_hba *phba = vport->phba;
struct lpfc_rport_data *rdata = job->rport->dd_data; struct lpfc_rport_data *rdata = job->rport->dd_data;
struct lpfc_nodelist *ndlp = rdata->pnode; struct lpfc_nodelist *ndlp = rdata->pnode;
struct fc_bsg_reply *bsg_reply = job->reply;
struct ulp_bde64 *bpl = NULL; struct ulp_bde64 *bpl = NULL;
uint32_t timeout; uint32_t timeout;
struct lpfc_iocbq *cmdiocbq = NULL; struct lpfc_iocbq *cmdiocbq = NULL;
@ -399,7 +402,7 @@ lpfc_bsg_send_mgmt_cmd(struct fc_bsg_job *job)
int iocb_stat; int iocb_stat;
/* in case no data is transferred */ /* in case no data is transferred */
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
/* allocate our bsg tracking structure */ /* allocate our bsg tracking structure */
dd_data = kmalloc(sizeof(struct bsg_job_data), GFP_KERNEL); dd_data = kmalloc(sizeof(struct bsg_job_data), GFP_KERNEL);
@ -543,7 +546,7 @@ no_ndlp:
kfree(dd_data); kfree(dd_data);
no_dd_data: no_dd_data:
/* make error code available to userspace */ /* make error code available to userspace */
job->reply->result = rc; bsg_reply->result = rc;
job->dd_data = NULL; job->dd_data = NULL;
return rc; return rc;
} }
@ -572,6 +575,7 @@ lpfc_bsg_rport_els_cmp(struct lpfc_hba *phba,
{ {
struct bsg_job_data *dd_data; struct bsg_job_data *dd_data;
struct fc_bsg_job *job; struct fc_bsg_job *job;
struct fc_bsg_reply *bsg_reply;
IOCB_t *rsp; IOCB_t *rsp;
struct lpfc_nodelist *ndlp; struct lpfc_nodelist *ndlp;
struct lpfc_dmabuf *pcmd = NULL, *prsp = NULL; struct lpfc_dmabuf *pcmd = NULL, *prsp = NULL;
@ -589,6 +593,7 @@ lpfc_bsg_rport_els_cmp(struct lpfc_hba *phba,
spin_lock_irqsave(&phba->ct_ev_lock, flags); spin_lock_irqsave(&phba->ct_ev_lock, flags);
job = dd_data->set_job; job = dd_data->set_job;
if (job) { if (job) {
bsg_reply = job->reply;
/* Prevent timeout handling from trying to abort job */ /* Prevent timeout handling from trying to abort job */
job->dd_data = NULL; job->dd_data = NULL;
} }
@ -610,17 +615,17 @@ lpfc_bsg_rport_els_cmp(struct lpfc_hba *phba,
if (job) { if (job) {
if (rsp->ulpStatus == IOSTAT_SUCCESS) { if (rsp->ulpStatus == IOSTAT_SUCCESS) {
rsp_size = rsp->un.elsreq64.bdl.bdeSize; rsp_size = rsp->un.elsreq64.bdl.bdeSize;
job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
sg_copy_from_buffer(job->reply_payload.sg_list, sg_copy_from_buffer(job->reply_payload.sg_list,
job->reply_payload.sg_cnt, job->reply_payload.sg_cnt,
prsp->virt, prsp->virt,
rsp_size); rsp_size);
} else if (rsp->ulpStatus == IOSTAT_LS_RJT) { } else if (rsp->ulpStatus == IOSTAT_LS_RJT) {
job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
sizeof(struct fc_bsg_ctels_reply); sizeof(struct fc_bsg_ctels_reply);
/* LS_RJT data returned in word 4 */ /* LS_RJT data returned in word 4 */
rjt_data = (uint8_t *)&rsp->un.ulpWord[4]; rjt_data = (uint8_t *)&rsp->un.ulpWord[4];
els_reply = &job->reply->reply_data.ctels_reply; els_reply = &bsg_reply->reply_data.ctels_reply;
els_reply->status = FC_CTELS_STATUS_REJECT; els_reply->status = FC_CTELS_STATUS_REJECT;
els_reply->rjt_data.action = rjt_data[3]; els_reply->rjt_data.action = rjt_data[3];
els_reply->rjt_data.reason_code = rjt_data[2]; els_reply->rjt_data.reason_code = rjt_data[2];
@ -638,7 +643,7 @@ lpfc_bsg_rport_els_cmp(struct lpfc_hba *phba,
/* Complete the job if the job is still active */ /* Complete the job if the job is still active */
if (job) { if (job) {
job->reply->result = rc; bsg_reply->result = rc;
job->job_done(job); job->job_done(job);
} }
return; return;
@ -655,6 +660,8 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job)
struct lpfc_hba *phba = vport->phba; struct lpfc_hba *phba = vport->phba;
struct lpfc_rport_data *rdata = job->rport->dd_data; struct lpfc_rport_data *rdata = job->rport->dd_data;
struct lpfc_nodelist *ndlp = rdata->pnode; struct lpfc_nodelist *ndlp = rdata->pnode;
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
uint32_t elscmd; uint32_t elscmd;
uint32_t cmdsize; uint32_t cmdsize;
struct lpfc_iocbq *cmdiocbq; struct lpfc_iocbq *cmdiocbq;
@ -665,7 +672,7 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job)
int rc = 0; int rc = 0;
/* in case no data is transferred */ /* in case no data is transferred */
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
/* verify the els command is not greater than the /* verify the els command is not greater than the
* maximum ELS transfer size. * maximum ELS transfer size.
@ -685,7 +692,7 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job)
goto no_dd_data; goto no_dd_data;
} }
elscmd = job->request->rqst_data.r_els.els_code; elscmd = bsg_request->rqst_data.r_els.els_code;
cmdsize = job->request_payload.payload_len; cmdsize = job->request_payload.payload_len;
if (!lpfc_nlp_get(ndlp)) { if (!lpfc_nlp_get(ndlp)) {
@ -772,7 +779,7 @@ free_dd_data:
no_dd_data: no_dd_data:
/* make error code available to userspace */ /* make error code available to userspace */
job->reply->result = rc; bsg_reply->result = rc;
job->dd_data = NULL; job->dd_data = NULL;
return rc; return rc;
} }
@ -919,6 +926,7 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
struct lpfc_hbq_entry *hbqe; struct lpfc_hbq_entry *hbqe;
struct lpfc_sli_ct_request *ct_req; struct lpfc_sli_ct_request *ct_req;
struct fc_bsg_job *job = NULL; struct fc_bsg_job *job = NULL;
struct fc_bsg_reply *bsg_reply;
struct bsg_job_data *dd_data = NULL; struct bsg_job_data *dd_data = NULL;
unsigned long flags; unsigned long flags;
int size = 0; int size = 0;
@ -1121,9 +1129,10 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
dd_data->set_job = NULL; dd_data->set_job = NULL;
lpfc_bsg_event_unref(evt); lpfc_bsg_event_unref(evt);
if (job) { if (job) {
job->reply->reply_payload_rcv_len = size; bsg_reply = job->reply;
bsg_reply->reply_payload_rcv_len = size;
/* make error code available to userspace */ /* make error code available to userspace */
job->reply->result = 0; bsg_reply->result = 0;
job->dd_data = NULL; job->dd_data = NULL;
/* complete the job back to userspace */ /* complete the job back to userspace */
spin_unlock_irqrestore(&phba->ct_ev_lock, flags); spin_unlock_irqrestore(&phba->ct_ev_lock, flags);
@ -1192,6 +1201,7 @@ lpfc_bsg_hba_set_event(struct fc_bsg_job *job)
{ {
struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata; struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;
struct lpfc_hba *phba = vport->phba; struct lpfc_hba *phba = vport->phba;
struct fc_bsg_request *bsg_request = job->request;
struct set_ct_event *event_req; struct set_ct_event *event_req;
struct lpfc_bsg_event *evt; struct lpfc_bsg_event *evt;
int rc = 0; int rc = 0;
@ -1209,7 +1219,7 @@ lpfc_bsg_hba_set_event(struct fc_bsg_job *job)
} }
event_req = (struct set_ct_event *) event_req = (struct set_ct_event *)
job->request->rqst_data.h_vendor.vendor_cmd; bsg_request->rqst_data.h_vendor.vendor_cmd;
ev_mask = ((uint32_t)(unsigned long)event_req->type_mask & ev_mask = ((uint32_t)(unsigned long)event_req->type_mask &
FC_REG_EVENT_MASK); FC_REG_EVENT_MASK);
spin_lock_irqsave(&phba->ct_ev_lock, flags); spin_lock_irqsave(&phba->ct_ev_lock, flags);
@ -1276,6 +1286,8 @@ lpfc_bsg_hba_get_event(struct fc_bsg_job *job)
{ {
struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata; struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;
struct lpfc_hba *phba = vport->phba; struct lpfc_hba *phba = vport->phba;
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
struct get_ct_event *event_req; struct get_ct_event *event_req;
struct get_ct_event_reply *event_reply; struct get_ct_event_reply *event_reply;
struct lpfc_bsg_event *evt, *evt_next; struct lpfc_bsg_event *evt, *evt_next;
@ -1293,10 +1305,10 @@ lpfc_bsg_hba_get_event(struct fc_bsg_job *job)
} }
event_req = (struct get_ct_event *) event_req = (struct get_ct_event *)
job->request->rqst_data.h_vendor.vendor_cmd; bsg_request->rqst_data.h_vendor.vendor_cmd;
event_reply = (struct get_ct_event_reply *) event_reply = (struct get_ct_event_reply *)
job->reply->reply_data.vendor_reply.vendor_rsp; bsg_reply->reply_data.vendor_reply.vendor_rsp;
spin_lock_irqsave(&phba->ct_ev_lock, flags); spin_lock_irqsave(&phba->ct_ev_lock, flags);
list_for_each_entry_safe(evt, evt_next, &phba->ct_ev_waiters, node) { list_for_each_entry_safe(evt, evt_next, &phba->ct_ev_waiters, node) {
if (evt->reg_id == event_req->ev_reg_id) { if (evt->reg_id == event_req->ev_reg_id) {
@ -1316,7 +1328,7 @@ lpfc_bsg_hba_get_event(struct fc_bsg_job *job)
* an error indicating that there isn't anymore * an error indicating that there isn't anymore
*/ */
if (evt_dat == NULL) { if (evt_dat == NULL) {
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
rc = -ENOENT; rc = -ENOENT;
goto job_error; goto job_error;
} }
@ -1332,12 +1344,12 @@ lpfc_bsg_hba_get_event(struct fc_bsg_job *job)
event_reply->type = evt_dat->type; event_reply->type = evt_dat->type;
event_reply->immed_data = evt_dat->immed_dat; event_reply->immed_data = evt_dat->immed_dat;
if (evt_dat->len > 0) if (evt_dat->len > 0)
job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
sg_copy_from_buffer(job->request_payload.sg_list, sg_copy_from_buffer(job->request_payload.sg_list,
job->request_payload.sg_cnt, job->request_payload.sg_cnt,
evt_dat->data, evt_dat->len); evt_dat->data, evt_dat->len);
else else
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
if (evt_dat) { if (evt_dat) {
kfree(evt_dat->data); kfree(evt_dat->data);
@ -1348,13 +1360,13 @@ lpfc_bsg_hba_get_event(struct fc_bsg_job *job)
lpfc_bsg_event_unref(evt); lpfc_bsg_event_unref(evt);
spin_unlock_irqrestore(&phba->ct_ev_lock, flags); spin_unlock_irqrestore(&phba->ct_ev_lock, flags);
job->dd_data = NULL; job->dd_data = NULL;
job->reply->result = 0; bsg_reply->result = 0;
job->job_done(job); job->job_done(job);
return 0; return 0;
job_error: job_error:
job->dd_data = NULL; job->dd_data = NULL;
job->reply->result = rc; bsg_reply->result = rc;
return rc; return rc;
} }
@ -1382,6 +1394,7 @@ lpfc_issue_ct_rsp_cmp(struct lpfc_hba *phba,
{ {
struct bsg_job_data *dd_data; struct bsg_job_data *dd_data;
struct fc_bsg_job *job; struct fc_bsg_job *job;
struct fc_bsg_reply *bsg_reply;
IOCB_t *rsp; IOCB_t *rsp;
struct lpfc_dmabuf *bmp, *cmp; struct lpfc_dmabuf *bmp, *cmp;
struct lpfc_nodelist *ndlp; struct lpfc_nodelist *ndlp;
@ -1412,6 +1425,7 @@ lpfc_issue_ct_rsp_cmp(struct lpfc_hba *phba,
/* Copy the completed job data or set the error status */ /* Copy the completed job data or set the error status */
if (job) { if (job) {
bsg_reply = job->reply;
if (rsp->ulpStatus) { if (rsp->ulpStatus) {
if (rsp->ulpStatus == IOSTAT_LOCAL_REJECT) { if (rsp->ulpStatus == IOSTAT_LOCAL_REJECT) {
switch (rsp->un.ulpWord[4] & IOERR_PARAM_MASK) { switch (rsp->un.ulpWord[4] & IOERR_PARAM_MASK) {
@ -1429,7 +1443,7 @@ lpfc_issue_ct_rsp_cmp(struct lpfc_hba *phba,
rc = -EACCES; rc = -EACCES;
} }
} else { } else {
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
} }
} }
@ -1443,7 +1457,7 @@ lpfc_issue_ct_rsp_cmp(struct lpfc_hba *phba,
/* Complete the job if the job is still active */ /* Complete the job if the job is still active */
if (job) { if (job) {
job->reply->result = rc; bsg_reply->result = rc;
job->job_done(job); job->job_done(job);
} }
return; return;
@ -1608,8 +1622,10 @@ lpfc_bsg_send_mgmt_rsp(struct fc_bsg_job *job)
{ {
struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata; struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;
struct lpfc_hba *phba = vport->phba; struct lpfc_hba *phba = vport->phba;
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
struct send_mgmt_resp *mgmt_resp = (struct send_mgmt_resp *) struct send_mgmt_resp *mgmt_resp = (struct send_mgmt_resp *)
job->request->rqst_data.h_vendor.vendor_cmd; bsg_request->rqst_data.h_vendor.vendor_cmd;
struct ulp_bde64 *bpl; struct ulp_bde64 *bpl;
struct lpfc_dmabuf *bmp = NULL, *cmp = NULL; struct lpfc_dmabuf *bmp = NULL, *cmp = NULL;
int bpl_entries; int bpl_entries;
@ -1619,7 +1635,7 @@ lpfc_bsg_send_mgmt_rsp(struct fc_bsg_job *job)
int rc = 0; int rc = 0;
/* in case no data is transferred */ /* in case no data is transferred */
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
if (!reqbfrcnt || (reqbfrcnt > (80 * BUF_SZ_4K))) { if (!reqbfrcnt || (reqbfrcnt > (80 * BUF_SZ_4K))) {
rc = -ERANGE; rc = -ERANGE;
@ -1665,7 +1681,7 @@ send_mgmt_rsp_free_bmp:
kfree(bmp); kfree(bmp);
send_mgmt_rsp_exit: send_mgmt_rsp_exit:
/* make error code available to userspace */ /* make error code available to userspace */
job->reply->result = rc; bsg_reply->result = rc;
job->dd_data = NULL; job->dd_data = NULL;
return rc; return rc;
} }
@ -1763,6 +1779,8 @@ lpfc_bsg_diag_mode_exit(struct lpfc_hba *phba)
static int static int
lpfc_sli3_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job) lpfc_sli3_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job)
{ {
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
struct diag_mode_set *loopback_mode; struct diag_mode_set *loopback_mode;
uint32_t link_flags; uint32_t link_flags;
uint32_t timeout; uint32_t timeout;
@ -1772,7 +1790,7 @@ lpfc_sli3_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job)
int rc = 0; int rc = 0;
/* no data to return just the return code */ /* no data to return just the return code */
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
if (job->request_len < sizeof(struct fc_bsg_request) + if (job->request_len < sizeof(struct fc_bsg_request) +
sizeof(struct diag_mode_set)) { sizeof(struct diag_mode_set)) {
@ -1792,7 +1810,7 @@ lpfc_sli3_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job)
/* bring the link to diagnostic mode */ /* bring the link to diagnostic mode */
loopback_mode = (struct diag_mode_set *) loopback_mode = (struct diag_mode_set *)
job->request->rqst_data.h_vendor.vendor_cmd; bsg_request->rqst_data.h_vendor.vendor_cmd;
link_flags = loopback_mode->type; link_flags = loopback_mode->type;
timeout = loopback_mode->timeout * 100; timeout = loopback_mode->timeout * 100;
@ -1865,7 +1883,7 @@ loopback_mode_exit:
job_error: job_error:
/* make error code available to userspace */ /* make error code available to userspace */
job->reply->result = rc; bsg_reply->result = rc;
/* complete the job back to userspace if no error */ /* complete the job back to userspace if no error */
if (rc == 0) if (rc == 0)
job->job_done(job); job->job_done(job);
@ -2018,12 +2036,14 @@ lpfc_sli4_diag_fcport_reg_setup(struct lpfc_hba *phba)
static int static int
lpfc_sli4_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job) lpfc_sli4_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job)
{ {
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
struct diag_mode_set *loopback_mode; struct diag_mode_set *loopback_mode;
uint32_t link_flags, timeout; uint32_t link_flags, timeout;
int i, rc = 0; int i, rc = 0;
/* no data to return just the return code */ /* no data to return just the return code */
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
if (job->request_len < sizeof(struct fc_bsg_request) + if (job->request_len < sizeof(struct fc_bsg_request) +
sizeof(struct diag_mode_set)) { sizeof(struct diag_mode_set)) {
@ -2055,7 +2075,7 @@ lpfc_sli4_bsg_diag_loopback_mode(struct lpfc_hba *phba, struct fc_bsg_job *job)
lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC, lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,
"3129 Bring link to diagnostic state.\n"); "3129 Bring link to diagnostic state.\n");
loopback_mode = (struct diag_mode_set *) loopback_mode = (struct diag_mode_set *)
job->request->rqst_data.h_vendor.vendor_cmd; bsg_request->rqst_data.h_vendor.vendor_cmd;
link_flags = loopback_mode->type; link_flags = loopback_mode->type;
timeout = loopback_mode->timeout * 100; timeout = loopback_mode->timeout * 100;
@ -2152,7 +2172,7 @@ loopback_mode_exit:
job_error: job_error:
/* make error code available to userspace */ /* make error code available to userspace */
job->reply->result = rc; bsg_reply->result = rc;
/* complete the job back to userspace if no error */ /* complete the job back to userspace if no error */
if (rc == 0) if (rc == 0)
job->job_done(job); job->job_done(job);
@ -2205,6 +2225,8 @@ lpfc_bsg_diag_loopback_mode(struct fc_bsg_job *job)
static int static int
lpfc_sli4_bsg_diag_mode_end(struct fc_bsg_job *job) lpfc_sli4_bsg_diag_mode_end(struct fc_bsg_job *job)
{ {
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
struct Scsi_Host *shost; struct Scsi_Host *shost;
struct lpfc_vport *vport; struct lpfc_vport *vport;
struct lpfc_hba *phba; struct lpfc_hba *phba;
@ -2233,7 +2255,7 @@ lpfc_sli4_bsg_diag_mode_end(struct fc_bsg_job *job)
phba->link_flag &= ~LS_LOOPBACK_MODE; phba->link_flag &= ~LS_LOOPBACK_MODE;
spin_unlock_irq(&phba->hbalock); spin_unlock_irq(&phba->hbalock);
loopback_mode_end_cmd = (struct diag_mode_set *) loopback_mode_end_cmd = (struct diag_mode_set *)
job->request->rqst_data.h_vendor.vendor_cmd; bsg_request->rqst_data.h_vendor.vendor_cmd;
timeout = loopback_mode_end_cmd->timeout * 100; timeout = loopback_mode_end_cmd->timeout * 100;
rc = lpfc_sli4_bsg_set_link_diag_state(phba, 0); rc = lpfc_sli4_bsg_set_link_diag_state(phba, 0);
@ -2264,7 +2286,7 @@ lpfc_sli4_bsg_diag_mode_end(struct fc_bsg_job *job)
loopback_mode_end_exit: loopback_mode_end_exit:
/* make return code available to userspace */ /* make return code available to userspace */
job->reply->result = rc; bsg_reply->result = rc;
/* complete the job back to userspace if no error */ /* complete the job back to userspace if no error */
if (rc == 0) if (rc == 0)
job->job_done(job); job->job_done(job);
@ -2281,6 +2303,8 @@ loopback_mode_end_exit:
static int static int
lpfc_sli4_bsg_link_diag_test(struct fc_bsg_job *job) lpfc_sli4_bsg_link_diag_test(struct fc_bsg_job *job)
{ {
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
struct Scsi_Host *shost; struct Scsi_Host *shost;
struct lpfc_vport *vport; struct lpfc_vport *vport;
struct lpfc_hba *phba; struct lpfc_hba *phba;
@ -2336,7 +2360,7 @@ lpfc_sli4_bsg_link_diag_test(struct fc_bsg_job *job)
goto job_error; goto job_error;
link_diag_test_cmd = (struct sli4_link_diag *) link_diag_test_cmd = (struct sli4_link_diag *)
job->request->rqst_data.h_vendor.vendor_cmd; bsg_request->rqst_data.h_vendor.vendor_cmd;
rc = lpfc_sli4_bsg_set_link_diag_state(phba, 1); rc = lpfc_sli4_bsg_set_link_diag_state(phba, 1);
@ -2386,7 +2410,7 @@ lpfc_sli4_bsg_link_diag_test(struct fc_bsg_job *job)
} }
diag_status_reply = (struct diag_status *) diag_status_reply = (struct diag_status *)
job->reply->reply_data.vendor_reply.vendor_rsp; bsg_reply->reply_data.vendor_reply.vendor_rsp;
if (job->reply_len < if (job->reply_len <
sizeof(struct fc_bsg_request) + sizeof(struct diag_status)) { sizeof(struct fc_bsg_request) + sizeof(struct diag_status)) {
@ -2414,7 +2438,7 @@ link_diag_test_exit:
job_error: job_error:
/* make error code available to userspace */ /* make error code available to userspace */
job->reply->result = rc; bsg_reply->result = rc;
/* complete the job back to userspace if no error */ /* complete the job back to userspace if no error */
if (rc == 0) if (rc == 0)
job->job_done(job); job->job_done(job);
@ -2986,6 +3010,7 @@ static int
lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job) lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)
{ {
struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata; struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;
struct fc_bsg_reply *bsg_reply = job->reply;
struct lpfc_hba *phba = vport->phba; struct lpfc_hba *phba = vport->phba;
struct lpfc_bsg_event *evt; struct lpfc_bsg_event *evt;
struct event_data *evdat; struct event_data *evdat;
@ -3013,7 +3038,7 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)
uint32_t total_mem; uint32_t total_mem;
/* in case no data is returned return just the return code */ /* in case no data is returned return just the return code */
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
if (job->request_len < if (job->request_len <
sizeof(struct fc_bsg_request) + sizeof(struct diag_mode_test)) { sizeof(struct fc_bsg_request) + sizeof(struct diag_mode_test)) {
@ -3238,11 +3263,11 @@ lpfc_bsg_diag_loopback_run(struct fc_bsg_job *job)
rc = IOCB_SUCCESS; rc = IOCB_SUCCESS;
/* skip over elx loopback header */ /* skip over elx loopback header */
rx_databuf += ELX_LOOPBACK_HEADER_SZ; rx_databuf += ELX_LOOPBACK_HEADER_SZ;
job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
sg_copy_from_buffer(job->reply_payload.sg_list, sg_copy_from_buffer(job->reply_payload.sg_list,
job->reply_payload.sg_cnt, job->reply_payload.sg_cnt,
rx_databuf, size); rx_databuf, size);
job->reply->reply_payload_rcv_len = size; bsg_reply->reply_payload_rcv_len = size;
} }
} }
@ -3272,7 +3297,7 @@ err_loopback_test_exit:
loopback_test_exit: loopback_test_exit:
kfree(dataout); kfree(dataout);
/* make error code available to userspace */ /* make error code available to userspace */
job->reply->result = rc; bsg_reply->result = rc;
job->dd_data = NULL; job->dd_data = NULL;
/* complete the job back to userspace if no error */ /* complete the job back to userspace if no error */
if (rc == IOCB_SUCCESS) if (rc == IOCB_SUCCESS)
@ -3288,6 +3313,7 @@ static int
lpfc_bsg_get_dfc_rev(struct fc_bsg_job *job) lpfc_bsg_get_dfc_rev(struct fc_bsg_job *job)
{ {
struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata; struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;
struct fc_bsg_reply *bsg_reply = job->reply;
struct lpfc_hba *phba = vport->phba; struct lpfc_hba *phba = vport->phba;
struct get_mgmt_rev_reply *event_reply; struct get_mgmt_rev_reply *event_reply;
int rc = 0; int rc = 0;
@ -3302,7 +3328,7 @@ lpfc_bsg_get_dfc_rev(struct fc_bsg_job *job)
} }
event_reply = (struct get_mgmt_rev_reply *) event_reply = (struct get_mgmt_rev_reply *)
job->reply->reply_data.vendor_reply.vendor_rsp; bsg_reply->reply_data.vendor_reply.vendor_rsp;
if (job->reply_len < if (job->reply_len <
sizeof(struct fc_bsg_request) + sizeof(struct get_mgmt_rev_reply)) { sizeof(struct fc_bsg_request) + sizeof(struct get_mgmt_rev_reply)) {
@ -3316,7 +3342,7 @@ lpfc_bsg_get_dfc_rev(struct fc_bsg_job *job)
event_reply->info.a_Major = MANAGEMENT_MAJOR_REV; event_reply->info.a_Major = MANAGEMENT_MAJOR_REV;
event_reply->info.a_Minor = MANAGEMENT_MINOR_REV; event_reply->info.a_Minor = MANAGEMENT_MINOR_REV;
job_error: job_error:
job->reply->result = rc; bsg_reply->result = rc;
if (rc == 0) if (rc == 0)
job->job_done(job); job->job_done(job);
return rc; return rc;
@ -3337,6 +3363,7 @@ static void
lpfc_bsg_issue_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq) lpfc_bsg_issue_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)
{ {
struct bsg_job_data *dd_data; struct bsg_job_data *dd_data;
struct fc_bsg_reply *bsg_reply;
struct fc_bsg_job *job; struct fc_bsg_job *job;
uint32_t size; uint32_t size;
unsigned long flags; unsigned long flags;
@ -3365,8 +3392,9 @@ lpfc_bsg_issue_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)
/* Copy the mailbox data to the job if it is still active */ /* Copy the mailbox data to the job if it is still active */
if (job) { if (job) {
bsg_reply = job->reply;
size = job->reply_payload.payload_len; size = job->reply_payload.payload_len;
job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
sg_copy_from_buffer(job->reply_payload.sg_list, sg_copy_from_buffer(job->reply_payload.sg_list,
job->reply_payload.sg_cnt, job->reply_payload.sg_cnt,
pmb_buf, size); pmb_buf, size);
@ -3380,7 +3408,7 @@ lpfc_bsg_issue_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)
/* Complete the job if the job is still active */ /* Complete the job if the job is still active */
if (job) { if (job) {
job->reply->result = 0; bsg_reply->result = 0;
job->job_done(job); job->job_done(job);
} }
return; return;
@ -3516,6 +3544,7 @@ lpfc_bsg_issue_mbox_ext_handle_job(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)
{ {
struct bsg_job_data *dd_data; struct bsg_job_data *dd_data;
struct fc_bsg_job *job; struct fc_bsg_job *job;
struct fc_bsg_reply *bsg_reply;
uint8_t *pmb, *pmb_buf; uint8_t *pmb, *pmb_buf;
unsigned long flags; unsigned long flags;
uint32_t size; uint32_t size;
@ -3530,6 +3559,7 @@ lpfc_bsg_issue_mbox_ext_handle_job(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)
spin_lock_irqsave(&phba->ct_ev_lock, flags); spin_lock_irqsave(&phba->ct_ev_lock, flags);
job = dd_data->set_job; job = dd_data->set_job;
if (job) { if (job) {
bsg_reply = job->reply;
/* Prevent timeout handling from trying to abort job */ /* Prevent timeout handling from trying to abort job */
job->dd_data = NULL; job->dd_data = NULL;
} }
@ -3560,13 +3590,13 @@ lpfc_bsg_issue_mbox_ext_handle_job(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)
if (job) { if (job) {
size = job->reply_payload.payload_len; size = job->reply_payload.payload_len;
job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
sg_copy_from_buffer(job->reply_payload.sg_list, sg_copy_from_buffer(job->reply_payload.sg_list,
job->reply_payload.sg_cnt, job->reply_payload.sg_cnt,
pmb_buf, size); pmb_buf, size);
/* result for successful */ /* result for successful */
job->reply->result = 0; bsg_reply->result = 0;
lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC, lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,
"2937 SLI_CONFIG ext-buffer maibox command " "2937 SLI_CONFIG ext-buffer maibox command "
@ -3773,6 +3803,7 @@ lpfc_bsg_sli_cfg_read_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,
enum nemb_type nemb_tp, enum nemb_type nemb_tp,
struct lpfc_dmabuf *dmabuf) struct lpfc_dmabuf *dmabuf)
{ {
struct fc_bsg_request *bsg_request = job->request;
struct lpfc_sli_config_mbox *sli_cfg_mbx; struct lpfc_sli_config_mbox *sli_cfg_mbx;
struct dfc_mbox_req *mbox_req; struct dfc_mbox_req *mbox_req;
struct lpfc_dmabuf *curr_dmabuf, *next_dmabuf; struct lpfc_dmabuf *curr_dmabuf, *next_dmabuf;
@ -3785,7 +3816,7 @@ lpfc_bsg_sli_cfg_read_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,
int rc, i; int rc, i;
mbox_req = mbox_req =
(struct dfc_mbox_req *)job->request->rqst_data.h_vendor.vendor_cmd; (struct dfc_mbox_req *)bsg_request->rqst_data.h_vendor.vendor_cmd;
/* pointer to the start of mailbox command */ /* pointer to the start of mailbox command */
sli_cfg_mbx = (struct lpfc_sli_config_mbox *)dmabuf->virt; sli_cfg_mbx = (struct lpfc_sli_config_mbox *)dmabuf->virt;
@ -3960,6 +3991,8 @@ lpfc_bsg_sli_cfg_write_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,
enum nemb_type nemb_tp, enum nemb_type nemb_tp,
struct lpfc_dmabuf *dmabuf) struct lpfc_dmabuf *dmabuf)
{ {
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
struct dfc_mbox_req *mbox_req; struct dfc_mbox_req *mbox_req;
struct lpfc_sli_config_mbox *sli_cfg_mbx; struct lpfc_sli_config_mbox *sli_cfg_mbx;
uint32_t ext_buf_cnt; uint32_t ext_buf_cnt;
@ -3970,7 +4003,7 @@ lpfc_bsg_sli_cfg_write_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,
int rc = SLI_CONFIG_NOT_HANDLED, i; int rc = SLI_CONFIG_NOT_HANDLED, i;
mbox_req = mbox_req =
(struct dfc_mbox_req *)job->request->rqst_data.h_vendor.vendor_cmd; (struct dfc_mbox_req *)bsg_request->rqst_data.h_vendor.vendor_cmd;
/* pointer to the start of mailbox command */ /* pointer to the start of mailbox command */
sli_cfg_mbx = (struct lpfc_sli_config_mbox *)dmabuf->virt; sli_cfg_mbx = (struct lpfc_sli_config_mbox *)dmabuf->virt;
@ -4097,7 +4130,7 @@ lpfc_bsg_sli_cfg_write_cmd_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,
/* wait for additoinal external buffers */ /* wait for additoinal external buffers */
job->reply->result = 0; bsg_reply->result = 0;
job->job_done(job); job->job_done(job);
return SLI_CONFIG_HANDLED; return SLI_CONFIG_HANDLED;
@ -4271,6 +4304,7 @@ lpfc_bsg_mbox_ext_abort(struct lpfc_hba *phba)
static int static int
lpfc_bsg_read_ebuf_get(struct lpfc_hba *phba, struct fc_bsg_job *job) lpfc_bsg_read_ebuf_get(struct lpfc_hba *phba, struct fc_bsg_job *job)
{ {
struct fc_bsg_reply *bsg_reply = job->reply;
struct lpfc_sli_config_mbox *sli_cfg_mbx; struct lpfc_sli_config_mbox *sli_cfg_mbx;
struct lpfc_dmabuf *dmabuf; struct lpfc_dmabuf *dmabuf;
uint8_t *pbuf; uint8_t *pbuf;
@ -4308,7 +4342,7 @@ lpfc_bsg_read_ebuf_get(struct lpfc_hba *phba, struct fc_bsg_job *job)
dmabuf, index); dmabuf, index);
pbuf = (uint8_t *)dmabuf->virt; pbuf = (uint8_t *)dmabuf->virt;
job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
sg_copy_from_buffer(job->reply_payload.sg_list, sg_copy_from_buffer(job->reply_payload.sg_list,
job->reply_payload.sg_cnt, job->reply_payload.sg_cnt,
pbuf, size); pbuf, size);
@ -4322,7 +4356,7 @@ lpfc_bsg_read_ebuf_get(struct lpfc_hba *phba, struct fc_bsg_job *job)
lpfc_bsg_mbox_ext_session_reset(phba); lpfc_bsg_mbox_ext_session_reset(phba);
} }
job->reply->result = 0; bsg_reply->result = 0;
job->job_done(job); job->job_done(job);
return SLI_CONFIG_HANDLED; return SLI_CONFIG_HANDLED;
@ -4340,6 +4374,7 @@ static int
lpfc_bsg_write_ebuf_set(struct lpfc_hba *phba, struct fc_bsg_job *job, lpfc_bsg_write_ebuf_set(struct lpfc_hba *phba, struct fc_bsg_job *job,
struct lpfc_dmabuf *dmabuf) struct lpfc_dmabuf *dmabuf)
{ {
struct fc_bsg_reply *bsg_reply = job->reply;
struct bsg_job_data *dd_data = NULL; struct bsg_job_data *dd_data = NULL;
LPFC_MBOXQ_t *pmboxq = NULL; LPFC_MBOXQ_t *pmboxq = NULL;
MAILBOX_t *pmb; MAILBOX_t *pmb;
@ -4437,7 +4472,7 @@ lpfc_bsg_write_ebuf_set(struct lpfc_hba *phba, struct fc_bsg_job *job,
} }
/* wait for additoinal external buffers */ /* wait for additoinal external buffers */
job->reply->result = 0; bsg_reply->result = 0;
job->job_done(job); job->job_done(job);
return SLI_CONFIG_HANDLED; return SLI_CONFIG_HANDLED;
@ -4506,11 +4541,12 @@ static int
lpfc_bsg_handle_sli_cfg_ext(struct lpfc_hba *phba, struct fc_bsg_job *job, lpfc_bsg_handle_sli_cfg_ext(struct lpfc_hba *phba, struct fc_bsg_job *job,
struct lpfc_dmabuf *dmabuf) struct lpfc_dmabuf *dmabuf)
{ {
struct fc_bsg_request *bsg_request = job->request;
struct dfc_mbox_req *mbox_req; struct dfc_mbox_req *mbox_req;
int rc = SLI_CONFIG_NOT_HANDLED; int rc = SLI_CONFIG_NOT_HANDLED;
mbox_req = mbox_req =
(struct dfc_mbox_req *)job->request->rqst_data.h_vendor.vendor_cmd; (struct dfc_mbox_req *)bsg_request->rqst_data.h_vendor.vendor_cmd;
/* mbox command with/without single external buffer */ /* mbox command with/without single external buffer */
if (mbox_req->extMboxTag == 0 && mbox_req->extSeqNum == 0) if (mbox_req->extMboxTag == 0 && mbox_req->extSeqNum == 0)
@ -4583,6 +4619,8 @@ static int
lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job, lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job,
struct lpfc_vport *vport) struct lpfc_vport *vport)
{ {
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
LPFC_MBOXQ_t *pmboxq = NULL; /* internal mailbox queue */ LPFC_MBOXQ_t *pmboxq = NULL; /* internal mailbox queue */
MAILBOX_t *pmb; /* shortcut to the pmboxq mailbox */ MAILBOX_t *pmb; /* shortcut to the pmboxq mailbox */
/* a 4k buffer to hold the mb and extended data from/to the bsg */ /* a 4k buffer to hold the mb and extended data from/to the bsg */
@ -4601,7 +4639,7 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job,
uint32_t size; uint32_t size;
/* in case no data is transferred */ /* in case no data is transferred */
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
/* sanity check to protect driver */ /* sanity check to protect driver */
if (job->reply_payload.payload_len > BSG_MBOX_SIZE || if (job->reply_payload.payload_len > BSG_MBOX_SIZE ||
@ -4620,7 +4658,7 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job,
} }
mbox_req = mbox_req =
(struct dfc_mbox_req *)job->request->rqst_data.h_vendor.vendor_cmd; (struct dfc_mbox_req *)bsg_request->rqst_data.h_vendor.vendor_cmd;
/* check if requested extended data lengths are valid */ /* check if requested extended data lengths are valid */
if ((mbox_req->inExtWLen > BSG_MBOX_SIZE/sizeof(uint32_t)) || if ((mbox_req->inExtWLen > BSG_MBOX_SIZE/sizeof(uint32_t)) ||
@ -4842,7 +4880,7 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct fc_bsg_job *job,
/* job finished, copy the data */ /* job finished, copy the data */
memcpy(pmbx, pmb, sizeof(*pmb)); memcpy(pmbx, pmb, sizeof(*pmb));
job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
sg_copy_from_buffer(job->reply_payload.sg_list, sg_copy_from_buffer(job->reply_payload.sg_list,
job->reply_payload.sg_cnt, job->reply_payload.sg_cnt,
pmbx, size); pmbx, size);
@ -4874,12 +4912,14 @@ static int
lpfc_bsg_mbox_cmd(struct fc_bsg_job *job) lpfc_bsg_mbox_cmd(struct fc_bsg_job *job)
{ {
struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata; struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
struct lpfc_hba *phba = vport->phba; struct lpfc_hba *phba = vport->phba;
struct dfc_mbox_req *mbox_req; struct dfc_mbox_req *mbox_req;
int rc = 0; int rc = 0;
/* mix-and-match backward compatibility */ /* mix-and-match backward compatibility */
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
if (job->request_len < if (job->request_len <
sizeof(struct fc_bsg_request) + sizeof(struct dfc_mbox_req)) { sizeof(struct fc_bsg_request) + sizeof(struct dfc_mbox_req)) {
lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC, lpfc_printf_log(phba, KERN_INFO, LOG_LIBDFC,
@ -4890,7 +4930,7 @@ lpfc_bsg_mbox_cmd(struct fc_bsg_job *job)
sizeof(struct fc_bsg_request)), sizeof(struct fc_bsg_request)),
(int)sizeof(struct dfc_mbox_req)); (int)sizeof(struct dfc_mbox_req));
mbox_req = (struct dfc_mbox_req *) mbox_req = (struct dfc_mbox_req *)
job->request->rqst_data.h_vendor.vendor_cmd; bsg_request->rqst_data.h_vendor.vendor_cmd;
mbox_req->extMboxTag = 0; mbox_req->extMboxTag = 0;
mbox_req->extSeqNum = 0; mbox_req->extSeqNum = 0;
} }
@ -4899,7 +4939,7 @@ lpfc_bsg_mbox_cmd(struct fc_bsg_job *job)
if (rc == 0) { if (rc == 0) {
/* job done */ /* job done */
job->reply->result = 0; bsg_reply->result = 0;
job->dd_data = NULL; job->dd_data = NULL;
job->job_done(job); job->job_done(job);
} else if (rc == 1) } else if (rc == 1)
@ -4907,7 +4947,7 @@ lpfc_bsg_mbox_cmd(struct fc_bsg_job *job)
rc = 0; /* return zero, no error */ rc = 0; /* return zero, no error */
else { else {
/* some error occurred */ /* some error occurred */
job->reply->result = rc; bsg_reply->result = rc;
job->dd_data = NULL; job->dd_data = NULL;
} }
@ -4938,6 +4978,7 @@ lpfc_bsg_menlo_cmd_cmp(struct lpfc_hba *phba,
{ {
struct bsg_job_data *dd_data; struct bsg_job_data *dd_data;
struct fc_bsg_job *job; struct fc_bsg_job *job;
struct fc_bsg_reply *bsg_reply;
IOCB_t *rsp; IOCB_t *rsp;
struct lpfc_dmabuf *bmp, *cmp, *rmp; struct lpfc_dmabuf *bmp, *cmp, *rmp;
struct lpfc_bsg_menlo *menlo; struct lpfc_bsg_menlo *menlo;
@ -4957,6 +4998,7 @@ lpfc_bsg_menlo_cmd_cmp(struct lpfc_hba *phba,
spin_lock_irqsave(&phba->ct_ev_lock, flags); spin_lock_irqsave(&phba->ct_ev_lock, flags);
job = dd_data->set_job; job = dd_data->set_job;
if (job) { if (job) {
bsg_reply = job->reply;
/* Prevent timeout handling from trying to abort job */ /* Prevent timeout handling from trying to abort job */
job->dd_data = NULL; job->dd_data = NULL;
} }
@ -4971,7 +5013,7 @@ lpfc_bsg_menlo_cmd_cmp(struct lpfc_hba *phba,
*/ */
menlo_resp = (struct menlo_response *) menlo_resp = (struct menlo_response *)
job->reply->reply_data.vendor_reply.vendor_rsp; bsg_reply->reply_data.vendor_reply.vendor_rsp;
menlo_resp->xri = rsp->ulpContext; menlo_resp->xri = rsp->ulpContext;
if (rsp->ulpStatus) { if (rsp->ulpStatus) {
if (rsp->ulpStatus == IOSTAT_LOCAL_REJECT) { if (rsp->ulpStatus == IOSTAT_LOCAL_REJECT) {
@ -4991,7 +5033,7 @@ lpfc_bsg_menlo_cmd_cmp(struct lpfc_hba *phba,
} }
} else { } else {
rsp_size = rsp->un.genreq64.bdl.bdeSize; rsp_size = rsp->un.genreq64.bdl.bdeSize;
job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
lpfc_bsg_copy_data(rmp, &job->reply_payload, lpfc_bsg_copy_data(rmp, &job->reply_payload,
rsp_size, 0); rsp_size, 0);
} }
@ -5008,7 +5050,7 @@ lpfc_bsg_menlo_cmd_cmp(struct lpfc_hba *phba,
/* Complete the job if active */ /* Complete the job if active */
if (job) { if (job) {
job->reply->result = rc; bsg_reply->result = rc;
job->job_done(job); job->job_done(job);
} }
@ -5028,6 +5070,8 @@ static int
lpfc_menlo_cmd(struct fc_bsg_job *job) lpfc_menlo_cmd(struct fc_bsg_job *job)
{ {
struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata; struct lpfc_vport *vport = (struct lpfc_vport *)job->shost->hostdata;
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
struct lpfc_hba *phba = vport->phba; struct lpfc_hba *phba = vport->phba;
struct lpfc_iocbq *cmdiocbq; struct lpfc_iocbq *cmdiocbq;
IOCB_t *cmd; IOCB_t *cmd;
@ -5040,7 +5084,7 @@ lpfc_menlo_cmd(struct fc_bsg_job *job)
struct ulp_bde64 *bpl = NULL; struct ulp_bde64 *bpl = NULL;
/* in case no data is returned return just the return code */ /* in case no data is returned return just the return code */
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
if (job->request_len < if (job->request_len <
sizeof(struct fc_bsg_request) + sizeof(struct fc_bsg_request) +
@ -5070,7 +5114,7 @@ lpfc_menlo_cmd(struct fc_bsg_job *job)
} }
menlo_cmd = (struct menlo_command *) menlo_cmd = (struct menlo_command *)
job->request->rqst_data.h_vendor.vendor_cmd; bsg_request->rqst_data.h_vendor.vendor_cmd;
/* allocate our bsg tracking structure */ /* allocate our bsg tracking structure */
dd_data = kmalloc(sizeof(struct bsg_job_data), GFP_KERNEL); dd_data = kmalloc(sizeof(struct bsg_job_data), GFP_KERNEL);
@ -5181,7 +5225,7 @@ free_dd:
kfree(dd_data); kfree(dd_data);
no_dd_data: no_dd_data:
/* make error code available to userspace */ /* make error code available to userspace */
job->reply->result = rc; bsg_reply->result = rc;
job->dd_data = NULL; job->dd_data = NULL;
return rc; return rc;
} }
@ -5192,6 +5236,7 @@ lpfc_forced_link_speed(struct fc_bsg_job *job)
struct Scsi_Host *shost = job->shost; struct Scsi_Host *shost = job->shost;
struct lpfc_vport *vport = shost_priv(shost); struct lpfc_vport *vport = shost_priv(shost);
struct lpfc_hba *phba = vport->phba; struct lpfc_hba *phba = vport->phba;
struct fc_bsg_reply *bsg_reply = job->reply;
struct forced_link_speed_support_reply *forced_reply; struct forced_link_speed_support_reply *forced_reply;
int rc = 0; int rc = 0;
@ -5206,7 +5251,7 @@ lpfc_forced_link_speed(struct fc_bsg_job *job)
} }
forced_reply = (struct forced_link_speed_support_reply *) forced_reply = (struct forced_link_speed_support_reply *)
job->reply->reply_data.vendor_reply.vendor_rsp; bsg_reply->reply_data.vendor_reply.vendor_rsp;
if (job->reply_len < if (job->reply_len <
sizeof(struct fc_bsg_request) + sizeof(struct fc_bsg_request) +
@ -5222,7 +5267,7 @@ lpfc_forced_link_speed(struct fc_bsg_job *job)
? LPFC_FORCED_LINK_SPEED_SUPPORTED ? LPFC_FORCED_LINK_SPEED_SUPPORTED
: LPFC_FORCED_LINK_SPEED_NOT_SUPPORTED; : LPFC_FORCED_LINK_SPEED_NOT_SUPPORTED;
job_error: job_error:
job->reply->result = rc; bsg_reply->result = rc;
if (rc == 0) if (rc == 0)
job->job_done(job); job->job_done(job);
return rc; return rc;
@ -5235,7 +5280,9 @@ job_error:
static int static int
lpfc_bsg_hst_vendor(struct fc_bsg_job *job) lpfc_bsg_hst_vendor(struct fc_bsg_job *job)
{ {
int command = job->request->rqst_data.h_vendor.vendor_cmd[0]; struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
int command = bsg_request->rqst_data.h_vendor.vendor_cmd[0];
int rc; int rc;
switch (command) { switch (command) {
@ -5275,9 +5322,9 @@ lpfc_bsg_hst_vendor(struct fc_bsg_job *job)
break; break;
default: default:
rc = -EINVAL; rc = -EINVAL;
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
/* make error code available to userspace */ /* make error code available to userspace */
job->reply->result = rc; bsg_reply->result = rc;
break; break;
} }
@ -5291,10 +5338,12 @@ lpfc_bsg_hst_vendor(struct fc_bsg_job *job)
int int
lpfc_bsg_request(struct fc_bsg_job *job) lpfc_bsg_request(struct fc_bsg_job *job)
{ {
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
uint32_t msgcode; uint32_t msgcode;
int rc; int rc;
msgcode = job->request->msgcode; msgcode = bsg_request->msgcode;
switch (msgcode) { switch (msgcode) {
case FC_BSG_HST_VENDOR: case FC_BSG_HST_VENDOR:
rc = lpfc_bsg_hst_vendor(job); rc = lpfc_bsg_hst_vendor(job);
@ -5307,9 +5356,9 @@ lpfc_bsg_request(struct fc_bsg_job *job)
break; break;
default: default:
rc = -EINVAL; rc = -EINVAL;
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
/* make error code available to userspace */ /* make error code available to userspace */
job->reply->result = rc; bsg_reply->result = rc;
break; break;
} }

260
drivers/scsi/qla2xxx/qla_bsg.c
View File

@ -17,8 +17,9 @@ qla2x00_bsg_job_done(void *data, void *ptr, int res)
srb_t *sp = (srb_t *)ptr; srb_t *sp = (srb_t *)ptr;
struct scsi_qla_host *vha = (scsi_qla_host_t *)data; struct scsi_qla_host *vha = (scsi_qla_host_t *)data;
struct fc_bsg_job *bsg_job = sp->u.bsg_job; struct fc_bsg_job *bsg_job = sp->u.bsg_job;
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
bsg_job->reply->result = res; bsg_reply->result = res;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
sp->free(vha, sp); sp->free(vha, sp);
} }
@ -29,12 +30,14 @@ qla2x00_bsg_sp_free(void *data, void *ptr)
srb_t *sp = (srb_t *)ptr; srb_t *sp = (srb_t *)ptr;
struct scsi_qla_host *vha = sp->fcport->vha; struct scsi_qla_host *vha = sp->fcport->vha;
struct fc_bsg_job *bsg_job = sp->u.bsg_job; struct fc_bsg_job *bsg_job = sp->u.bsg_job;
struct fc_bsg_request *bsg_request = bsg_job->request;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
struct qla_mt_iocb_rqst_fx00 *piocb_rqst; struct qla_mt_iocb_rqst_fx00 *piocb_rqst;
if (sp->type == SRB_FXIOCB_BCMD) { if (sp->type == SRB_FXIOCB_BCMD) {
piocb_rqst = (struct qla_mt_iocb_rqst_fx00 *) piocb_rqst = (struct qla_mt_iocb_rqst_fx00 *)
&bsg_job->request->rqst_data.h_vendor.vendor_cmd[1]; &bsg_request->rqst_data.h_vendor.vendor_cmd[1];
if (piocb_rqst->flags & SRB_FXDISC_REQ_DMA_VALID) if (piocb_rqst->flags & SRB_FXDISC_REQ_DMA_VALID)
dma_unmap_sg(&ha->pdev->dev, dma_unmap_sg(&ha->pdev->dev,
@ -119,6 +122,8 @@ static int
qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job) qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
{ {
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
int ret = 0; int ret = 0;
@ -131,7 +136,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
} }
/* Get the sub command */ /* Get the sub command */
oper = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1]; oper = bsg_request->rqst_data.h_vendor.vendor_cmd[1];
/* Only set config is allowed if config memory is not allocated */ /* Only set config is allowed if config memory is not allocated */
if (!ha->fcp_prio_cfg && (oper != QLFC_FCP_PRIO_SET_CONFIG)) { if (!ha->fcp_prio_cfg && (oper != QLFC_FCP_PRIO_SET_CONFIG)) {
@ -145,10 +150,10 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
ha->fcp_prio_cfg->attributes &= ha->fcp_prio_cfg->attributes &=
~FCP_PRIO_ATTR_ENABLE; ~FCP_PRIO_ATTR_ENABLE;
qla24xx_update_all_fcp_prio(vha); qla24xx_update_all_fcp_prio(vha);
bsg_job->reply->result = DID_OK; bsg_reply->result = DID_OK;
} else { } else {
ret = -EINVAL; ret = -EINVAL;
bsg_job->reply->result = (DID_ERROR << 16); bsg_reply->result = (DID_ERROR << 16);
goto exit_fcp_prio_cfg; goto exit_fcp_prio_cfg;
} }
break; break;
@ -160,10 +165,10 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
ha->fcp_prio_cfg->attributes |= ha->fcp_prio_cfg->attributes |=
FCP_PRIO_ATTR_ENABLE; FCP_PRIO_ATTR_ENABLE;
qla24xx_update_all_fcp_prio(vha); qla24xx_update_all_fcp_prio(vha);
bsg_job->reply->result = DID_OK; bsg_reply->result = DID_OK;
} else { } else {
ret = -EINVAL; ret = -EINVAL;
bsg_job->reply->result = (DID_ERROR << 16); bsg_reply->result = (DID_ERROR << 16);
goto exit_fcp_prio_cfg; goto exit_fcp_prio_cfg;
} }
} }
@ -173,12 +178,12 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
len = bsg_job->reply_payload.payload_len; len = bsg_job->reply_payload.payload_len;
if (!len || len > FCP_PRIO_CFG_SIZE) { if (!len || len > FCP_PRIO_CFG_SIZE) {
ret = -EINVAL; ret = -EINVAL;
bsg_job->reply->result = (DID_ERROR << 16); bsg_reply->result = (DID_ERROR << 16);
goto exit_fcp_prio_cfg; goto exit_fcp_prio_cfg;
} }
bsg_job->reply->result = DID_OK; bsg_reply->result = DID_OK;
bsg_job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
sg_copy_from_buffer( sg_copy_from_buffer(
bsg_job->reply_payload.sg_list, bsg_job->reply_payload.sg_list,
bsg_job->reply_payload.sg_cnt, ha->fcp_prio_cfg, bsg_job->reply_payload.sg_cnt, ha->fcp_prio_cfg,
@ -189,7 +194,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
case QLFC_FCP_PRIO_SET_CONFIG: case QLFC_FCP_PRIO_SET_CONFIG:
len = bsg_job->request_payload.payload_len; len = bsg_job->request_payload.payload_len;
if (!len || len > FCP_PRIO_CFG_SIZE) { if (!len || len > FCP_PRIO_CFG_SIZE) {
bsg_job->reply->result = (DID_ERROR << 16); bsg_reply->result = (DID_ERROR << 16);
ret = -EINVAL; ret = -EINVAL;
goto exit_fcp_prio_cfg; goto exit_fcp_prio_cfg;
} }
@ -200,7 +205,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
ql_log(ql_log_warn, vha, 0x7050, ql_log(ql_log_warn, vha, 0x7050,
"Unable to allocate memory for fcp prio " "Unable to allocate memory for fcp prio "
"config data (%x).\n", FCP_PRIO_CFG_SIZE); "config data (%x).\n", FCP_PRIO_CFG_SIZE);
bsg_job->reply->result = (DID_ERROR << 16); bsg_reply->result = (DID_ERROR << 16);
ret = -ENOMEM; ret = -ENOMEM;
goto exit_fcp_prio_cfg; goto exit_fcp_prio_cfg;
} }
@ -215,7 +220,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
if (!qla24xx_fcp_prio_cfg_valid(vha, if (!qla24xx_fcp_prio_cfg_valid(vha,
(struct qla_fcp_prio_cfg *) ha->fcp_prio_cfg, 1)) { (struct qla_fcp_prio_cfg *) ha->fcp_prio_cfg, 1)) {
bsg_job->reply->result = (DID_ERROR << 16); bsg_reply->result = (DID_ERROR << 16);
ret = -EINVAL; ret = -EINVAL;
/* If buffer was invalidatic int /* If buffer was invalidatic int
* fcp_prio_cfg is of no use * fcp_prio_cfg is of no use
@ -229,7 +234,7 @@ qla24xx_proc_fcp_prio_cfg_cmd(struct fc_bsg_job *bsg_job)
if (ha->fcp_prio_cfg->attributes & FCP_PRIO_ATTR_ENABLE) if (ha->fcp_prio_cfg->attributes & FCP_PRIO_ATTR_ENABLE)
ha->flags.fcp_prio_enabled = 1; ha->flags.fcp_prio_enabled = 1;
qla24xx_update_all_fcp_prio(vha); qla24xx_update_all_fcp_prio(vha);
bsg_job->reply->result = DID_OK; bsg_reply->result = DID_OK;
break; break;
default: default:
ret = -EINVAL; ret = -EINVAL;
@ -244,6 +249,7 @@ exit_fcp_prio_cfg:
static int static int
qla2x00_process_els(struct fc_bsg_job *bsg_job) qla2x00_process_els(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_rport *rport; struct fc_rport *rport;
fc_port_t *fcport = NULL; fc_port_t *fcport = NULL;
struct Scsi_Host *host; struct Scsi_Host *host;
@ -255,7 +261,7 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job)
int rval = (DRIVER_ERROR << 16); int rval = (DRIVER_ERROR << 16);
uint16_t nextlid = 0; uint16_t nextlid = 0;
if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) { if (bsg_request->msgcode == FC_BSG_RPT_ELS) {
rport = bsg_job->rport; rport = bsg_job->rport;
fcport = *(fc_port_t **) rport->dd_data; fcport = *(fc_port_t **) rport->dd_data;
host = rport_to_shost(rport); host = rport_to_shost(rport);
@ -296,7 +302,7 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job)
} }
/* ELS request for rport */ /* ELS request for rport */
if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) { if (bsg_request->msgcode == FC_BSG_RPT_ELS) {
/* make sure the rport is logged in, /* make sure the rport is logged in,
* if not perform fabric login * if not perform fabric login
*/ */
@ -322,11 +328,11 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job)
/* Initialize all required fields of fcport */ /* Initialize all required fields of fcport */
fcport->vha = vha; fcport->vha = vha;
fcport->d_id.b.al_pa = fcport->d_id.b.al_pa =
bsg_job->request->rqst_data.h_els.port_id[0]; bsg_request->rqst_data.h_els.port_id[0];
fcport->d_id.b.area = fcport->d_id.b.area =
bsg_job->request->rqst_data.h_els.port_id[1]; bsg_request->rqst_data.h_els.port_id[1];
fcport->d_id.b.domain = fcport->d_id.b.domain =
bsg_job->request->rqst_data.h_els.port_id[2]; bsg_request->rqst_data.h_els.port_id[2];
fcport->loop_id = fcport->loop_id =
(fcport->d_id.b.al_pa == 0xFD) ? (fcport->d_id.b.al_pa == 0xFD) ?
NPH_FABRIC_CONTROLLER : NPH_F_PORT; NPH_FABRIC_CONTROLLER : NPH_F_PORT;
@ -366,10 +372,10 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job)
} }
sp->type = sp->type =
(bsg_job->request->msgcode == FC_BSG_RPT_ELS ? (bsg_request->msgcode == FC_BSG_RPT_ELS ?
SRB_ELS_CMD_RPT : SRB_ELS_CMD_HST); SRB_ELS_CMD_RPT : SRB_ELS_CMD_HST);
sp->name = sp->name =
(bsg_job->request->msgcode == FC_BSG_RPT_ELS ? (bsg_request->msgcode == FC_BSG_RPT_ELS ?
"bsg_els_rpt" : "bsg_els_hst"); "bsg_els_rpt" : "bsg_els_hst");
sp->u.bsg_job = bsg_job; sp->u.bsg_job = bsg_job;
sp->free = qla2x00_bsg_sp_free; sp->free = qla2x00_bsg_sp_free;
@ -378,7 +384,7 @@ qla2x00_process_els(struct fc_bsg_job *bsg_job)
ql_dbg(ql_dbg_user, vha, 0x700a, ql_dbg(ql_dbg_user, vha, 0x700a,
"bsg rqst type: %s els type: %x - loop-id=%x " "bsg rqst type: %s els type: %x - loop-id=%x "
"portid=%-2x%02x%02x.\n", type, "portid=%-2x%02x%02x.\n", type,
bsg_job->request->rqst_data.h_els.command_code, fcport->loop_id, bsg_request->rqst_data.h_els.command_code, fcport->loop_id,
fcport->d_id.b.domain, fcport->d_id.b.area, fcport->d_id.b.al_pa); fcport->d_id.b.domain, fcport->d_id.b.area, fcport->d_id.b.al_pa);
rval = qla2x00_start_sp(sp); rval = qla2x00_start_sp(sp);
@ -399,7 +405,7 @@ done_unmap_sg:
goto done_free_fcport; goto done_free_fcport;
done_free_fcport: done_free_fcport:
if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) if (bsg_request->msgcode == FC_BSG_RPT_ELS)
kfree(fcport); kfree(fcport);
done: done:
return rval; return rval;
@ -423,6 +429,7 @@ static int
qla2x00_process_ct(struct fc_bsg_job *bsg_job) qla2x00_process_ct(struct fc_bsg_job *bsg_job)
{ {
srb_t *sp; srb_t *sp;
struct fc_bsg_request *bsg_request = bsg_job->request;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -469,7 +476,7 @@ qla2x00_process_ct(struct fc_bsg_job *bsg_job)
} }
loop_id = loop_id =
(bsg_job->request->rqst_data.h_ct.preamble_word1 & 0xFF000000) (bsg_request->rqst_data.h_ct.preamble_word1 & 0xFF000000)
>> 24; >> 24;
switch (loop_id) { switch (loop_id) {
case 0xFC: case 0xFC:
@ -500,9 +507,9 @@ qla2x00_process_ct(struct fc_bsg_job *bsg_job)
/* Initialize all required fields of fcport */ /* Initialize all required fields of fcport */
fcport->vha = vha; fcport->vha = vha;
fcport->d_id.b.al_pa = bsg_job->request->rqst_data.h_ct.port_id[0]; fcport->d_id.b.al_pa = bsg_request->rqst_data.h_ct.port_id[0];
fcport->d_id.b.area = bsg_job->request->rqst_data.h_ct.port_id[1]; fcport->d_id.b.area = bsg_request->rqst_data.h_ct.port_id[1];
fcport->d_id.b.domain = bsg_job->request->rqst_data.h_ct.port_id[2]; fcport->d_id.b.domain = bsg_request->rqst_data.h_ct.port_id[2];
fcport->loop_id = loop_id; fcport->loop_id = loop_id;
/* Alloc SRB structure */ /* Alloc SRB structure */
@ -524,7 +531,7 @@ qla2x00_process_ct(struct fc_bsg_job *bsg_job)
ql_dbg(ql_dbg_user, vha, 0x7016, ql_dbg(ql_dbg_user, vha, 0x7016,
"bsg rqst type: %s else type: %x - " "bsg rqst type: %s else type: %x - "
"loop-id=%x portid=%02x%02x%02x.\n", type, "loop-id=%x portid=%02x%02x%02x.\n", type,
(bsg_job->request->rqst_data.h_ct.preamble_word2 >> 16), (bsg_request->rqst_data.h_ct.preamble_word2 >> 16),
fcport->loop_id, fcport->d_id.b.domain, fcport->d_id.b.area, fcport->loop_id, fcport->d_id.b.domain, fcport->d_id.b.area,
fcport->d_id.b.al_pa); fcport->d_id.b.al_pa);
@ -699,6 +706,8 @@ done_set_internal:
static int static int
qla2x00_process_loopback(struct fc_bsg_job *bsg_job) qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -780,9 +789,9 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
elreq.rcv_dma = rsp_data_dma; elreq.rcv_dma = rsp_data_dma;
elreq.transfer_size = req_data_len; elreq.transfer_size = req_data_len;
elreq.options = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1]; elreq.options = bsg_request->rqst_data.h_vendor.vendor_cmd[1];
elreq.iteration_count = elreq.iteration_count =
bsg_job->request->rqst_data.h_vendor.vendor_cmd[2]; bsg_request->rqst_data.h_vendor.vendor_cmd[2];
if (atomic_read(&vha->loop_state) == LOOP_READY && if (atomic_read(&vha->loop_state) == LOOP_READY &&
(ha->current_topology == ISP_CFG_F || (ha->current_topology == ISP_CFG_F ||
@ -896,12 +905,12 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
"Vendor request %s failed.\n", type); "Vendor request %s failed.\n", type);
rval = 0; rval = 0;
bsg_job->reply->result = (DID_ERROR << 16); bsg_reply->result = (DID_ERROR << 16);
bsg_job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
} else { } else {
ql_dbg(ql_dbg_user, vha, 0x702d, ql_dbg(ql_dbg_user, vha, 0x702d,
"Vendor request %s completed.\n", type); "Vendor request %s completed.\n", type);
bsg_job->reply->result = (DID_OK << 16); bsg_reply->result = (DID_OK << 16);
sg_copy_from_buffer(bsg_job->reply_payload.sg_list, sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
bsg_job->reply_payload.sg_cnt, rsp_data, bsg_job->reply_payload.sg_cnt, rsp_data,
rsp_data_len); rsp_data_len);
@ -937,7 +946,9 @@ done_unmap_req_sg:
static int static int
qla84xx_reset(struct fc_bsg_job *bsg_job) qla84xx_reset(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
int rval = 0; int rval = 0;
@ -948,7 +959,7 @@ qla84xx_reset(struct fc_bsg_job *bsg_job)
return -EINVAL; return -EINVAL;
} }
flag = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1]; flag = bsg_request->rqst_data.h_vendor.vendor_cmd[1];
rval = qla84xx_reset_chip(vha, flag == A84_ISSUE_RESET_DIAG_FW); rval = qla84xx_reset_chip(vha, flag == A84_ISSUE_RESET_DIAG_FW);
@ -960,7 +971,7 @@ qla84xx_reset(struct fc_bsg_job *bsg_job)
} else { } else {
ql_dbg(ql_dbg_user, vha, 0x7031, ql_dbg(ql_dbg_user, vha, 0x7031,
"Vendor request 84xx reset completed.\n"); "Vendor request 84xx reset completed.\n");
bsg_job->reply->result = DID_OK; bsg_reply->result = DID_OK;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
} }
@ -970,6 +981,8 @@ qla84xx_reset(struct fc_bsg_job *bsg_job)
static int static int
qla84xx_updatefw(struct fc_bsg_job *bsg_job) qla84xx_updatefw(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -1027,7 +1040,7 @@ qla84xx_updatefw(struct fc_bsg_job *bsg_job)
goto done_free_fw_buf; goto done_free_fw_buf;
} }
flag = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1]; flag = bsg_request->rqst_data.h_vendor.vendor_cmd[1];
fw_ver = le32_to_cpu(*((uint32_t *)((uint32_t *)fw_buf + 2))); fw_ver = le32_to_cpu(*((uint32_t *)((uint32_t *)fw_buf + 2)));
memset(mn, 0, sizeof(struct access_chip_84xx)); memset(mn, 0, sizeof(struct access_chip_84xx));
@ -1059,7 +1072,7 @@ qla84xx_updatefw(struct fc_bsg_job *bsg_job)
"Vendor request 84xx updatefw completed.\n"); "Vendor request 84xx updatefw completed.\n");
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
bsg_job->reply->result = DID_OK; bsg_reply->result = DID_OK;
} }
dma_pool_free(ha->s_dma_pool, mn, mn_dma); dma_pool_free(ha->s_dma_pool, mn, mn_dma);
@ -1079,6 +1092,8 @@ done_unmap_sg:
static int static int
qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job) qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -1107,7 +1122,7 @@ qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job)
memset(mn, 0, sizeof(struct access_chip_84xx)); memset(mn, 0, sizeof(struct access_chip_84xx));
mn->entry_type = ACCESS_CHIP_IOCB_TYPE; mn->entry_type = ACCESS_CHIP_IOCB_TYPE;
mn->entry_count = 1; mn->entry_count = 1;
ql84_mgmt = (void *)bsg_job->request + sizeof(struct fc_bsg_request); ql84_mgmt = (void *)bsg_request + sizeof(struct fc_bsg_request);
switch (ql84_mgmt->mgmt.cmd) { switch (ql84_mgmt->mgmt.cmd) {
case QLA84_MGMT_READ_MEM: case QLA84_MGMT_READ_MEM:
case QLA84_MGMT_GET_INFO: case QLA84_MGMT_GET_INFO:
@ -1239,11 +1254,11 @@ qla84xx_mgmt_cmd(struct fc_bsg_job *bsg_job)
"Vendor request 84xx mgmt completed.\n"); "Vendor request 84xx mgmt completed.\n");
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
bsg_job->reply->result = DID_OK; bsg_reply->result = DID_OK;
if ((ql84_mgmt->mgmt.cmd == QLA84_MGMT_READ_MEM) || if ((ql84_mgmt->mgmt.cmd == QLA84_MGMT_READ_MEM) ||
(ql84_mgmt->mgmt.cmd == QLA84_MGMT_GET_INFO)) { (ql84_mgmt->mgmt.cmd == QLA84_MGMT_GET_INFO)) {
bsg_job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
bsg_job->reply_payload.payload_len; bsg_job->reply_payload.payload_len;
sg_copy_from_buffer(bsg_job->reply_payload.sg_list, sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
@ -1274,6 +1289,8 @@ exit_mgmt:
static int static int
qla24xx_iidma(struct fc_bsg_job *bsg_job) qla24xx_iidma(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
int rval = 0; int rval = 0;
@ -1288,7 +1305,7 @@ qla24xx_iidma(struct fc_bsg_job *bsg_job)
return -EINVAL; return -EINVAL;
} }
port_param = (void *)bsg_job->request + sizeof(struct fc_bsg_request); port_param = (void *)bsg_request + sizeof(struct fc_bsg_request);
if (port_param->fc_scsi_addr.dest_type != EXT_DEF_TYPE_WWPN) { if (port_param->fc_scsi_addr.dest_type != EXT_DEF_TYPE_WWPN) {
ql_log(ql_log_warn, vha, 0x7048, ql_log(ql_log_warn, vha, 0x7048,
"Invalid destination type.\n"); "Invalid destination type.\n");
@ -1343,14 +1360,14 @@ qla24xx_iidma(struct fc_bsg_job *bsg_job)
bsg_job->reply_len = sizeof(struct fc_bsg_reply) + bsg_job->reply_len = sizeof(struct fc_bsg_reply) +
sizeof(struct qla_port_param); sizeof(struct qla_port_param);
rsp_ptr = ((uint8_t *)bsg_job->reply) + rsp_ptr = ((uint8_t *)bsg_reply) +
sizeof(struct fc_bsg_reply); sizeof(struct fc_bsg_reply);
memcpy(rsp_ptr, port_param, memcpy(rsp_ptr, port_param,
sizeof(struct qla_port_param)); sizeof(struct qla_port_param));
} }
bsg_job->reply->result = DID_OK; bsg_reply->result = DID_OK;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
} }
@ -1361,6 +1378,7 @@ static int
qla2x00_optrom_setup(struct fc_bsg_job *bsg_job, scsi_qla_host_t *vha, qla2x00_optrom_setup(struct fc_bsg_job *bsg_job, scsi_qla_host_t *vha,
uint8_t is_update) uint8_t is_update)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request;
uint32_t start = 0; uint32_t start = 0;
int valid = 0; int valid = 0;
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -1368,7 +1386,7 @@ qla2x00_optrom_setup(struct fc_bsg_job *bsg_job, scsi_qla_host_t *vha,
if (unlikely(pci_channel_offline(ha->pdev))) if (unlikely(pci_channel_offline(ha->pdev)))
return -EINVAL; return -EINVAL;
start = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1]; start = bsg_request->rqst_data.h_vendor.vendor_cmd[1];
if (start > ha->optrom_size) { if (start > ha->optrom_size) {
ql_log(ql_log_warn, vha, 0x7055, ql_log(ql_log_warn, vha, 0x7055,
"start %d > optrom_size %d.\n", start, ha->optrom_size); "start %d > optrom_size %d.\n", start, ha->optrom_size);
@ -1429,6 +1447,7 @@ qla2x00_optrom_setup(struct fc_bsg_job *bsg_job, scsi_qla_host_t *vha,
static int static int
qla2x00_read_optrom(struct fc_bsg_job *bsg_job) qla2x00_read_optrom(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -1451,8 +1470,8 @@ qla2x00_read_optrom(struct fc_bsg_job *bsg_job)
bsg_job->reply_payload.sg_cnt, ha->optrom_buffer, bsg_job->reply_payload.sg_cnt, ha->optrom_buffer,
ha->optrom_region_size); ha->optrom_region_size);
bsg_job->reply->reply_payload_rcv_len = ha->optrom_region_size; bsg_reply->reply_payload_rcv_len = ha->optrom_region_size;
bsg_job->reply->result = DID_OK; bsg_reply->result = DID_OK;
vfree(ha->optrom_buffer); vfree(ha->optrom_buffer);
ha->optrom_buffer = NULL; ha->optrom_buffer = NULL;
ha->optrom_state = QLA_SWAITING; ha->optrom_state = QLA_SWAITING;
@ -1464,6 +1483,7 @@ qla2x00_read_optrom(struct fc_bsg_job *bsg_job)
static int static int
qla2x00_update_optrom(struct fc_bsg_job *bsg_job) qla2x00_update_optrom(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -1486,7 +1506,7 @@ qla2x00_update_optrom(struct fc_bsg_job *bsg_job)
ha->isp_ops->write_optrom(vha, ha->optrom_buffer, ha->isp_ops->write_optrom(vha, ha->optrom_buffer,
ha->optrom_region_start, ha->optrom_region_size); ha->optrom_region_start, ha->optrom_region_size);
bsg_job->reply->result = DID_OK; bsg_reply->result = DID_OK;
vfree(ha->optrom_buffer); vfree(ha->optrom_buffer);
ha->optrom_buffer = NULL; ha->optrom_buffer = NULL;
ha->optrom_state = QLA_SWAITING; ha->optrom_state = QLA_SWAITING;
@ -1498,6 +1518,7 @@ qla2x00_update_optrom(struct fc_bsg_job *bsg_job)
static int static int
qla2x00_update_fru_versions(struct fc_bsg_job *bsg_job) qla2x00_update_fru_versions(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -1509,7 +1530,7 @@ qla2x00_update_fru_versions(struct fc_bsg_job *bsg_job)
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_job->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;
goto done; goto done;
} }
@ -1525,21 +1546,21 @@ qla2x00_update_fru_versions(struct fc_bsg_job *bsg_job)
image->field_address.device, image->field_address.offset, image->field_address.device, image->field_address.offset,
sizeof(image->field_info), image->field_address.option); sizeof(image->field_info), image->field_address.option);
if (rval) { if (rval) {
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_MAILBOX; EXT_STATUS_MAILBOX;
goto dealloc; goto dealloc;
} }
image++; image++;
} }
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = 0; bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
dealloc: dealloc:
dma_pool_free(ha->s_dma_pool, sfp, sfp_dma); dma_pool_free(ha->s_dma_pool, sfp, sfp_dma);
done: done:
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
bsg_job->reply->result = DID_OK << 16; bsg_reply->result = DID_OK << 16;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
return 0; return 0;
@ -1548,6 +1569,7 @@ done:
static int static int
qla2x00_read_fru_status(struct fc_bsg_job *bsg_job) qla2x00_read_fru_status(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -1557,7 +1579,7 @@ qla2x00_read_fru_status(struct fc_bsg_job *bsg_job)
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_job->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;
goto done; goto done;
} }
@ -1571,7 +1593,7 @@ qla2x00_read_fru_status(struct fc_bsg_job *bsg_job)
sr->status_reg = *sfp; sr->status_reg = *sfp;
if (rval) { if (rval) {
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_MAILBOX; EXT_STATUS_MAILBOX;
goto dealloc; goto dealloc;
} }
@ -1579,15 +1601,15 @@ qla2x00_read_fru_status(struct fc_bsg_job *bsg_job)
sg_copy_from_buffer(bsg_job->reply_payload.sg_list, sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
bsg_job->reply_payload.sg_cnt, sr, sizeof(*sr)); bsg_job->reply_payload.sg_cnt, sr, sizeof(*sr));
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = 0; bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
dealloc: dealloc:
dma_pool_free(ha->s_dma_pool, sfp, sfp_dma); dma_pool_free(ha->s_dma_pool, sfp, sfp_dma);
done: done:
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
bsg_job->reply->reply_payload_rcv_len = sizeof(*sr); bsg_reply->reply_payload_rcv_len = sizeof(*sr);
bsg_job->reply->result = DID_OK << 16; bsg_reply->result = DID_OK << 16;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
return 0; return 0;
@ -1596,6 +1618,7 @@ done:
static int static int
qla2x00_write_fru_status(struct fc_bsg_job *bsg_job) qla2x00_write_fru_status(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -1605,7 +1628,7 @@ qla2x00_write_fru_status(struct fc_bsg_job *bsg_job)
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_job->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;
goto done; goto done;
} }
@ -1619,19 +1642,19 @@ qla2x00_write_fru_status(struct fc_bsg_job *bsg_job)
sizeof(sr->status_reg), sr->field_address.option); sizeof(sr->status_reg), sr->field_address.option);
if (rval) { if (rval) {
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_MAILBOX; EXT_STATUS_MAILBOX;
goto dealloc; goto dealloc;
} }
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = 0; bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
dealloc: dealloc:
dma_pool_free(ha->s_dma_pool, sfp, sfp_dma); dma_pool_free(ha->s_dma_pool, sfp, sfp_dma);
done: done:
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
bsg_job->reply->result = DID_OK << 16; bsg_reply->result = DID_OK << 16;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
return 0; return 0;
@ -1640,6 +1663,7 @@ done:
static int static int
qla2x00_write_i2c(struct fc_bsg_job *bsg_job) qla2x00_write_i2c(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -1649,7 +1673,7 @@ qla2x00_write_i2c(struct fc_bsg_job *bsg_job)
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_job->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;
goto done; goto done;
} }
@ -1662,19 +1686,19 @@ qla2x00_write_i2c(struct fc_bsg_job *bsg_job)
i2c->device, i2c->offset, i2c->length, i2c->option); i2c->device, i2c->offset, i2c->length, i2c->option);
if (rval) { if (rval) {
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_MAILBOX; EXT_STATUS_MAILBOX;
goto dealloc; goto dealloc;
} }
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = 0; bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
dealloc: dealloc:
dma_pool_free(ha->s_dma_pool, sfp, sfp_dma); dma_pool_free(ha->s_dma_pool, sfp, sfp_dma);
done: done:
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
bsg_job->reply->result = DID_OK << 16; bsg_reply->result = DID_OK << 16;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
return 0; return 0;
@ -1683,6 +1707,7 @@ done:
static int static int
qla2x00_read_i2c(struct fc_bsg_job *bsg_job) qla2x00_read_i2c(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -1692,7 +1717,7 @@ qla2x00_read_i2c(struct fc_bsg_job *bsg_job)
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_job->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;
goto done; goto done;
} }
@ -1704,7 +1729,7 @@ qla2x00_read_i2c(struct fc_bsg_job *bsg_job)
i2c->device, i2c->offset, i2c->length, i2c->option); i2c->device, i2c->offset, i2c->length, i2c->option);
if (rval) { if (rval) {
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_MAILBOX; EXT_STATUS_MAILBOX;
goto dealloc; goto dealloc;
} }
@ -1713,15 +1738,15 @@ qla2x00_read_i2c(struct fc_bsg_job *bsg_job)
sg_copy_from_buffer(bsg_job->reply_payload.sg_list, sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
bsg_job->reply_payload.sg_cnt, i2c, sizeof(*i2c)); bsg_job->reply_payload.sg_cnt, i2c, sizeof(*i2c));
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = 0; bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = 0;
dealloc: dealloc:
dma_pool_free(ha->s_dma_pool, sfp, sfp_dma); dma_pool_free(ha->s_dma_pool, sfp, sfp_dma);
done: done:
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
bsg_job->reply->reply_payload_rcv_len = sizeof(*i2c); bsg_reply->reply_payload_rcv_len = sizeof(*i2c);
bsg_job->reply->result = DID_OK << 16; bsg_reply->result = DID_OK << 16;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
return 0; return 0;
@ -1730,6 +1755,7 @@ done:
static int static int
qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job) qla24xx_process_bidir_cmd(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -1895,10 +1921,10 @@ done:
/* Return an error vendor specific response /* Return an error vendor specific response
* and complete the bsg request * and complete the bsg request
*/ */
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = rval; bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = rval;
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
bsg_job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
bsg_job->reply->result = (DID_OK) << 16; bsg_reply->result = (DID_OK) << 16;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
/* Always return success, vendor rsp carries correct status */ /* Always return success, vendor rsp carries correct status */
return 0; return 0;
@ -1907,6 +1933,7 @@ done:
static int static int
qlafx00_mgmt_cmd(struct fc_bsg_job *bsg_job) qlafx00_mgmt_cmd(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -1919,7 +1946,7 @@ qlafx00_mgmt_cmd(struct fc_bsg_job *bsg_job)
/* Copy the IOCB specific information */ /* Copy the IOCB specific information */
piocb_rqst = (struct qla_mt_iocb_rqst_fx00 *) piocb_rqst = (struct qla_mt_iocb_rqst_fx00 *)
&bsg_job->request->rqst_data.h_vendor.vendor_cmd[1]; &bsg_request->rqst_data.h_vendor.vendor_cmd[1];
/* Dump the vendor information */ /* Dump the vendor information */
ql_dump_buffer(ql_dbg_user + ql_dbg_verbose , vha, 0x70cf, ql_dump_buffer(ql_dbg_user + ql_dbg_verbose , vha, 0x70cf,
@ -2029,6 +2056,7 @@ done:
static int static int
qla26xx_serdes_op(struct fc_bsg_job *bsg_job) qla26xx_serdes_op(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
int rval = 0; int rval = 0;
@ -2042,13 +2070,13 @@ qla26xx_serdes_op(struct fc_bsg_job *bsg_job)
switch (sr.cmd) { switch (sr.cmd) {
case INT_SC_SERDES_WRITE_REG: case INT_SC_SERDES_WRITE_REG:
rval = qla2x00_write_serdes_word(vha, sr.addr, sr.val); rval = qla2x00_write_serdes_word(vha, sr.addr, sr.val);
bsg_job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
break; break;
case INT_SC_SERDES_READ_REG: case INT_SC_SERDES_READ_REG:
rval = qla2x00_read_serdes_word(vha, sr.addr, &sr.val); rval = qla2x00_read_serdes_word(vha, sr.addr, &sr.val);
sg_copy_from_buffer(bsg_job->reply_payload.sg_list, sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
bsg_job->reply_payload.sg_cnt, &sr, sizeof(sr)); bsg_job->reply_payload.sg_cnt, &sr, sizeof(sr));
bsg_job->reply->reply_payload_rcv_len = sizeof(sr); bsg_reply->reply_payload_rcv_len = sizeof(sr);
break; break;
default: default:
ql_dbg(ql_dbg_user, vha, 0x708c, ql_dbg(ql_dbg_user, vha, 0x708c,
@ -2057,11 +2085,11 @@ qla26xx_serdes_op(struct fc_bsg_job *bsg_job)
break; break;
} }
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
rval ? EXT_STATUS_MAILBOX : 0; rval ? EXT_STATUS_MAILBOX : 0;
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
bsg_job->reply->result = DID_OK << 16; bsg_reply->result = DID_OK << 16;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
return 0; return 0;
} }
@ -2069,6 +2097,7 @@ qla26xx_serdes_op(struct fc_bsg_job *bsg_job)
static int static int
qla8044_serdes_op(struct fc_bsg_job *bsg_job) qla8044_serdes_op(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
int rval = 0; int rval = 0;
@ -2082,13 +2111,13 @@ qla8044_serdes_op(struct fc_bsg_job *bsg_job)
switch (sr.cmd) { switch (sr.cmd) {
case INT_SC_SERDES_WRITE_REG: case INT_SC_SERDES_WRITE_REG:
rval = qla8044_write_serdes_word(vha, sr.addr, sr.val); rval = qla8044_write_serdes_word(vha, sr.addr, sr.val);
bsg_job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
break; break;
case INT_SC_SERDES_READ_REG: case INT_SC_SERDES_READ_REG:
rval = qla8044_read_serdes_word(vha, sr.addr, &sr.val); rval = qla8044_read_serdes_word(vha, sr.addr, &sr.val);
sg_copy_from_buffer(bsg_job->reply_payload.sg_list, sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
bsg_job->reply_payload.sg_cnt, &sr, sizeof(sr)); bsg_job->reply_payload.sg_cnt, &sr, sizeof(sr));
bsg_job->reply->reply_payload_rcv_len = sizeof(sr); bsg_reply->reply_payload_rcv_len = sizeof(sr);
break; break;
default: default:
ql_dbg(ql_dbg_user, vha, 0x70cf, ql_dbg(ql_dbg_user, vha, 0x70cf,
@ -2097,11 +2126,11 @@ qla8044_serdes_op(struct fc_bsg_job *bsg_job)
break; break;
} }
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
rval ? EXT_STATUS_MAILBOX : 0; rval ? EXT_STATUS_MAILBOX : 0;
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
bsg_job->reply->result = DID_OK << 16; bsg_reply->result = DID_OK << 16;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
return 0; return 0;
} }
@ -2109,6 +2138,7 @@ qla8044_serdes_op(struct fc_bsg_job *bsg_job)
static int static int
qla27xx_get_flash_upd_cap(struct fc_bsg_job *bsg_job) qla27xx_get_flash_upd_cap(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -2125,13 +2155,13 @@ qla27xx_get_flash_upd_cap(struct fc_bsg_job *bsg_job)
sg_copy_from_buffer(bsg_job->reply_payload.sg_list, sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
bsg_job->reply_payload.sg_cnt, &cap, sizeof(cap)); bsg_job->reply_payload.sg_cnt, &cap, sizeof(cap));
bsg_job->reply->reply_payload_rcv_len = sizeof(cap); bsg_reply->reply_payload_rcv_len = sizeof(cap);
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_OK; EXT_STATUS_OK;
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
bsg_job->reply->result = DID_OK << 16; bsg_reply->result = DID_OK << 16;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
return 0; return 0;
} }
@ -2139,6 +2169,7 @@ qla27xx_get_flash_upd_cap(struct fc_bsg_job *bsg_job)
static int static int
qla27xx_set_flash_upd_cap(struct fc_bsg_job *bsg_job) qla27xx_set_flash_upd_cap(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -2158,24 +2189,24 @@ qla27xx_set_flash_upd_cap(struct fc_bsg_job *bsg_job)
(uint64_t)ha->fw_attributes; (uint64_t)ha->fw_attributes;
if (online_fw_attr != cap.capabilities) { if (online_fw_attr != cap.capabilities) {
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_INVALID_PARAM; EXT_STATUS_INVALID_PARAM;
return -EINVAL; return -EINVAL;
} }
if (cap.outage_duration < MAX_LOOP_TIMEOUT) { if (cap.outage_duration < MAX_LOOP_TIMEOUT) {
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_INVALID_PARAM; EXT_STATUS_INVALID_PARAM;
return -EINVAL; return -EINVAL;
} }
bsg_job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
EXT_STATUS_OK; EXT_STATUS_OK;
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
bsg_job->reply->result = DID_OK << 16; bsg_reply->result = DID_OK << 16;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
return 0; return 0;
} }
@ -2183,6 +2214,7 @@ qla27xx_set_flash_upd_cap(struct fc_bsg_job *bsg_job)
static int static int
qla27xx_get_bbcr_data(struct fc_bsg_job *bsg_job) qla27xx_get_bbcr_data(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -2227,12 +2259,12 @@ qla27xx_get_bbcr_data(struct fc_bsg_job *bsg_job)
done: done:
sg_copy_from_buffer(bsg_job->reply_payload.sg_list, sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
bsg_job->reply_payload.sg_cnt, &bbcr, sizeof(bbcr)); bsg_job->reply_payload.sg_cnt, &bbcr, sizeof(bbcr));
bsg_job->reply->reply_payload_rcv_len = sizeof(bbcr); bsg_reply->reply_payload_rcv_len = sizeof(bbcr);
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = EXT_STATUS_OK; bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = EXT_STATUS_OK;
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
bsg_job->reply->result = DID_OK << 16; bsg_reply->result = DID_OK << 16;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
return 0; return 0;
} }
@ -2240,6 +2272,8 @@ done:
static int static int
qla2x00_get_priv_stats(struct fc_bsg_job *bsg_job) qla2x00_get_priv_stats(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -2247,7 +2281,7 @@ qla2x00_get_priv_stats(struct fc_bsg_job *bsg_job)
struct link_statistics *stats = NULL; struct link_statistics *stats = NULL;
dma_addr_t stats_dma; dma_addr_t stats_dma;
int rval; int rval;
uint32_t *cmd = bsg_job->request->rqst_data.h_vendor.vendor_cmd; uint32_t *cmd = bsg_request->rqst_data.h_vendor.vendor_cmd;
uint options = cmd[0] == QL_VND_GET_PRIV_STATS_EX ? cmd[1] : 0; uint options = cmd[0] == QL_VND_GET_PRIV_STATS_EX ? cmd[1] : 0;
if (test_bit(UNLOADING, &vha->dpc_flags)) if (test_bit(UNLOADING, &vha->dpc_flags))
@ -2281,12 +2315,12 @@ qla2x00_get_priv_stats(struct fc_bsg_job *bsg_job)
bsg_job->reply_payload.sg_cnt, stats, sizeof(*stats)); bsg_job->reply_payload.sg_cnt, stats, sizeof(*stats));
} }
bsg_job->reply->reply_payload_rcv_len = sizeof(*stats); bsg_reply->reply_payload_rcv_len = sizeof(*stats);
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
rval ? EXT_STATUS_MAILBOX : EXT_STATUS_OK; rval ? EXT_STATUS_MAILBOX : EXT_STATUS_OK;
bsg_job->reply_len = sizeof(*bsg_job->reply); bsg_job->reply_len = sizeof(*bsg_reply);
bsg_job->reply->result = DID_OK << 16; bsg_reply->result = DID_OK << 16;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
dma_free_coherent(&ha->pdev->dev, sizeof(*stats), dma_free_coherent(&ha->pdev->dev, sizeof(*stats),
@ -2298,6 +2332,7 @@ qla2x00_get_priv_stats(struct fc_bsg_job *bsg_job)
static int static int
qla2x00_do_dport_diagnostics(struct fc_bsg_job *bsg_job) qla2x00_do_dport_diagnostics(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
struct Scsi_Host *host = bsg_job->shost; struct Scsi_Host *host = bsg_job->shost;
scsi_qla_host_t *vha = shost_priv(host); scsi_qla_host_t *vha = shost_priv(host);
int rval; int rval;
@ -2323,12 +2358,12 @@ qla2x00_do_dport_diagnostics(struct fc_bsg_job *bsg_job)
bsg_job->reply_payload.sg_cnt, dd, sizeof(*dd)); bsg_job->reply_payload.sg_cnt, dd, sizeof(*dd));
} }
bsg_job->reply->reply_payload_rcv_len = sizeof(*dd); bsg_reply->reply_payload_rcv_len = sizeof(*dd);
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = bsg_reply->reply_data.vendor_reply.vendor_rsp[0] =
rval ? EXT_STATUS_MAILBOX : EXT_STATUS_OK; rval ? EXT_STATUS_MAILBOX : EXT_STATUS_OK;
bsg_job->reply_len = sizeof(*bsg_job->reply); bsg_job->reply_len = sizeof(*bsg_reply);
bsg_job->reply->result = DID_OK << 16; bsg_reply->result = DID_OK << 16;
bsg_job->job_done(bsg_job); bsg_job->job_done(bsg_job);
kfree(dd); kfree(dd);
@ -2339,7 +2374,9 @@ qla2x00_do_dport_diagnostics(struct fc_bsg_job *bsg_job)
static int static int
qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job) qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
{ {
switch (bsg_job->request->rqst_data.h_vendor.vendor_cmd[0]) { struct fc_bsg_request *bsg_request = bsg_job->request;
switch (bsg_request->rqst_data.h_vendor.vendor_cmd[0]) {
case QL_VND_LOOPBACK: case QL_VND_LOOPBACK:
return qla2x00_process_loopback(bsg_job); return qla2x00_process_loopback(bsg_job);
@ -2415,15 +2452,17 @@ qla2x00_process_vendor_specific(struct fc_bsg_job *bsg_job)
int int
qla24xx_bsg_request(struct fc_bsg_job *bsg_job) qla24xx_bsg_request(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_request *bsg_request = bsg_job->request;
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
int ret = -EINVAL; int ret = -EINVAL;
struct fc_rport *rport; struct fc_rport *rport;
struct Scsi_Host *host; struct Scsi_Host *host;
scsi_qla_host_t *vha; scsi_qla_host_t *vha;
/* In case no data transferred. */ /* In case no data transferred. */
bsg_job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
if (bsg_job->request->msgcode == FC_BSG_RPT_ELS) { if (bsg_request->msgcode == FC_BSG_RPT_ELS) {
rport = bsg_job->rport; rport = bsg_job->rport;
host = rport_to_shost(rport); host = rport_to_shost(rport);
vha = shost_priv(host); vha = shost_priv(host);
@ -2435,14 +2474,14 @@ qla24xx_bsg_request(struct fc_bsg_job *bsg_job)
if (qla2x00_reset_active(vha)) { if (qla2x00_reset_active(vha)) {
ql_dbg(ql_dbg_user, vha, 0x709f, ql_dbg(ql_dbg_user, vha, 0x709f,
"BSG: ISP abort active/needed -- cmd=%d.\n", "BSG: ISP abort active/needed -- cmd=%d.\n",
bsg_job->request->msgcode); bsg_request->msgcode);
return -EBUSY; return -EBUSY;
} }
ql_dbg(ql_dbg_user, vha, 0x7000, ql_dbg(ql_dbg_user, vha, 0x7000,
"Entered %s msgcode=0x%x.\n", __func__, bsg_job->request->msgcode); "Entered %s msgcode=0x%x.\n", __func__, bsg_request->msgcode);
switch (bsg_job->request->msgcode) { switch (bsg_request->msgcode) {
case FC_BSG_RPT_ELS: case FC_BSG_RPT_ELS:
case FC_BSG_HST_ELS_NOLOGIN: case FC_BSG_HST_ELS_NOLOGIN:
ret = qla2x00_process_els(bsg_job); ret = qla2x00_process_els(bsg_job);
@ -2466,6 +2505,7 @@ qla24xx_bsg_request(struct fc_bsg_job *bsg_job)
int int
qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job) qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
{ {
struct fc_bsg_reply *bsg_reply = bsg_job->reply;
scsi_qla_host_t *vha = shost_priv(bsg_job->shost); scsi_qla_host_t *vha = shost_priv(bsg_job->shost);
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
srb_t *sp; srb_t *sp;
@ -2494,13 +2534,13 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
"mbx abort_command " "mbx abort_command "
"failed.\n"); "failed.\n");
bsg_job->req->errors = bsg_job->req->errors =
bsg_job->reply->result = -EIO; bsg_reply->result = -EIO;
} else { } else {
ql_dbg(ql_dbg_user, vha, 0x708a, ql_dbg(ql_dbg_user, vha, 0x708a,
"mbx abort_command " "mbx abort_command "
"success.\n"); "success.\n");
bsg_job->req->errors = bsg_job->req->errors =
bsg_job->reply->result = 0; bsg_reply->result = 0;
} }
spin_lock_irqsave(&ha->hardware_lock, flags); spin_lock_irqsave(&ha->hardware_lock, flags);
goto done; goto done;
@ -2510,7 +2550,7 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
} }
spin_unlock_irqrestore(&ha->hardware_lock, flags); spin_unlock_irqrestore(&ha->hardware_lock, flags);
ql_log(ql_log_info, vha, 0x708b, "SRB not found to abort.\n"); ql_log(ql_log_info, vha, 0x708b, "SRB not found to abort.\n");
bsg_job->req->errors = bsg_job->reply->result = -ENXIO; bsg_job->req->errors = bsg_reply->result = -ENXIO;
return 0; return 0;
done: done:

5
drivers/scsi/qla2xxx/qla_iocb.c
View File

@ -2198,6 +2198,7 @@ static void
qla24xx_els_iocb(srb_t *sp, struct els_entry_24xx *els_iocb) qla24xx_els_iocb(srb_t *sp, struct els_entry_24xx *els_iocb)
{ {
struct fc_bsg_job *bsg_job = sp->u.bsg_job; struct fc_bsg_job *bsg_job = sp->u.bsg_job;
struct fc_bsg_request *bsg_request = bsg_job->request;
els_iocb->entry_type = ELS_IOCB_TYPE; els_iocb->entry_type = ELS_IOCB_TYPE;
els_iocb->entry_count = 1; els_iocb->entry_count = 1;
@ -2212,8 +2213,8 @@ qla24xx_els_iocb(srb_t *sp, struct els_entry_24xx *els_iocb)
els_iocb->opcode = els_iocb->opcode =
sp->type == SRB_ELS_CMD_RPT ? sp->type == SRB_ELS_CMD_RPT ?
bsg_job->request->rqst_data.r_els.els_code : bsg_request->rqst_data.r_els.els_code :
bsg_job->request->rqst_data.h_els.command_code; bsg_request->rqst_data.h_els.command_code;
els_iocb->port_id[0] = sp->fcport->d_id.b.al_pa; els_iocb->port_id[0] = sp->fcport->d_id.b.al_pa;
els_iocb->port_id[1] = sp->fcport->d_id.b.area; els_iocb->port_id[1] = sp->fcport->d_id.b.area;
els_iocb->port_id[2] = sp->fcport->d_id.b.domain; els_iocb->port_id[2] = sp->fcport->d_id.b.domain;

46
drivers/scsi/qla2xxx/qla_isr.c
View File

@ -1357,6 +1357,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
const char *type; const char *type;
srb_t *sp; srb_t *sp;
struct fc_bsg_job *bsg_job; struct fc_bsg_job *bsg_job;
struct fc_bsg_reply *bsg_reply;
uint16_t comp_status; uint16_t comp_status;
int res; int res;
@ -1365,6 +1366,7 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
return; return;
bsg_job = sp->u.bsg_job; bsg_job = sp->u.bsg_job;
bsg_reply = bsg_job->reply;
type = "ct pass-through"; type = "ct pass-through";
@ -1373,32 +1375,32 @@ qla2x00_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
/* return FC_CTELS_STATUS_OK and leave the decoding of the ELS/CT /* return FC_CTELS_STATUS_OK and leave the decoding of the ELS/CT
* fc payload to the caller * fc payload to the caller
*/ */
bsg_job->reply->reply_data.ctels_reply.status = FC_CTELS_STATUS_OK; bsg_reply->reply_data.ctels_reply.status = FC_CTELS_STATUS_OK;
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
if (comp_status != CS_COMPLETE) { if (comp_status != CS_COMPLETE) {
if (comp_status == CS_DATA_UNDERRUN) { if (comp_status == CS_DATA_UNDERRUN) {
res = DID_OK << 16; res = DID_OK << 16;
bsg_job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
le16_to_cpu(((sts_entry_t *)pkt)->rsp_info_len); le16_to_cpu(((sts_entry_t *)pkt)->rsp_info_len);
ql_log(ql_log_warn, vha, 0x5048, ql_log(ql_log_warn, vha, 0x5048,
"CT pass-through-%s error " "CT pass-through-%s error "
"comp_status-status=0x%x total_byte = 0x%x.\n", "comp_status-status=0x%x total_byte = 0x%x.\n",
type, comp_status, type, comp_status,
bsg_job->reply->reply_payload_rcv_len); bsg_reply->reply_payload_rcv_len);
} else { } else {
ql_log(ql_log_warn, vha, 0x5049, ql_log(ql_log_warn, vha, 0x5049,
"CT pass-through-%s error " "CT pass-through-%s error "
"comp_status-status=0x%x.\n", type, comp_status); "comp_status-status=0x%x.\n", type, comp_status);
res = DID_ERROR << 16; res = DID_ERROR << 16;
bsg_job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
} }
ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5035, ql_dump_buffer(ql_dbg_async + ql_dbg_buffer, vha, 0x5035,
(uint8_t *)pkt, sizeof(*pkt)); (uint8_t *)pkt, sizeof(*pkt));
} else { } else {
res = DID_OK << 16; res = DID_OK << 16;
bsg_job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
bsg_job->reply_payload.payload_len; bsg_job->reply_payload.payload_len;
bsg_job->reply_len = 0; bsg_job->reply_len = 0;
} }
@ -1414,6 +1416,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
const char *type; const char *type;
srb_t *sp; srb_t *sp;
struct fc_bsg_job *bsg_job; struct fc_bsg_job *bsg_job;
struct fc_bsg_reply *bsg_reply;
uint16_t comp_status; uint16_t comp_status;
uint32_t fw_status[3]; uint32_t fw_status[3];
uint8_t* fw_sts_ptr; uint8_t* fw_sts_ptr;
@ -1423,6 +1426,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
if (!sp) if (!sp)
return; return;
bsg_job = sp->u.bsg_job; bsg_job = sp->u.bsg_job;
bsg_reply = bsg_job->reply;
type = NULL; type = NULL;
switch (sp->type) { switch (sp->type) {
@ -1452,13 +1456,13 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
/* return FC_CTELS_STATUS_OK and leave the decoding of the ELS/CT /* return FC_CTELS_STATUS_OK and leave the decoding of the ELS/CT
* fc payload to the caller * fc payload to the caller
*/ */
bsg_job->reply->reply_data.ctels_reply.status = FC_CTELS_STATUS_OK; bsg_reply->reply_data.ctels_reply.status = FC_CTELS_STATUS_OK;
bsg_job->reply_len = sizeof(struct fc_bsg_reply) + sizeof(fw_status); bsg_job->reply_len = sizeof(struct fc_bsg_reply) + sizeof(fw_status);
if (comp_status != CS_COMPLETE) { if (comp_status != CS_COMPLETE) {
if (comp_status == CS_DATA_UNDERRUN) { if (comp_status == CS_DATA_UNDERRUN) {
res = DID_OK << 16; res = DID_OK << 16;
bsg_job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
le16_to_cpu(((struct els_sts_entry_24xx *)pkt)->total_byte_count); le16_to_cpu(((struct els_sts_entry_24xx *)pkt)->total_byte_count);
ql_dbg(ql_dbg_user, vha, 0x503f, ql_dbg(ql_dbg_user, vha, 0x503f,
@ -1480,7 +1484,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
le16_to_cpu(((struct els_sts_entry_24xx *) le16_to_cpu(((struct els_sts_entry_24xx *)
pkt)->error_subcode_2)); pkt)->error_subcode_2));
res = DID_ERROR << 16; res = DID_ERROR << 16;
bsg_job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
fw_sts_ptr = ((uint8_t*)bsg_job->req->sense) + sizeof(struct fc_bsg_reply); fw_sts_ptr = ((uint8_t*)bsg_job->req->sense) + sizeof(struct fc_bsg_reply);
memcpy( fw_sts_ptr, fw_status, sizeof(fw_status)); memcpy( fw_sts_ptr, fw_status, sizeof(fw_status));
} }
@ -1489,7 +1493,7 @@ qla24xx_els_ct_entry(scsi_qla_host_t *vha, struct req_que *req,
} }
else { else {
res = DID_OK << 16; res = DID_OK << 16;
bsg_job->reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len; bsg_reply->reply_payload_rcv_len = bsg_job->reply_payload.payload_len;
bsg_job->reply_len = 0; bsg_job->reply_len = 0;
} }
@ -1905,6 +1909,8 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt,
uint16_t thread_id; uint16_t thread_id;
uint32_t rval = EXT_STATUS_OK; uint32_t rval = EXT_STATUS_OK;
struct fc_bsg_job *bsg_job = NULL; struct fc_bsg_job *bsg_job = NULL;
struct fc_bsg_request *bsg_request;
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;
@ -1919,11 +1925,7 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt,
} }
sp = req->outstanding_cmds[index]; sp = req->outstanding_cmds[index];
if (sp) { if (!sp) {
/* Free outstanding command slot. */
req->outstanding_cmds[index] = NULL;
bsg_job = sp->u.bsg_job;
} else {
ql_log(ql_log_warn, vha, 0x70b0, ql_log(ql_log_warn, vha, 0x70b0,
"Req:%d: Invalid ISP SCSI completion handle(0x%x)\n", "Req:%d: Invalid ISP SCSI completion handle(0x%x)\n",
req->id, index); req->id, index);
@ -1932,6 +1934,12 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt,
return; return;
} }
/* Free outstanding command slot. */
req->outstanding_cmds[index] = NULL;
bsg_job = sp->u.bsg_job;
bsg_request = bsg_job->request;
bsg_reply = bsg_job->reply;
if (IS_FWI2_CAPABLE(ha)) { if (IS_FWI2_CAPABLE(ha)) {
comp_status = le16_to_cpu(sts24->comp_status); comp_status = le16_to_cpu(sts24->comp_status);
scsi_status = le16_to_cpu(sts24->scsi_status) & SS_MASK; scsi_status = le16_to_cpu(sts24->scsi_status) & SS_MASK;
@ -1940,14 +1948,14 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt,
scsi_status = le16_to_cpu(sts->scsi_status) & SS_MASK; scsi_status = le16_to_cpu(sts->scsi_status) & SS_MASK;
} }
thread_id = bsg_job->request->rqst_data.h_vendor.vendor_cmd[1]; thread_id = bsg_request->rqst_data.h_vendor.vendor_cmd[1];
switch (comp_status) { switch (comp_status) {
case CS_COMPLETE: case CS_COMPLETE:
if (scsi_status == 0) { if (scsi_status == 0) {
bsg_job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
bsg_job->reply_payload.payload_len; bsg_job->reply_payload.payload_len;
vha->qla_stats.input_bytes += vha->qla_stats.input_bytes +=
bsg_job->reply->reply_payload_rcv_len; bsg_reply->reply_payload_rcv_len;
vha->qla_stats.input_requests++; vha->qla_stats.input_requests++;
rval = EXT_STATUS_OK; rval = EXT_STATUS_OK;
} }
@ -2028,11 +2036,11 @@ qla25xx_process_bidir_status_iocb(scsi_qla_host_t *vha, void *pkt,
rval = EXT_STATUS_ERR; rval = EXT_STATUS_ERR;
break; break;
} }
bsg_job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
done: done:
/* Return the vendor specific reply to API */ /* Return the vendor specific reply to API */
bsg_job->reply->reply_data.vendor_reply.vendor_rsp[0] = rval; bsg_reply->reply_data.vendor_reply.vendor_rsp[0] = rval;
bsg_job->reply_len = sizeof(struct fc_bsg_reply); bsg_job->reply_len = sizeof(struct fc_bsg_reply);
/* Always return DID_OK, bsg will send the vendor specific response /* Always return DID_OK, bsg will send the vendor specific response
* in this case only */ * in this case only */

10
drivers/scsi/qla2xxx/qla_mr.c
View File

@ -2207,6 +2207,7 @@ qlafx00_ioctl_iosb_entry(scsi_qla_host_t *vha, struct req_que *req,
const char func[] = "IOSB_IOCB"; const char func[] = "IOSB_IOCB";
srb_t *sp; srb_t *sp;
struct fc_bsg_job *bsg_job; struct fc_bsg_job *bsg_job;
struct fc_bsg_reply *bsg_reply;
struct srb_iocb *iocb_job; struct srb_iocb *iocb_job;
int res; int res;
struct qla_mt_iocb_rsp_fx00 fstatus; struct qla_mt_iocb_rsp_fx00 fstatus;
@ -2226,6 +2227,7 @@ qlafx00_ioctl_iosb_entry(scsi_qla_host_t *vha, struct req_que *req,
pkt->dataword_r; pkt->dataword_r;
} else { } else {
bsg_job = sp->u.bsg_job; bsg_job = sp->u.bsg_job;
bsg_reply = bsg_job->reply;
memset(&fstatus, 0, sizeof(struct qla_mt_iocb_rsp_fx00)); memset(&fstatus, 0, sizeof(struct qla_mt_iocb_rsp_fx00));
@ -2257,8 +2259,8 @@ qlafx00_ioctl_iosb_entry(scsi_qla_host_t *vha, struct req_que *req,
sp->fcport->vha, 0x5074, sp->fcport->vha, 0x5074,
(uint8_t *)fw_sts_ptr, sizeof(struct qla_mt_iocb_rsp_fx00)); (uint8_t *)fw_sts_ptr, sizeof(struct qla_mt_iocb_rsp_fx00));
res = bsg_job->reply->result = DID_OK << 16; res = bsg_reply->result = DID_OK << 16;
bsg_job->reply->reply_payload_rcv_len = bsg_reply->reply_payload_rcv_len =
bsg_job->reply_payload.payload_len; bsg_job->reply_payload.payload_len;
} }
sp->done(vha, sp, res); sp->done(vha, sp, res);
@ -3253,6 +3255,7 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)
struct srb_iocb *fxio = &sp->u.iocb_cmd; struct srb_iocb *fxio = &sp->u.iocb_cmd;
struct qla_mt_iocb_rqst_fx00 *piocb_rqst; struct qla_mt_iocb_rqst_fx00 *piocb_rqst;
struct fc_bsg_job *bsg_job; struct fc_bsg_job *bsg_job;
struct fc_bsg_request *bsg_request;
struct fxdisc_entry_fx00 fx_iocb; struct fxdisc_entry_fx00 fx_iocb;
uint8_t entry_cnt = 1; uint8_t entry_cnt = 1;
@ -3301,8 +3304,9 @@ qlafx00_fxdisc_iocb(srb_t *sp, struct fxdisc_entry_fx00 *pfxiocb)
} 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;
piocb_rqst = (struct qla_mt_iocb_rqst_fx00 *) piocb_rqst = (struct qla_mt_iocb_rqst_fx00 *)
&bsg_job->request->rqst_data.h_vendor.vendor_cmd[1]; &bsg_request->rqst_data.h_vendor.vendor_cmd[1];
fx_iocb.func_num = piocb_rqst->func_type; fx_iocb.func_num = piocb_rqst->func_type;
fx_iocb.adapid = piocb_rqst->adapid; fx_iocb.adapid = piocb_rqst->adapid;

55
drivers/scsi/scsi_transport_fc.c
View File

@ -3588,9 +3588,10 @@ fc_bsg_jobdone(struct fc_bsg_job *job)
{ {
struct request *req = job->req; struct request *req = job->req;
struct request *rsp = req->next_rq; struct request *rsp = req->next_rq;
struct fc_bsg_reply *bsg_reply = job->reply;
int err; int err;
err = job->req->errors = job->reply->result; err = job->req->errors = bsg_reply->result;
if (err < 0) if (err < 0)
/* we're only returning the result field in the reply */ /* we're only returning the result field in the reply */
@ -3602,10 +3603,10 @@ fc_bsg_jobdone(struct fc_bsg_job *job)
req->resid_len = 0; req->resid_len = 0;
if (rsp) { if (rsp) {
WARN_ON(job->reply->reply_payload_rcv_len > rsp->resid_len); WARN_ON(bsg_reply->reply_payload_rcv_len > rsp->resid_len);
/* set reply (bidi) residual */ /* set reply (bidi) residual */
rsp->resid_len -= min(job->reply->reply_payload_rcv_len, rsp->resid_len -= min(bsg_reply->reply_payload_rcv_len,
rsp->resid_len); rsp->resid_len);
} }
blk_complete_request(req); blk_complete_request(req);
@ -3779,11 +3780,19 @@ fc_bsg_host_dispatch(struct request_queue *q, struct Scsi_Host *shost,
struct fc_bsg_job *job) struct fc_bsg_job *job)
{ {
struct fc_internal *i = to_fc_internal(shost->transportt); struct fc_internal *i = to_fc_internal(shost->transportt);
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
int cmdlen = sizeof(uint32_t); /* start with length of msgcode */ int cmdlen = sizeof(uint32_t); /* start with length of msgcode */
int ret; int ret;
/* check if we really have all the request data needed */
if (job->request_len < cmdlen) {
ret = -ENOMSG;
goto fail_host_msg;
}
/* Validate the host command */ /* Validate the host command */
switch (job->request->msgcode) { switch (bsg_request->msgcode) {
case FC_BSG_HST_ADD_RPORT: case FC_BSG_HST_ADD_RPORT:
cmdlen += sizeof(struct fc_bsg_host_add_rport); cmdlen += sizeof(struct fc_bsg_host_add_rport);
break; break;
@ -3815,7 +3824,7 @@ fc_bsg_host_dispatch(struct request_queue *q, struct Scsi_Host *shost,
case FC_BSG_HST_VENDOR: case FC_BSG_HST_VENDOR:
cmdlen += sizeof(struct fc_bsg_host_vendor); cmdlen += sizeof(struct fc_bsg_host_vendor);
if ((shost->hostt->vendor_id == 0L) || if ((shost->hostt->vendor_id == 0L) ||
(job->request->rqst_data.h_vendor.vendor_id != (bsg_request->rqst_data.h_vendor.vendor_id !=
shost->hostt->vendor_id)) { shost->hostt->vendor_id)) {
ret = -ESRCH; ret = -ESRCH;
goto fail_host_msg; goto fail_host_msg;
@ -3827,12 +3836,6 @@ fc_bsg_host_dispatch(struct request_queue *q, struct Scsi_Host *shost,
goto fail_host_msg; goto fail_host_msg;
} }
/* check if we really have all the request data needed */
if (job->request_len < cmdlen) {
ret = -ENOMSG;
goto fail_host_msg;
}
ret = i->f->bsg_request(job); ret = i->f->bsg_request(job);
if (!ret) if (!ret)
return FC_DISPATCH_UNLOCKED; return FC_DISPATCH_UNLOCKED;
@ -3840,8 +3843,8 @@ fc_bsg_host_dispatch(struct request_queue *q, struct Scsi_Host *shost,
fail_host_msg: fail_host_msg:
/* return the errno failure code as the only status */ /* return the errno failure code as the only status */
BUG_ON(job->reply_len < sizeof(uint32_t)); BUG_ON(job->reply_len < sizeof(uint32_t));
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
job->reply->result = ret; bsg_reply->result = ret;
job->reply_len = sizeof(uint32_t); job->reply_len = sizeof(uint32_t);
fc_bsg_jobdone(job); fc_bsg_jobdone(job);
return FC_DISPATCH_UNLOCKED; return FC_DISPATCH_UNLOCKED;
@ -3878,11 +3881,19 @@ fc_bsg_rport_dispatch(struct request_queue *q, struct Scsi_Host *shost,
struct fc_rport *rport, struct fc_bsg_job *job) struct fc_rport *rport, struct fc_bsg_job *job)
{ {
struct fc_internal *i = to_fc_internal(shost->transportt); struct fc_internal *i = to_fc_internal(shost->transportt);
struct fc_bsg_request *bsg_request = job->request;
struct fc_bsg_reply *bsg_reply = job->reply;
int cmdlen = sizeof(uint32_t); /* start with length of msgcode */ int cmdlen = sizeof(uint32_t); /* start with length of msgcode */
int ret; int ret;
/* check if we really have all the request data needed */
if (job->request_len < cmdlen) {
ret = -ENOMSG;
goto fail_rport_msg;
}
/* Validate the rport command */ /* Validate the rport command */
switch (job->request->msgcode) { switch (bsg_request->msgcode) {
case FC_BSG_RPT_ELS: case FC_BSG_RPT_ELS:
cmdlen += sizeof(struct fc_bsg_rport_els); cmdlen += sizeof(struct fc_bsg_rport_els);
goto check_bidi; goto check_bidi;
@ -3902,12 +3913,6 @@ check_bidi:
goto fail_rport_msg; goto fail_rport_msg;
} }
/* check if we really have all the request data needed */
if (job->request_len < cmdlen) {
ret = -ENOMSG;
goto fail_rport_msg;
}
ret = i->f->bsg_request(job); ret = i->f->bsg_request(job);
if (!ret) if (!ret)
return FC_DISPATCH_UNLOCKED; return FC_DISPATCH_UNLOCKED;
@ -3915,8 +3920,8 @@ check_bidi:
fail_rport_msg: fail_rport_msg:
/* return the errno failure code as the only status */ /* return the errno failure code as the only status */
BUG_ON(job->reply_len < sizeof(uint32_t)); BUG_ON(job->reply_len < sizeof(uint32_t));
job->reply->reply_payload_rcv_len = 0; bsg_reply->reply_payload_rcv_len = 0;
job->reply->result = ret; bsg_reply->result = ret;
job->reply_len = sizeof(uint32_t); job->reply_len = sizeof(uint32_t);
fc_bsg_jobdone(job); fc_bsg_jobdone(job);
return FC_DISPATCH_UNLOCKED; return FC_DISPATCH_UNLOCKED;
@ -3937,6 +3942,7 @@ fc_bsg_request_handler(struct request_queue *q, struct Scsi_Host *shost,
struct request *req; struct request *req;
struct fc_bsg_job *job; struct fc_bsg_job *job;
enum fc_dispatch_result ret; enum fc_dispatch_result ret;
struct fc_bsg_reply *bsg_reply;
if (!get_device(dev)) if (!get_device(dev))
return; return;
@ -3973,8 +3979,9 @@ fc_bsg_request_handler(struct request_queue *q, struct Scsi_Host *shost,
/* check if we have the msgcode value at least */ /* check if we have the msgcode value at least */
if (job->request_len < sizeof(uint32_t)) { if (job->request_len < sizeof(uint32_t)) {
BUG_ON(job->reply_len < sizeof(uint32_t)); BUG_ON(job->reply_len < sizeof(uint32_t));
job->reply->reply_payload_rcv_len = 0; bsg_reply = job->reply;
job->reply->result = -ENOMSG; bsg_reply->reply_payload_rcv_len = 0;
bsg_reply->result = -ENOMSG;
job->reply_len = sizeof(uint32_t); job->reply_len = sizeof(uint32_t);
fc_bsg_jobdone(job); fc_bsg_jobdone(job);
spin_lock_irq(q->queue_lock); spin_lock_irq(q->queue_lock);