mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
[SCSI] qla4xxx: Add get ACB state support using BSG
Signed-off-by: Harish Zunjarrao <harish.zunjarrao@qlogic.com> Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
ef7830bb62
commit
8b0402e138
4 changed files with 86 additions and 0 deletions
|
@ -139,6 +139,63 @@ qla4xxx_update_flash(struct bsg_job *bsg_job)
|
|||
return rval;
|
||||
}
|
||||
|
||||
static int
|
||||
qla4xxx_get_acb_state(struct bsg_job *bsg_job)
|
||||
{
|
||||
struct Scsi_Host *host = iscsi_job_to_shost(bsg_job);
|
||||
struct scsi_qla_host *ha = to_qla_host(host);
|
||||
struct iscsi_bsg_request *bsg_req = bsg_job->request;
|
||||
struct iscsi_bsg_reply *bsg_reply = bsg_job->reply;
|
||||
uint32_t status[MBOX_REG_COUNT];
|
||||
uint32_t acb_idx;
|
||||
uint32_t ip_idx;
|
||||
int rval = -EINVAL;
|
||||
|
||||
bsg_reply->reply_payload_rcv_len = 0;
|
||||
|
||||
if (unlikely(pci_channel_offline(ha->pdev)))
|
||||
goto leave;
|
||||
|
||||
/* Only 4022 and above adapters are supported */
|
||||
if (is_qla4010(ha))
|
||||
goto leave;
|
||||
|
||||
if (ql4xxx_reset_active(ha)) {
|
||||
ql4_printk(KERN_ERR, ha, "%s: reset active\n", __func__);
|
||||
rval = -EBUSY;
|
||||
goto leave;
|
||||
}
|
||||
|
||||
if (bsg_job->reply_payload.payload_len < sizeof(status)) {
|
||||
ql4_printk(KERN_ERR, ha, "%s: invalid payload len %d\n",
|
||||
__func__, bsg_job->reply_payload.payload_len);
|
||||
rval = -EINVAL;
|
||||
goto leave;
|
||||
}
|
||||
|
||||
acb_idx = bsg_req->rqst_data.h_vendor.vendor_cmd[1];
|
||||
ip_idx = bsg_req->rqst_data.h_vendor.vendor_cmd[2];
|
||||
|
||||
rval = qla4xxx_get_ip_state(ha, acb_idx, ip_idx, status);
|
||||
if (rval) {
|
||||
ql4_printk(KERN_ERR, ha, "%s: get ip state failed\n",
|
||||
__func__);
|
||||
bsg_reply->result = DID_ERROR << 16;
|
||||
rval = -EIO;
|
||||
} else {
|
||||
bsg_reply->reply_payload_rcv_len =
|
||||
sg_copy_from_buffer(bsg_job->reply_payload.sg_list,
|
||||
bsg_job->reply_payload.sg_cnt,
|
||||
status, sizeof(status));
|
||||
bsg_reply->result = DID_OK << 16;
|
||||
}
|
||||
|
||||
bsg_job_done(bsg_job, bsg_reply->result,
|
||||
bsg_reply->reply_payload_rcv_len);
|
||||
leave:
|
||||
return rval;
|
||||
}
|
||||
|
||||
/**
|
||||
* qla4xxx_process_vendor_specific - handle vendor specific bsg request
|
||||
* @job: iscsi_bsg_job to handle
|
||||
|
@ -157,6 +214,9 @@ int qla4xxx_process_vendor_specific(struct bsg_job *bsg_job)
|
|||
case QLISCSI_VND_UPDATE_FLASH:
|
||||
return qla4xxx_update_flash(bsg_job);
|
||||
|
||||
case QLISCSI_VND_GET_ACB_STATE:
|
||||
return qla4xxx_get_acb_state(bsg_job);
|
||||
|
||||
default:
|
||||
ql4_printk(KERN_ERR, ha, "%s: invalid BSG vendor command: "
|
||||
"0x%x\n", __func__, bsg_req->msgcode);
|
||||
|
|
|
@ -10,5 +10,6 @@
|
|||
/* BSG Vendor specific commands */
|
||||
#define QLISCSI_VND_READ_FLASH 1
|
||||
#define QLISCSI_VND_UPDATE_FLASH 2
|
||||
#define QLISCSI_VND_GET_ACB_STATE 3
|
||||
|
||||
#endif
|
||||
|
|
|
@ -58,6 +58,8 @@ int qla4xxx_set_acb(struct scsi_qla_host *ha, uint32_t *mbox_cmd,
|
|||
uint32_t *mbox_sts, dma_addr_t acb_dma);
|
||||
int qla4xxx_get_acb(struct scsi_qla_host *ha, uint32_t *mbox_cmd,
|
||||
uint32_t *mbox_sts, dma_addr_t acb_dma);
|
||||
int qla4xxx_get_ip_state(struct scsi_qla_host *ha, uint32_t acb_idx,
|
||||
uint32_t ip_idx, uint32_t *sts);
|
||||
void qla4xxx_mark_device_missing(struct iscsi_cls_session *cls_session);
|
||||
u16 rd_nvram_word(struct scsi_qla_host *ha, int offset);
|
||||
u8 rd_nvram_byte(struct scsi_qla_host *ha, int offset);
|
||||
|
|
|
@ -1667,3 +1667,26 @@ int qla4xxx_get_mgmt_data(struct scsi_qla_host *ha, uint16_t fw_ddb_index,
|
|||
}
|
||||
return status;
|
||||
}
|
||||
|
||||
int qla4xxx_get_ip_state(struct scsi_qla_host *ha, uint32_t acb_idx,
|
||||
uint32_t ip_idx, uint32_t *sts)
|
||||
{
|
||||
uint32_t mbox_cmd[MBOX_REG_COUNT];
|
||||
uint32_t mbox_sts[MBOX_REG_COUNT];
|
||||
int status = QLA_SUCCESS;
|
||||
|
||||
memset(&mbox_cmd, 0, sizeof(mbox_cmd));
|
||||
memset(&mbox_sts, 0, sizeof(mbox_sts));
|
||||
mbox_cmd[0] = MBOX_CMD_GET_IP_ADDR_STATE;
|
||||
mbox_cmd[1] = acb_idx;
|
||||
mbox_cmd[2] = ip_idx;
|
||||
|
||||
status = qla4xxx_mailbox_command(ha, 3, 8, &mbox_cmd[0], &mbox_sts[0]);
|
||||
if (status != QLA_SUCCESS) {
|
||||
DEBUG2(ql4_printk(KERN_WARNING, ha, "%s: "
|
||||
"MBOX_CMD_GET_IP_ADDR_STATE failed w/ "
|
||||
"status %04X\n", __func__, mbox_sts[0]));
|
||||
}
|
||||
memcpy(sts, mbox_sts, sizeof(mbox_sts));
|
||||
return status;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue