From: Madhuranath Iyengar <mni@xxxxxxxxxxxxxxx>
The reason is to shorten the names of the IOCB structs defined in qla_target.h.
Signed-off-by: Madhuranath Iyengar <mni@xxxxxxxxxxxxxxx>
---
drivers/scsi/qla2xxx/qla_target.c | 219 +++++++++++------------
drivers/scsi/qla2xxx/qla_target.h | 44 +++---
drivers/target/tcm_qla2xxx/tcm_qla2xxx_fabric.c | 4 +-
3 files changed, 131 insertions(+), 136 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c
index 0f222fd..c08c192 100644
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@ -97,8 +97,7 @@ enum fcp_resp_rsp_codes {
static int __qla_tgt_24xx_xmit_response(struct qla_tgt_cmd *, int, uint8_t);
/* Predefs for callbacks handed to qla2xxx LLD */
-static void qla_tgt_24xx_atio_pkt(struct scsi_qla_host *ha,
- atio7_from_24xx_entry_t *pkt);
+static void qla_tgt_24xx_atio_pkt(struct scsi_qla_host *ha, atio7_from_24xx_t *pkt);
static void qla_tgt_response_pkt(struct scsi_qla_host *ha, response_t *pkt);
static int qla_tgt_issue_task_mgmt(struct qla_tgt_sess *sess, uint32_t lun,
int fn, void *iocb, int flags);
@@ -220,8 +219,7 @@ struct scsi_qla_host *qla_tgt_find_host_by_vp_idx(struct scsi_qla_host *vha, uin
return NULL;
}
-void qla_tgt_24xx_atio_pkt_all_vps(struct scsi_qla_host *vha,
- atio7_from_24xx_entry_t *atio)
+void qla_tgt_24xx_atio_pkt_all_vps(struct scsi_qla_host *vha, atio7_from_24xx_t *atio)
{
struct qla_hw_data *ha = vha->hw;
@@ -245,7 +243,7 @@ void qla_tgt_24xx_atio_pkt_all_vps(struct scsi_qla_host *vha,
struct scsi_qla_host *host = vha;
if (IS_FWI2_CAPABLE(ha)) {
- imm_ntfy_from_24xx_entry_t *entry = (imm_ntfy_from_24xx_entry_t *)atio;
+ imm_ntfy_from_24xx_t *entry = (imm_ntfy_from_24xx_t *)atio;
if ((entry->vp_index != 0xFF) &&
(entry->nport_handle != 0xFFFF)) {
host = qla_tgt_find_host_by_vp_idx(vha,
@@ -279,7 +277,7 @@ void qla_tgt_response_pkt_all_vps(struct scsi_qla_host *vha, response_t *pkt)
switch (pkt->entry_type) {
case CTIO_TYPE7:
{
- ctio7_from_24xx_entry_t *entry = (ctio7_from_24xx_entry_t *)pkt;
+ ctio7_from_24xx_t *entry = (ctio7_from_24xx_t *)pkt;
struct scsi_qla_host *host = qla_tgt_find_host_by_vp_idx(vha,
entry->vp_index);
if (unlikely(!host)) {
@@ -296,7 +294,7 @@ void qla_tgt_response_pkt_all_vps(struct scsi_qla_host *vha, response_t *pkt)
{
struct scsi_qla_host *host = vha;
if (IS_FWI2_CAPABLE(ha)) {
- imm_ntfy_from_24xx_entry_t *entry = (imm_ntfy_from_24xx_entry_t *)pkt;
+ imm_ntfy_from_24xx_t *entry = (imm_ntfy_from_24xx_t *)pkt;
host = qla_tgt_find_host_by_vp_idx(vha, entry->vp_index);
if (unlikely(!host)) {
printk(KERN_ERR "qla_target(%d): Response pkt "
@@ -314,7 +312,7 @@ void qla_tgt_response_pkt_all_vps(struct scsi_qla_host *vha, response_t *pkt)
{
struct scsi_qla_host *host = vha;
if (IS_FWI2_CAPABLE(ha)) {
- nack_to_24xx_entry_t *entry = (nack_to_24xx_entry_t *)pkt;
+ nack_to_24xx_t *entry = (nack_to_24xx_t *)pkt;
if (0xFF != entry->vp_index) {
host = qla_tgt_find_host_by_vp_idx(vha,
entry->vp_index);
@@ -334,7 +332,7 @@ void qla_tgt_response_pkt_all_vps(struct scsi_qla_host *vha, response_t *pkt)
case ABTS_RECV_24XX:
{
- abts_recv_from_24xx_entry_t *entry = (abts_recv_from_24xx_entry_t *)pkt;
+ abts_recv_from_24xx_t *entry = (abts_recv_from_24xx_t *)pkt;
struct scsi_qla_host *host = qla_tgt_find_host_by_vp_idx(vha,
entry->vp_index);
if (unlikely(!host)) {
@@ -349,7 +347,7 @@ void qla_tgt_response_pkt_all_vps(struct scsi_qla_host *vha, response_t *pkt)
case ABTS_RESP_24XX:
{
- abts_resp_to_24xx_entry_t *entry = (abts_resp_to_24xx_entry_t *)pkt;
+ abts_resp_to_24xx_t *entry = (abts_resp_to_24xx_t *)pkt;
struct scsi_qla_host *host = qla_tgt_find_host_by_vp_idx(vha,
entry->vp_index);
if (unlikely(!host)) {
@@ -496,13 +494,13 @@ static int qla_tgt_reset(struct scsi_qla_host *vha, void *iocb, int mcmd)
memset(&s_id, 0, 3);
if (IS_FWI2_CAPABLE(ha)) {
- imm_ntfy_from_24xx_entry_t *n = (imm_ntfy_from_24xx_entry_t *)iocb;
+ imm_ntfy_from_24xx_t *n = (imm_ntfy_from_24xx_t *)iocb;
loop_id = le16_to_cpu(n->nport_handle);
s_id[0] = n->port_id[0];
s_id[1] = n->port_id[1];
s_id[2] = n->port_id[2];
} else
- loop_id = GET_TARGET_ID(ha, (imm_ntfy_from_2xxx_entry_t *)iocb);
+ loop_id = GET_TARGET_ID(ha, (imm_ntfy_from_2xxx_t *)iocb);
if (loop_id == 0xFFFF) {
#warning FIXME: Re-enable Global event handling..
@@ -556,10 +554,10 @@ static int qla_tgt_reset(struct scsi_qla_host *vha, void *iocb, int mcmd)
mcmd, loop_id);
if (IS_FWI2_CAPABLE(ha)) {
- atio7_from_24xx_entry_t *a = (atio7_from_24xx_entry_t *)iocb;
+ atio7_from_24xx_t *a = (atio7_from_24xx_t *)iocb;
lun = a->fcp_cmnd.lun;
} else {
- imm_ntfy_from_2xxx_entry_t *n = (imm_ntfy_from_2xxx_entry_t *)iocb;
+ imm_ntfy_from_2xxx_t *n = (imm_ntfy_from_2xxx_t *)iocb;
lun = swab16(le16_to_cpu(n->lun));
}
unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);
@@ -1231,14 +1229,14 @@ static void qla_tgt_2xxx_send_modify_lun(struct scsi_qla_host *vha, int cmd_coun
int imm_count)
{
struct qla_hw_data *ha = vha->hw;
- modify_lun_entry_t *pkt;
+ modify_lun_t *pkt;
printk(KERN_INFO "Sending MODIFY_LUN (ha=%p, cmd=%d, imm=%d)\n",
ha, cmd_count, imm_count);
/* Sending marker isn't necessary, since we called from ISR */
- pkt = (modify_lun_entry_t *)qla2x00_req_pkt(vha);
+ pkt = (modify_lun_t *)qla2x00_req_pkt(vha);
if (!pkt) {
printk(KERN_ERR "qla_target(%d): %s failed: unable to allocate "
"request packet\n", vha->vp_idx, __func__);
@@ -1301,9 +1299,9 @@ static void qla_tgt_send_notify_ack(struct scsi_qla_host *vha,
pkt->entry_count = 1;
if (IS_FWI2_CAPABLE(ha)) {
- nack_to_24xx_entry_t *nack24 = (nack_to_24xx_entry_t *)pkt;
- imm_ntfy_from_24xx_entry_t *ntfy24 =
- (imm_ntfy_from_24xx_entry_t *)iocb;
+ nack_to_24xx_t *nack24 = (nack_to_24xx_t *)pkt;
+ imm_ntfy_from_24xx_t *ntfy24 =
+ (imm_ntfy_from_24xx_t *)iocb;
nack24->nport_handle = ntfy24->nport_handle;
if (le16_to_cpu(ntfy24->status) == IMM_NTFY_ELS) {
@@ -1326,9 +1324,9 @@ static void qla_tgt_send_notify_ack(struct scsi_qla_host *vha,
"qla_target(%d): Sending 24xx Notify Ack %d\n",
vha->vp_idx, nack24->status);
} else {
- nack_to_2xxx_entry_t *nack = (nack_to_2xxx_entry_t *)pkt;
- imm_ntfy_from_2xxx_entry_t *ntfy =
- (imm_ntfy_from_2xxx_entry_t *)iocb;
+ nack_to_2xxx_t *nack = (nack_to_2xxx_t *)pkt;
+ imm_ntfy_from_2xxx_t *ntfy =
+ (imm_ntfy_from_2xxx_t *)iocb;
SET_TARGET_ID(ha, nack->target, GET_TARGET_ID(ha, ntfy));
nack->status = ntfy->status;
@@ -1364,11 +1362,11 @@ static void qla_tgt_send_notify_ack(struct scsi_qla_host *vha,
* ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
*/
static void qla_tgt_24xx_send_abts_resp(struct scsi_qla_host *vha,
- abts_recv_from_24xx_entry_t *abts, uint32_t status,
+ abts_recv_from_24xx_t *abts, uint32_t status,
bool ids_reversed)
{
struct qla_hw_data *ha = vha->hw;
- abts_resp_to_24xx_entry_t *resp;
+ abts_resp_to_24xx_t *resp;
uint32_t f_ctl;
uint8_t *p;
@@ -1379,7 +1377,7 @@ static void qla_tgt_24xx_send_abts_resp(struct scsi_qla_host *vha,
if (qla_tgt_issue_marker(vha, 1) != QLA_SUCCESS)
return;
- resp = (abts_resp_to_24xx_entry_t *)qla2x00_req_pkt(vha);
+ resp = (abts_resp_to_24xx_t *)qla2x00_req_pkt(vha);
if (!resp) {
printk(KERN_ERR "qla_target(%d): %s failed: unable to allocate "
"request packet", vha->vp_idx, __func__);
@@ -1439,9 +1437,9 @@ static void qla_tgt_24xx_send_abts_resp(struct scsi_qla_host *vha,
* ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
*/
static void qla_tgt_24xx_retry_term_exchange(struct scsi_qla_host *vha,
- abts_resp_from_24xx_fw_entry_t *entry)
+ abts_resp_from_24xx_fw_t *entry)
{
- ctio7_to_24xx_entry_t *ctio;
+ ctio7_to_24xx_t *ctio;
ql_dbg(ql_dbg_tgt, vha, 0xe009, "Sending retry TERM EXCH CTIO7"
" (ha=%p)\n", vha->hw);
@@ -1449,7 +1447,7 @@ static void qla_tgt_24xx_retry_term_exchange(struct scsi_qla_host *vha,
if (qla_tgt_issue_marker(vha, 1) != QLA_SUCCESS)
return;
- ctio = (ctio7_to_24xx_entry_t *)qla2x00_req_pkt(vha);
+ ctio = (ctio7_to_24xx_t *)qla2x00_req_pkt(vha);
if (ctio == NULL) {
printk(KERN_ERR "qla_target(%d): %s failed: unable to allocate "
"request packet\n", vha->vp_idx, __func__);
@@ -1477,13 +1475,13 @@ static void qla_tgt_24xx_retry_term_exchange(struct scsi_qla_host *vha,
qla2x00_isp_cmd(vha, vha->req);
- qla_tgt_24xx_send_abts_resp(vha, (abts_recv_from_24xx_entry_t *)entry,
+ qla_tgt_24xx_send_abts_resp(vha, (abts_recv_from_24xx_t *)entry,
FCP_TMF_CMPL, true);
}
/* ha->hardware_lock supposed to be held on entry */
static int __qla_tgt_24xx_handle_abts(struct scsi_qla_host *vha,
- abts_recv_from_24xx_entry_t *abts, struct qla_tgt_sess *sess)
+ abts_recv_from_24xx_t *abts, struct qla_tgt_sess *sess)
{
struct qla_hw_data *ha = vha->hw;
struct qla_tgt_mgmt_cmd *mcmd;
@@ -1518,7 +1516,7 @@ static int __qla_tgt_24xx_handle_abts(struct scsi_qla_host *vha,
* ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
*/
static void qla_tgt_24xx_handle_abts(struct scsi_qla_host *vha,
- abts_recv_from_24xx_entry_t *abts)
+ abts_recv_from_24xx_t *abts)
{
struct qla_hw_data *ha = vha->hw;
struct qla_tgt_sess *sess;
@@ -1576,8 +1574,8 @@ static void qla_tgt_24xx_handle_abts(struct scsi_qla_host *vha,
static void qla_tgt_24xx_send_task_mgmt_ctio(struct scsi_qla_host *ha,
struct qla_tgt_mgmt_cmd *mcmd, uint32_t resp_code)
{
- atio7_from_24xx_entry_t *atio = (atio7_from_24xx_entry_t *)&mcmd->orig_iocb;
- ctio7_to_24xx_entry_t *ctio;
+ atio7_from_24xx_t *atio = (atio7_from_24xx_t *)&mcmd->orig_iocb;
+ ctio7_to_24xx_t *ctio;
ql_dbg(ql_dbg_tgt, ha, 0xe00a, "Sending task mgmt CTIO7 (ha=%p,"
" atio=%p, resp_code=%x\n", ha, atio, resp_code);
@@ -1586,7 +1584,7 @@ static void qla_tgt_24xx_send_task_mgmt_ctio(struct scsi_qla_host *ha,
if (qla_tgt_issue_marker(ha, 1) != QLA_SUCCESS)
return;
- ctio = (ctio7_to_24xx_entry_t *)qla2x00_req_pkt(ha);
+ ctio = (ctio7_to_24xx_t *)qla2x00_req_pkt(ha);
if (ctio == NULL) {
printk(KERN_ERR "qla_target(%d): %s failed: unable to allocate "
"request packet\n", ha->vp_idx, __func__);
@@ -1638,7 +1636,7 @@ void qla_tgt_xmit_tm_rsp(struct qla_tgt_mgmt_cmd *mcmd)
} else {
if (mcmd->se_tmr_req->function == ABORT_TASK)
qla_tgt_24xx_send_abts_resp(vha,
- (abts_recv_from_24xx_entry_t *)&mcmd->orig_iocb,
+ (abts_recv_from_24xx_t *)&mcmd->orig_iocb,
mcmd->fc_tm_rsp, false);
else
qla_tgt_24xx_send_task_mgmt_ctio(vha, mcmd, mcmd->fc_tm_rsp);
@@ -1834,11 +1832,11 @@ static inline uint32_t qla_tgt_make_handle(struct scsi_qla_host *vha)
static void qla_tgt_2xxx_build_ctio_pkt(struct qla_tgt_prm *prm, struct scsi_qla_host *vha)
{
uint32_t h;
- ctio_to_2xxx_entry_t *pkt;
- atio_from_2xxx_entry_t *atio2x = (atio_from_2xxx_entry_t *)&prm->cmd->atio;
+ ctio_to_2xxx_t *pkt;
+ atio_from_2xxx_t *atio2x = (atio_from_2xxx_t *)&prm->cmd->atio;
struct qla_hw_data *ha = vha->hw;
- pkt = (ctio_to_2xxx_entry_t *)vha->req->ring_ptr;
+ pkt = (ctio_to_2xxx_t *)vha->req->ring_ptr;
prm->pkt = pkt;
memset(pkt, 0, sizeof(*pkt));
@@ -1874,11 +1872,11 @@ static void qla_tgt_2xxx_build_ctio_pkt(struct qla_tgt_prm *prm, struct scsi_qla
static int qla_tgt_24xx_build_ctio_pkt(struct qla_tgt_prm *prm, struct scsi_qla_host *vha)
{
uint32_t h;
- ctio7_to_24xx_entry_t *pkt;
+ ctio7_to_24xx_t *pkt;
struct qla_hw_data *ha = vha->hw;
- atio7_from_24xx_entry_t *atio = (atio7_from_24xx_entry_t *)&prm->cmd->atio;
+ atio7_from_24xx_t *atio = (atio7_from_24xx_t *)&prm->cmd->atio;
- pkt = (ctio7_to_24xx_entry_t *)vha->req->ring_ptr;
+ pkt = (ctio7_to_24xx_t *)vha->req->ring_ptr;
prm->pkt = pkt;
memset(pkt, 0, sizeof(*pkt));
@@ -1991,7 +1989,7 @@ static void qla_tgt_load_data_segments(struct qla_tgt_prm *prm,
int enable_64bit_addressing = prm->tgt->tgt_enable_64bit_addr;
if (IS_FWI2_CAPABLE(ha)) {
- ctio7_to_24xx_entry_t *pkt24 = (ctio7_to_24xx_entry_t *)prm->pkt;
+ ctio7_to_24xx_t *pkt24 = (ctio7_to_24xx_t *)prm->pkt;
ql_dbg(ql_dbg_tgt, vha, 0xe00f,
"iocb->scsi_status=%x, iocb->flags=%x\n",
@@ -2007,7 +2005,7 @@ static void qla_tgt_load_data_segments(struct qla_tgt_prm *prm,
if (prm->seg_cnt)
pkt24->dseg_count = cpu_to_le16(prm->seg_cnt);
} else {
- ctio_to_2xxx_entry_t *pkt2x = (ctio_to_2xxx_entry_t *)prm->pkt;
+ ctio_to_2xxx_t *pkt2x = (ctio_to_2xxx_t *)prm->pkt;
ql_dbg(ql_dbg_tgt_pkt, vha, 0xe204,
"iocb->scsi_status=%x, iocb->flags=%x\n",
@@ -2173,7 +2171,7 @@ static inline int qla_tgt_need_explicit_conf(struct qla_hw_data *ha,
return ha->enable_explicit_conf && cmd->conf_compl_supported;
}
-static void qla_tgt_2xxx_init_ctio_to_isp(ctio_from_2xxx_entry_t *ctio_m1,
+static void qla_tgt_2xxx_init_ctio_to_isp(ctio_from_2xxx_t *ctio_m1,
struct qla_tgt_prm *prm, struct scsi_qla_host *vha)
{
struct qla_hw_data *ha = vha->hw;
@@ -2216,7 +2214,7 @@ static int __qla_tgt_2xxx_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
struct scsi_qla_host *vha = cmd->vha;
struct qla_hw_data *ha = vha->hw;
struct qla_tgt_prm prm;
- ctio_to_2xxx_entry_t *pkt;
+ ctio_to_2xxx_t *pkt;
unsigned long flags = 0;
uint32_t full_req_cnt = 0;
int res;
@@ -2240,7 +2238,7 @@ static int __qla_tgt_2xxx_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
goto out_unmap_unlock;
qla_tgt_2xxx_build_ctio_pkt(&prm, cmd->vha);
- pkt = (ctio_to_2xxx_entry_t *)prm.pkt;
+ pkt = (ctio_to_2xxx_t *)prm.pkt;
if (qla_tgt_has_data(cmd) && (xmit_type & QLA_TGT_XMIT_DATA)) {
pkt->flags |= __constant_cpu_to_le16(OF_FAST_POST | OF_DATA_IN);
@@ -2265,8 +2263,8 @@ static int __qla_tgt_2xxx_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
* amount of request entries to not drop HW lock in
* req_pkt().
*/
- ctio_from_2xxx_entry_t *ctio_m1 =
- (ctio_from_2xxx_entry_t *)qla_tgt_get_req_pkt(vha);
+ ctio_from_2xxx_t *ctio_m1 =
+ (ctio_from_2xxx_t *)qla_tgt_get_req_pkt(vha);
ql_dbg(ql_dbg_tgt, vha, 0xe015, "%s", "Building"
" additional status packet");
@@ -2282,7 +2280,7 @@ static int __qla_tgt_2xxx_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
qla_tgt_2xxx_init_ctio_to_isp(ctio_m1, &prm, cmd->vha);
}
} else
- qla_tgt_2xxx_init_ctio_to_isp((ctio_from_2xxx_entry_t *)pkt,
+ qla_tgt_2xxx_init_ctio_to_isp((ctio_from_2xxx_t *)pkt,
&prm, cmd->vha);
cmd->state = QLA_TGT_STATE_PROCESSED; /* Mid-level is done processing */
@@ -2404,7 +2402,7 @@ int qla_tgt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type, uint8_t scsi_s
}
EXPORT_SYMBOL(qla_tgt_xmit_response);
-static void qla_tgt_24xx_init_ctio_to_isp(ctio7_to_24xx_entry_t *ctio,
+static void qla_tgt_24xx_init_ctio_to_isp(ctio7_to_24xx_t *ctio,
struct qla_tgt_prm *prm)
{
prm->sense_buffer_len = min((uint32_t)prm->sense_buffer_len,
@@ -2469,7 +2467,7 @@ static int __qla_tgt_24xx_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
{
struct scsi_qla_host *vha = cmd->vha;
struct qla_hw_data *ha = vha->hw;
- ctio7_to_24xx_entry_t *pkt;
+ ctio7_to_24xx_t *pkt;
struct qla_tgt_prm prm;
uint32_t full_req_cnt = 0;
unsigned long flags = 0;
@@ -2498,7 +2496,7 @@ static int __qla_tgt_24xx_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
goto out_unmap_unlock;
- pkt = (ctio7_to_24xx_entry_t *)prm.pkt;
+ pkt = (ctio7_to_24xx_t *)prm.pkt;
if (qla_tgt_has_data(cmd) && (xmit_type & QLA_TGT_XMIT_DATA)) {
pkt->u.status0.flags |= __constant_cpu_to_le16(CTIO7_FLAGS_DATA_IN |
@@ -2525,8 +2523,8 @@ static int __qla_tgt_24xx_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
* amount of request entries to not drop HW lock in
* req_pkt().
*/
- ctio7_to_24xx_entry_t *ctio =
- (ctio7_to_24xx_entry_t *)qla_tgt_get_req_pkt(vha);
+ ctio7_to_24xx_t *ctio =
+ (ctio7_to_24xx_t *)qla_tgt_get_req_pkt(vha);
ql_dbg(ql_dbg_tgt, vha, 0xe019, "Building additional"
" status packet\n");
@@ -2541,7 +2539,7 @@ static int __qla_tgt_24xx_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
pkt->handle |= CTIO_INTERMEDIATE_HANDLE_MARK;
pkt->u.status0.flags |= __constant_cpu_to_le16(
CTIO7_FLAGS_DONT_RET_CTIO);
- qla_tgt_24xx_init_ctio_to_isp((ctio7_to_24xx_entry_t *)ctio,
+ qla_tgt_24xx_init_ctio_to_isp((ctio7_to_24xx_t *)ctio,
&prm);
printk("Status CTIO7: %p\n", ctio);
}
@@ -2602,18 +2600,18 @@ int qla_tgt_rdy_to_xfer(struct qla_tgt_cmd *cmd)
goto out_unlock_free_unmap;
if (IS_FWI2_CAPABLE(ha)) {
- ctio7_to_24xx_entry_t *pkt;
+ ctio7_to_24xx_t *pkt;
res = qla_tgt_24xx_build_ctio_pkt(&prm, vha);
if (unlikely(res != 0))
goto out_unlock_free_unmap;
- pkt = (ctio7_to_24xx_entry_t *)prm.pkt;
+ pkt = (ctio7_to_24xx_t *)prm.pkt;
pkt->u.status0.flags |= __constant_cpu_to_le16(CTIO7_FLAGS_DATA_OUT |
CTIO7_FLAGS_STATUS_MODE_0);
qla_tgt_load_data_segments(&prm, vha);
} else {
- ctio_to_2xxx_entry_t *pkt;
+ ctio_to_2xxx_t *pkt;
qla_tgt_2xxx_build_ctio_pkt(&prm, vha);
- pkt = (ctio_to_2xxx_entry_t *)prm.pkt;
+ pkt = (ctio_to_2xxx_t *)prm.pkt;
pkt->flags = __constant_cpu_to_le16(OF_FAST_POST | OF_DATA_OUT);
qla_tgt_load_data_segments(&prm, vha);
}
@@ -2673,8 +2671,8 @@ static void qla_tgt_send_term_exchange(struct scsi_qla_host *vha, struct qla_tgt
pkt->handle = QLA_TGT_SKIP_HANDLE | CTIO_COMPLETION_HANDLE_MARK;
if (IS_FWI2_CAPABLE(ha)) {
- ctio7_to_24xx_entry_t *ctio24 = (ctio7_to_24xx_entry_t *)pkt;
- atio7_from_24xx_entry_t *atio7 = (atio7_from_24xx_entry_t *)atio;
+ ctio7_to_24xx_t *ctio24 = (ctio7_to_24xx_t *)pkt;
+ atio7_from_24xx_t *atio7 = (atio7_from_24xx_t *)atio;
ctio24->entry_type = CTIO_TYPE7;
if (cmd == NULL)
ctio24->nport_handle = CTIO7_NHANDLE_UNRECOGNIZED;
@@ -2694,8 +2692,8 @@ static void qla_tgt_send_term_exchange(struct scsi_qla_host *vha, struct qla_tgt
if (ctio24->u.status1.residual != 0)
ctio24->u.status1.scsi_status |= SS_RESIDUAL_UNDER;
} else {
- ctio_from_2xxx_entry_t *ctio = (ctio_from_2xxx_entry_t *)pkt;
- atio_from_2xxx_entry_t *atio2x = (atio_from_2xxx_entry_t *)atio;
+ ctio_from_2xxx_t *ctio = (ctio_from_2xxx_t *)pkt;
+ atio_from_2xxx_t *atio2x = (atio_from_2xxx_t *)atio;
ctio->entry_type = CTIO_RET_TYPE;
@@ -2828,7 +2826,7 @@ static int qla_tgt_term_ctio_exchange(struct scsi_qla_host *vha, void *ctio,
if (IS_FWI2_CAPABLE(ha)) {
if (ctio != NULL) {
- ctio7_from_24xx_entry_t *c = (ctio7_from_24xx_entry_t *)ctio;
+ ctio7_from_24xx_t *c = (ctio7_from_24xx_t *)ctio;
term = !(c->flags &
__constant_cpu_to_le16(OF_TERM_EXCH));
} else
@@ -2840,7 +2838,7 @@ static int qla_tgt_term_ctio_exchange(struct scsi_qla_host *vha, void *ctio,
qla_tgt_2xxx_send_modify_lun(vha, 1, 0);
#if 0 /* seems, it isn't needed */
if (ctio != NULL) {
- ctio_to_2xxx_entry_t *c = (ctio_to_2xxx_entry_t *)ctio;
+ ctio_to_2xxx_t *c = (ctio_to_2xxx_t *)ctio;
term = !(c->flags &
__constant_cpu_to_le16(
CTIO7_FLAGS_TERMINATE));
@@ -2909,7 +2907,7 @@ static struct qla_tgt_cmd *qla_tgt_ctio_to_cmd(struct scsi_qla_host *vha, uint32
vha->vp_idx);
return NULL;
} else {
- ctio_to_2xxx_entry_t *c = (ctio_to_2xxx_entry_t *)ctio;
+ ctio_to_2xxx_t *c = (ctio_to_2xxx_t *)ctio;
loop_id = GET_TARGET_ID(ha, c);
tag = c->rx_id;
}
@@ -3091,7 +3089,7 @@ static inline int qla_tgt_get_fcp_task_attr(uint8_t task_codes)
/* This functions sends the ISP 2xxx command to the tcm_qla2xxx target */
static int qla_tgt_2xxx_send_cmd_to_tcm(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd)
{
- atio_from_2xxx_entry_t *atio = (atio_from_2xxx_entry_t *)&cmd->atio;
+ atio_from_2xxx_t *atio = (atio_from_2xxx_t *)&cmd->atio;
uint32_t data_length;
int fcp_task_attr, data_dir, bidi = 0, ret;
uint16_t lun, unpacked_lun;
@@ -3129,7 +3127,7 @@ static int qla_tgt_2xxx_send_cmd_to_tcm(struct scsi_qla_host *vha, struct qla_tg
/* This function sends the ISP 24xx command to the tcm_qla2xxx target */
static int qla_tgt_24xx_send_cmd_to_tcm(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd)
{
- atio7_from_24xx_entry_t *atio = (atio7_from_24xx_entry_t *)&cmd->atio;
+ atio7_from_24xx_t *atio = (atio7_from_24xx_t *)&cmd->atio;
uint32_t unpacked_lun, data_length;
int fcp_task_attr, data_dir, bidi = 0, ret;
@@ -3207,7 +3205,7 @@ static int qla_tgt_handle_cmd_for_atio(struct scsi_qla_host *vha, atio_t *atio)
cmd->vha = vha;
if (IS_FWI2_CAPABLE(ha)) {
- atio7_from_24xx_entry_t *a = (atio7_from_24xx_entry_t *)atio;
+ atio7_from_24xx_t *a = (atio7_from_24xx_t *)atio;
sess = ha->tgt_ops->find_sess_by_s_id(vha, a->fcp_hdr.s_id);
if (unlikely(!sess)) {
ql_dbg(ql_dbg_tgt_mgt, vha, 0xe125, "qla_target(%d): Unable to find "
@@ -3219,12 +3217,12 @@ static int qla_tgt_handle_cmd_for_atio(struct scsi_qla_host *vha, atio_t *atio)
}
} else {
sess = ha->tgt_ops->find_sess_by_loop_id(vha,
- GET_TARGET_ID(ha, (atio_from_2xxx_entry_t *)atio));
+ GET_TARGET_ID(ha, (atio_from_2xxx_t *)atio));
if (unlikely(!sess)) {
ql_dbg(ql_dbg_tgt_mgt, vha, 0xe126, "qla_target(%d): Unable to find "
"wwn login (loop_id=%d), trying to create it "
"manually\n", vha->vp_idx,
- GET_TARGET_ID(ha, (atio_from_2xxx_entry_t *)atio));
+ GET_TARGET_ID(ha, (atio_from_2xxx_t *)atio));
goto out_sched;
}
}
@@ -3365,7 +3363,7 @@ static int qla_tgt_handle_task_mgmt(struct scsi_qla_host *vha, void *iocb)
tgt = ha->qla_tgt;
if (IS_FWI2_CAPABLE(ha)) {
- atio7_from_24xx_entry_t *a = (atio7_from_24xx_entry_t *)iocb;
+ atio7_from_24xx_t *a = (atio7_from_24xx_t *)iocb;
lun = a->fcp_cmnd.lun;
lun_size = sizeof(a->fcp_cmnd.lun);
@@ -3373,7 +3371,7 @@ static int qla_tgt_handle_task_mgmt(struct scsi_qla_host *vha, void *iocb)
sess = ha->tgt_ops->find_sess_by_s_id(vha,
a->fcp_hdr.s_id);
} else {
- imm_ntfy_from_2xxx_entry_t *n = (imm_ntfy_from_2xxx_entry_t *)iocb;
+ imm_ntfy_from_2xxx_t *n = (imm_ntfy_from_2xxx_t *)iocb;
/* make it be in network byte order */
lun = swab16(le16_to_cpu(n->lun));
lun_size = sizeof(lun);
@@ -3387,8 +3385,8 @@ static int qla_tgt_handle_task_mgmt(struct scsi_qla_host *vha, void *iocb)
ql_dbg(ql_dbg_tgt_mgt, vha, 0xe128, "qla_target(%d): task mgmt fn 0x%x for "
"non-existant session\n", vha->vp_idx, fn);
res = qla_tgt_sched_sess_work(tgt, QLA_TGT_SESS_WORK_TM, iocb,
- IS_FWI2_CAPABLE(ha) ? sizeof(atio7_from_24xx_entry_t) :
- sizeof(imm_ntfy_from_2xxx_entry_t));
+ IS_FWI2_CAPABLE(ha) ? sizeof(atio7_from_24xx_t) :
+ sizeof(imm_ntfy_from_2xxx_t));
if (res != 0)
tgt->tm_to_unknown = 1;
@@ -3400,7 +3398,7 @@ static int qla_tgt_handle_task_mgmt(struct scsi_qla_host *vha, void *iocb)
/* ha->hardware_lock supposed to be held on entry */
static int __qla_tgt_abort_task(struct scsi_qla_host *vha,
- imm_ntfy_from_2xxx_entry_t *iocb, struct qla_tgt_sess *sess)
+ imm_ntfy_from_2xxx_t *iocb, struct qla_tgt_sess *sess)
{
struct qla_hw_data *ha = vha->hw;
struct qla_tgt_mgmt_cmd *mcmd;
@@ -3422,10 +3420,10 @@ static int __qla_tgt_abort_task(struct scsi_qla_host *vha,
tag = le16_to_cpu(iocb->seq_id);
if (IS_FWI2_CAPABLE(ha)) {
- atio7_from_24xx_entry_t *a = (atio7_from_24xx_entry_t *)iocb;
+ atio7_from_24xx_t *a = (atio7_from_24xx_t *)iocb;
lun = a->fcp_cmnd.lun;
} else {
- imm_ntfy_from_2xxx_entry_t *n = (imm_ntfy_from_2xxx_entry_t *)iocb;
+ imm_ntfy_from_2xxx_t *n = (imm_ntfy_from_2xxx_t *)iocb;
lun = swab16(le16_to_cpu(n->lun));
}
unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);
@@ -3442,7 +3440,7 @@ static int __qla_tgt_abort_task(struct scsi_qla_host *vha,
}
/* ha->hardware_lock supposed to be held on entry */
-static int qla_tgt_abort_task(struct scsi_qla_host *vha, imm_ntfy_from_2xxx_entry_t *iocb)
+static int qla_tgt_abort_task(struct scsi_qla_host *vha, imm_ntfy_from_2xxx_t *iocb)
{
struct qla_hw_data *ha = vha->hw;
struct qla_tgt_sess *sess;
@@ -3469,7 +3467,7 @@ static int qla_tgt_abort_task(struct scsi_qla_host *vha, imm_ntfy_from_2xxx_entr
* ha->hardware_lock supposed to be held on entry. Might drop it, then reaquire
*/
static int qla_tgt_24xx_handle_els(struct scsi_qla_host *vha,
- imm_ntfy_from_24xx_entry_t *iocb)
+ imm_ntfy_from_24xx_t *iocb)
{
struct qla_hw_data *ha = vha->hw;
int res = 0;
@@ -3604,8 +3602,8 @@ static void qla_tgt_handle_srr(struct scsi_qla_host *vha, struct qla_tgt_srr_cti
struct qla_tgt_srr_imm *imm)
{
void *ntfy, *atio;
- imm_ntfy_from_24xx_entry_t *ntfy24 = (imm_ntfy_from_24xx_entry_t *)&imm->imm_ntfy;
- imm_ntfy_from_2xxx_entry_t *ntfy2x = (imm_ntfy_from_2xxx_entry_t *)&imm->imm_ntfy;
+ imm_ntfy_from_24xx_t *ntfy24 = (imm_ntfy_from_24xx_t *)&imm->imm_ntfy;
+ imm_ntfy_from_2xxx_t *ntfy2x = (imm_ntfy_from_2xxx_t *)&imm->imm_ntfy;
struct qla_hw_data *ha = vha->hw;
struct qla_tgt_cmd *cmd = sctio->cmd;
struct se_cmd *se_cmd = &cmd->se_cmd;
@@ -3830,7 +3828,7 @@ static void qla_tgt_prepare_srr_imm(struct scsi_qla_host *vha, void *iocb)
struct qla_tgt_srr_imm *imm;
struct qla_hw_data *ha = vha->hw;
struct qla_tgt *tgt = ha->qla_tgt;
- imm_ntfy_from_24xx_entry_t *iocb24 = (imm_ntfy_from_24xx_entry_t *)iocb;
+ imm_ntfy_from_24xx_t *iocb24 = (imm_ntfy_from_24xx_t *)iocb;
struct qla_tgt_srr_ctio *sctio;
tgt->imm_srr_id++;
@@ -3914,8 +3912,8 @@ out_reject:
static void qla_tgt_handle_imm_notify(struct scsi_qla_host *vha, void *iocb)
{
struct qla_hw_data *ha = vha->hw;
- imm_ntfy_from_2xxx_entry_t *iocb2x = (imm_ntfy_from_2xxx_entry_t *)iocb;
- imm_ntfy_from_24xx_entry_t *iocb24 = (imm_ntfy_from_24xx_entry_t *)iocb;
+ imm_ntfy_from_2xxx_t *iocb2x = (imm_ntfy_from_2xxx_t *)iocb;
+ imm_ntfy_from_24xx_t *iocb24 = (imm_ntfy_from_24xx_t *)iocb;
uint32_t add_flags = 0;
int send_notify_ack = 1;
uint16_t status;
@@ -4057,8 +4055,8 @@ static void qla_tgt_send_busy(struct scsi_qla_host *vha,
{
struct qla_hw_data *ha = vha->hw;
request_t *pkt;
- atio7_from_24xx_entry_t *atio24 = (atio7_from_24xx_entry_t *)atio;
- atio_from_2xxx_entry_t *atio2x = (atio_from_2xxx_entry_t *)atio;
+ atio7_from_24xx_t *atio24 = (atio7_from_24xx_t *)atio;
+ atio_from_2xxx_t *atio2x = (atio_from_2xxx_t *)atio;
struct qla_tgt_sess *sess = NULL;
if (IS_FWI2_CAPABLE(ha)) {
@@ -4082,7 +4080,7 @@ static void qla_tgt_send_busy(struct scsi_qla_host *vha,
pkt->handle = QLA_TGT_SKIP_HANDLE | CTIO_COMPLETION_HANDLE_MARK;
if (IS_FWI2_CAPABLE(ha)) {
- ctio7_to_24xx_entry_t *ctio24 = (ctio7_to_24xx_entry_t *)pkt;
+ ctio7_to_24xx_t *ctio24 = (ctio7_to_24xx_t *)pkt;
ctio24->entry_type = CTIO_TYPE7;
ctio24->nport_handle = sess->loop_id;
@@ -4106,7 +4104,7 @@ static void qla_tgt_send_busy(struct scsi_qla_host *vha,
if (ctio24->u.status1.residual != 0)
ctio24->u.status1.scsi_status |= SS_RESIDUAL_UNDER;
} else {
- ctio_from_2xxx_entry_t *ctio2x = (ctio_from_2xxx_entry_t *)pkt;
+ ctio_from_2xxx_t *ctio2x = (ctio_from_2xxx_t *)pkt;
ctio2x->entry_type = CTIO_RET_TYPE;
ctio2x->entry_count = 1;
@@ -4134,8 +4132,7 @@ static void qla_tgt_send_busy(struct scsi_qla_host *vha,
/* ha->hardware_lock supposed to be held on entry */
/* called via callback from qla2xxx */
-static void qla_tgt_24xx_atio_pkt(struct scsi_qla_host *vha,
- atio7_from_24xx_entry_t *atio)
+static void qla_tgt_24xx_atio_pkt(struct scsi_qla_host *vha, atio7_from_24xx_t *atio)
{
struct qla_hw_data *ha = vha->hw;
struct qla_tgt *tgt = ha->qla_tgt;
@@ -4204,7 +4201,7 @@ static void qla_tgt_24xx_atio_pkt(struct scsi_qla_host *vha,
case IMMED_NOTIFY_TYPE:
{
- imm_ntfy_from_2xxx_entry_t *pkt = (imm_ntfy_from_2xxx_entry_t *)atio;
+ imm_ntfy_from_2xxx_t *pkt = (imm_ntfy_from_2xxx_t *)atio;
if (unlikely(pkt->entry_status != 0)) {
printk(KERN_ERR "qla_target(%d): Received ATIO packet %x "
"with error status %x\n", vha->vp_idx,
@@ -4252,7 +4249,7 @@ static void qla_tgt_response_pkt(struct scsi_qla_host *vha, response_t *pkt)
switch (pkt->entry_type) {
case CTIO_TYPE7:
{
- ctio7_from_24xx_entry_t *entry = (ctio7_from_24xx_entry_t *)pkt;
+ ctio7_from_24xx_t *entry = (ctio7_from_24xx_t *)pkt;
ql_dbg(ql_dbg_tgt, vha, 0xe028, "CTIO_TYPE7: instance %d\n", vha->vp_idx);
qla_tgt_do_ctio_completion(vha, entry->handle,
le16_to_cpu(entry->status)|(pkt->entry_status << 16),
@@ -4262,9 +4259,9 @@ static void qla_tgt_response_pkt(struct scsi_qla_host *vha, response_t *pkt)
case ACCEPT_TGT_IO_TYPE:
{
- atio_from_2xxx_entry_t *atio;
+ atio_from_2xxx_t *atio;
int rc;
- atio = (atio_from_2xxx_entry_t *)pkt;
+ atio = (atio_from_2xxx_t *)pkt;
ql_dbg(ql_dbg_tgt, vha, 0xe029, "ACCEPT_TGT_IO instance %d status %04x "
"lun %04x read/write %d data_length %04x "
"target_id %02x rx_id %04x\n ",
@@ -4311,7 +4308,7 @@ static void qla_tgt_response_pkt(struct scsi_qla_host *vha, response_t *pkt)
case CONTINUE_TGT_IO_TYPE:
{
- ctio_to_2xxx_entry_t *entry = (ctio_to_2xxx_entry_t *)pkt;
+ ctio_to_2xxx_t *entry = (ctio_to_2xxx_t *)pkt;
ql_dbg(ql_dbg_tgt, vha, 0xe02a, "CONTINUE_TGT_IO: instance %d\n", vha->vp_idx);
qla_tgt_do_ctio_completion(vha, entry->handle,
le16_to_cpu(entry->status)|(pkt->entry_status << 16),
@@ -4321,7 +4318,7 @@ static void qla_tgt_response_pkt(struct scsi_qla_host *vha, response_t *pkt)
case CTIO_A64_TYPE:
{
- ctio_to_2xxx_entry_t *entry = (ctio_to_2xxx_entry_t *)pkt;
+ ctio_to_2xxx_t *entry = (ctio_to_2xxx_t *)pkt;
ql_dbg(ql_dbg_tgt, vha, 0xe02b, "CTIO_A64: instance %d\n", vha->vp_idx);
qla_tgt_do_ctio_completion(vha, entry->handle,
le16_to_cpu(entry->status)|(pkt->entry_status << 16),
@@ -4331,12 +4328,12 @@ static void qla_tgt_response_pkt(struct scsi_qla_host *vha, response_t *pkt)
case IMMED_NOTIFY_TYPE:
ql_dbg(ql_dbg_tgt, vha, 0xe02c, "%s", "IMMED_NOTIFY\n");
- qla_tgt_handle_imm_notify(vha, (imm_ntfy_from_2xxx_entry_t *)pkt);
+ qla_tgt_handle_imm_notify(vha, (imm_ntfy_from_2xxx_t *)pkt);
break;
case NOTIFY_ACK_TYPE:
if (tgt->notify_ack_expected > 0) {
- nack_to_2xxx_entry_t *entry = (nack_to_2xxx_entry_t *)pkt;
+ nack_to_2xxx_t *entry = (nack_to_2xxx_t *)pkt;
ql_dbg(ql_dbg_tgt, vha, 0xe02d, "NOTIFY_ACK seq %08x status %x\n",
le16_to_cpu(entry->seq_id),
le16_to_cpu(entry->status));
@@ -4354,13 +4351,13 @@ static void qla_tgt_response_pkt(struct scsi_qla_host *vha, response_t *pkt)
case ABTS_RECV_24XX:
ql_dbg(ql_dbg_tgt, vha, 0xe02e, "ABTS_RECV_24XX: instance %d\n", vha->vp_idx);
- qla_tgt_24xx_handle_abts(vha, (abts_recv_from_24xx_entry_t *)pkt);
+ qla_tgt_24xx_handle_abts(vha, (abts_recv_from_24xx_t *)pkt);
break;
case ABTS_RESP_24XX:
if (tgt->abts_resp_expected > 0) {
- abts_resp_from_24xx_fw_entry_t *entry =
- (abts_resp_from_24xx_fw_entry_t *)pkt;
+ abts_resp_from_24xx_fw_t *entry =
+ (abts_resp_from_24xx_fw_t *)pkt;
ql_dbg(ql_dbg_tgt, vha, 0xe02f, "ABTS_RESP_24XX: compl_status %x\n",
entry->compl_status);
tgt->abts_resp_expected--;
@@ -4394,7 +4391,7 @@ static void qla_tgt_response_pkt(struct scsi_qla_host *vha, response_t *pkt)
case MODIFY_LUN_TYPE:
if (tgt->modify_lun_expected > 0) {
- modify_lun_entry_t *entry = (modify_lun_entry_t *)pkt;
+ modify_lun_t *entry = (modify_lun_t *)pkt;
ql_dbg(ql_dbg_tgt, vha, 0xe030, "MODIFY_LUN %x, imm %c%d, cmd %c%d",
entry->status,
(entry->operators & MODIFY_LUN_IMM_ADD) ? '+'
@@ -4419,7 +4416,7 @@ static void qla_tgt_response_pkt(struct scsi_qla_host *vha, response_t *pkt)
case ENABLE_LUN_TYPE:
{
- elun_entry_t *entry = (elun_entry_t *)pkt;
+ enable_lun_t *entry = (enable_lun_t *)pkt;
ql_dbg(ql_dbg_tgt, vha, 0xe031, "ENABLE_LUN %x imm %u cmd %u \n",
entry->status, entry->immed_notify_count,
entry->command_count);
@@ -4643,12 +4640,10 @@ static void qla_tgt_exec_sess_work(struct qla_tgt *tgt,
{
struct qla_tgt_cmd *cmd = prm->cmd;
if (IS_FWI2_CAPABLE(ha)) {
- atio7_from_24xx_entry_t *a =
- (atio7_from_24xx_entry_t *)&cmd->atio;
+ atio7_from_24xx_t *a = (atio7_from_24xx_t *)&cmd->atio;
s_id = a->fcp_hdr.s_id;
} else
- loop_id = GET_TARGET_ID(ha,
- (atio_from_2xxx_entry_t *)&cmd->atio);
+ loop_id = GET_TARGET_ID(ha, (atio_from_2xxx_t *)&cmd->atio);
break;
}
case QLA_TGT_SESS_WORK_ABORT:
@@ -4732,13 +4727,13 @@ send:
void *iocb;
if (IS_FWI2_CAPABLE(ha)) {
- atio7_from_24xx_entry_t *a = &prm->tm_iocb2;
+ atio7_from_24xx_t *a = &prm->tm_iocb2;
iocb = a;
lun = a->fcp_cmnd.lun;
lun_size = sizeof(a->fcp_cmnd.lun);
fn = a->fcp_cmnd.task_mgmt_flags;
} else {
- imm_ntfy_from_2xxx_entry_t *n = &prm->tm_iocb;
+ imm_ntfy_from_2xxx_t *n = &prm->tm_iocb;
iocb = n;
/* make it be in network byte order */
lun = swab16(le16_to_cpu(n->lun));
@@ -5117,7 +5112,7 @@ qla_tgt_24xx_process_atio_queue(struct scsi_qla_host *vha)
pkt = ha->atio_ring_ptr;
cnt = pkt->entry_count;
- qla_tgt_24xx_atio_pkt_all_vps(vha, (atio7_from_24xx_entry_t *)pkt);
+ qla_tgt_24xx_atio_pkt_all_vps(vha, (atio7_from_24xx_t *)pkt);
for (i = 0; i < cnt; i++) {
ha->atio_ring_index++;
@@ -5405,7 +5400,7 @@ static int __init qla_tgt_parse_ini_mode(void)
int __init qla_tgt_init(void)
{
- BUILD_BUG_ON(sizeof(atio7_from_24xx_entry_t) != sizeof(atio_from_2xxx_entry_t));
+ BUILD_BUG_ON(sizeof(atio7_from_24xx_t) != sizeof(atio_from_2xxx_t));
qla_tgt_cmd_cachep = NULL;
qla_tgt_mgmt_cmd_cachep = NULL;
diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
index 91d751d..3377cd4 100644
--- a/drivers/scsi/qla2xxx/qla_target.h
+++ b/drivers/scsi/qla2xxx/qla_target.h
@@ -140,7 +140,7 @@ typedef struct {
uint16_t reserved_5;
uint16_t timeout; /* 0 = 30 seconds, 0xFFFF = disable */
uint16_t reserved_6[20];
-} __attribute__((packed)) elun_entry_t;
+} __attribute__((packed)) enable_lun_t;
#define ENABLE_LUN_SUCCESS 0x01
#define ENABLE_LUN_RC_NONZERO 0x04
#define ENABLE_LUN_INVALID_REQUEST 0x06
@@ -171,7 +171,7 @@ typedef struct {
uint16_t reserved_5;
uint16_t timeout; /* 0 = 30 seconds, 0xFFFF = disable */
uint16_t reserved_7[20];
-} __attribute__((packed)) modify_lun_entry_t;
+} __attribute__((packed)) modify_lun_t;
#define MODIFY_LUN_SUCCESS 0x01
#define MODIFY_LUN_CMD_ADD BIT_0
#define MODIFY_LUN_CMD_SUB BIT_1
@@ -215,7 +215,7 @@ typedef struct {
uint16_t srr_ox_id;
uint8_t reserved_2[30];
uint16_t ox_id;
-} __attribute__((packed)) imm_ntfy_from_2xxx_entry_t;
+} __attribute__((packed)) imm_ntfy_from_2xxx_t;
#endif
#ifndef NOTIFY_ACK_TYPE
@@ -246,7 +246,7 @@ typedef struct {
uint8_t srr_reject_code_expl;
uint8_t reserved_2[26];
uint16_t ox_id;
-} __attribute__((packed)) nack_to_2xxx_entry_t;
+} __attribute__((packed)) nack_to_2xxx_t;
#define NOTIFY_ACK_SRR_FLAGS_ACCEPT 0
#define NOTIFY_ACK_SRR_FLAGS_REJECT 1
@@ -283,7 +283,7 @@ typedef struct {
uint8_t initiator_port_name[WWN_SIZE]; /* on qla23xx */
uint16_t reserved_32[6];
uint16_t ox_id;
-} __attribute__((packed)) atio_from_2xxx_entry_t;
+} __attribute__((packed)) atio_from_2xxx_t;
#endif
#ifndef CONTINUE_TGT_IO_TYPE
@@ -315,7 +315,7 @@ typedef struct {
uint32_t dseg_1_length; /* Data segment 1 length. */
uint32_t dseg_2_address; /* Data segment 2 address. */
uint32_t dseg_2_length; /* Data segment 2 length. */
-} __attribute__((packed)) ctio_to_2xxx_entry_t;
+} __attribute__((packed)) ctio_to_2xxx_t;
#define ATIO_PATH_INVALID 0x07
#define ATIO_CANT_PROV_CAP 0x16
#define ATIO_CDB_VALID 0x3D
@@ -362,7 +362,7 @@ typedef struct {
uint16_t scsi_status;
uint16_t response_length;
uint8_t sense_data[26];
-} __attribute__((packed)) ctio_from_2xxx_entry_t;
+} __attribute__((packed)) ctio_from_2xxx_t;
#endif
#define ATIO_TYPE7 0x06 /* Accept target I/O entry for 24xx */
@@ -445,7 +445,7 @@ typedef struct {
#define ATIO_EXCHANGE_ADDRESS_UNKNOWN 0xFFFFFFFF
fcp_hdr_t fcp_hdr;
atio7_fcp_cmnd_t fcp_cmnd;
-} __attribute__((packed)) atio7_from_24xx_entry_t;
+} __attribute__((packed)) atio7_from_24xx_t;
#define CTIO_TYPE7 0x12 /* Continue target I/O entry (for 24xx) */
@@ -494,7 +494,7 @@ typedef struct {
uint8_t sense_data[24];
} status1;
} u;
-} __attribute__((packed)) ctio7_to_24xx_entry_t;
+} __attribute__((packed)) ctio7_to_24xx_t;
/*
* ISP queue - CTIO type 7 from ISP 24xx to target driver returned entry structure.
@@ -518,7 +518,7 @@ typedef struct {
uint16_t reserved3;
uint32_t relative_offset;
uint8_t reserved4[24];
-} __attribute__((packed)) ctio7_from_24xx_entry_t;
+} __attribute__((packed)) ctio7_from_24xx_t;
/* CTIO7 flags values */
#define CTIO7_FLAGS_SEND_STATUS BIT_15
@@ -562,7 +562,7 @@ typedef struct {
uint8_t reserved_6;
uint16_t reserved_7;
uint16_t ox_id;
-} __attribute__((packed)) imm_ntfy_from_24xx_entry_t;
+} __attribute__((packed)) imm_ntfy_from_24xx_t;
#define ELS_PLOGI 0x3
#define ELS_FLOGI 0x4
@@ -601,7 +601,7 @@ typedef struct {
uint8_t srr_reject_code;
uint8_t reserved_5[7];
uint16_t ox_id;
-} __attribute__((packed)) nack_to_24xx_entry_t;
+} __attribute__((packed)) nack_to_24xx_t;
/*
* ISP queue - ABTS received/response entries structure definition for 24xx.
@@ -630,7 +630,7 @@ typedef struct {
fcp_hdr_le_t fcp_hdr_le;
uint8_t reserved_4[16];
uint32_t exchange_addr_to_abort;
-} __attribute__((packed)) abts_recv_from_24xx_entry_t;
+} __attribute__((packed)) abts_recv_from_24xx_t;
#define ABTS_PARAM_ABORT_SEQ BIT_0
@@ -682,7 +682,7 @@ typedef struct {
} __attribute__((packed)) payload;
uint32_t reserved_4;
uint32_t exchange_addr_to_abort;
-} __attribute__((packed)) abts_resp_to_24xx_entry_t;
+} __attribute__((packed)) abts_resp_to_24xx_t;
/*
* ISP queue - ABTS Response IOCB from ISP24xx Firmware entry structure.
@@ -712,7 +712,7 @@ typedef struct {
#define ABTS_RESP_SUBCODE_ERR_ABORTED_EXCH_NOT_TERM 0x1E
uint32_t error_subcode2;
uint32_t exchange_addr_to_abort;
-} __attribute__((packed)) abts_resp_from_24xx_fw_entry_t;
+} __attribute__((packed)) abts_resp_from_24xx_fw_t;
/********************************************************************\
* Type Definitions used by initiator & target halves
@@ -878,7 +878,7 @@ struct qla_tgt {
struct list_head sess_works_list;
struct work_struct sess_work;
- imm_ntfy_from_24xx_entry_t link_reinit_iocb;
+ imm_ntfy_from_24xx_t link_reinit_iocb;
wait_queue_head_t waitQ;
int notify_ack_expected;
int abts_resp_expected;
@@ -969,9 +969,9 @@ struct qla_tgt_sess_work_param {
union {
struct qla_tgt_cmd *cmd;
- abts_recv_from_24xx_entry_t abts;
- imm_ntfy_from_2xxx_entry_t tm_iocb;
- atio7_from_24xx_entry_t tm_iocb2;
+ abts_recv_from_24xx_t abts;
+ imm_ntfy_from_2xxx_t tm_iocb;
+ atio7_from_24xx_t tm_iocb2;
};
};
@@ -1073,9 +1073,9 @@ static inline void qla_reverse_ini_mode(struct scsi_qla_host *ha)
static inline void
__qla_tgt_2xxx_send_enable_lun(struct scsi_qla_host *vha, int enable)
{
- elun_entry_t *pkt;
+ enable_lun_t *pkt;
- pkt = (elun_entry_t *)qla2x00_alloc_iocbs(vha, 0);
+ pkt = (enable_lun_t *)qla2x00_alloc_iocbs(vha, 0);
if (pkt != NULL) {
pkt->entry_type = ENABLE_LUN_TYPE;
if (enable) {
@@ -1123,7 +1123,7 @@ qla_tgt_2xxx_send_enable_lun(struct scsi_qla_host *vha, bool enable)
* Exported symbols from qla_target.c LLD logic used by qla2xxx code..
*/
extern void qla_tgt_24xx_atio_pkt_all_vps(struct scsi_qla_host *,
- atio7_from_24xx_entry_t *);
+ atio7_from_24xx_t *);
extern void qla_tgt_response_pkt_all_vps(struct scsi_qla_host *, response_t *);
extern int qla_tgt_rdy_to_xfer(struct qla_tgt_cmd *);
extern int qla_tgt_xmit_response(struct qla_tgt_cmd *, int, uint8_t);
diff --git a/drivers/target/tcm_qla2xxx/tcm_qla2xxx_fabric.c b/drivers/target/tcm_qla2xxx/tcm_qla2xxx_fabric.c
index 28b62dd..bd726e2 100644
--- a/drivers/target/tcm_qla2xxx/tcm_qla2xxx_fabric.c
+++ b/drivers/target/tcm_qla2xxx/tcm_qla2xxx_fabric.c
@@ -748,10 +748,10 @@ int tcm_qla2xxx_new_cmd_map(struct se_cmd *se_cmd)
int ret;
if (IS_FWI2_CAPABLE(ha)) {
- atio7_from_24xx_entry_t *atio = (atio7_from_24xx_entry_t *)&cmd->atio;
+ atio7_from_24xx_t *atio = (atio7_from_24xx_t *)&cmd->atio;
cdb = &atio->fcp_cmnd.cdb[0];
} else {
- atio_from_2xxx_entry_t *atio = (atio_from_2xxx_entry_t *)&cmd->atio;
+ atio_from_2xxx_t *atio = (atio_from_2xxx_t *)&cmd->atio;
cdb = &atio->cdb[0];
}
--
1.7.7
--
To unsubscribe from this list: send the line "unsubscribe target-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
