mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-20 20:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

qla2x00t: Kernel 3.19 build fix

Browse Source 
Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6183 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Vladislav Bolkhovitin
2015-04-16 04:06:37 +00:00
parent 33a4bccc38
commit d7de93ba19
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
qla2x00t/qla_iocb.c
View File

@@ -328,7 +328,9 @@ qla2x00_start_scsi(srb_t *sp)
struct qla_hw_data *ha;
struct req_que *req;
struct rsp_que *rsp;
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
char tag[2];
#endif
/* Setup device pointers. */
ret = 0;
@@ -409,6 +411,7 @@ qla2x00_start_scsi(srb_t *sp)
cmd_pkt->lun = cpu_to_le16(cmd->device->lun);
/* Update tagged queuing modifier */
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
if (scsi_populate_tag_msg(cmd, tag)) {
switch (tag[0]) {
case HEAD_OF_QUEUE_TAG:
@@ -425,6 +428,10 @@ qla2x00_start_scsi(srb_t *sp)
break;
}
}
#else
if (cmd->flags & SCMD_TAGGED)
cmd_pkt->control_flags = cpu_to_le16(CF_SIMPLE_TAG);
#endif
/* Load SCSI command packet. */
memcpy(cmd_pkt->scsi_cdb, cmd->cmnd, cmd->cmd_len);
@@ -1302,7 +1309,9 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
uint16_t fcp_cmnd_len;
struct fcp_cmnd *fcp_cmnd;
dma_addr_t crc_ctx_dma;
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
char tag[2];
#endif
cmd = GET_CMD_SP(sp);
@@ -1398,6 +1407,7 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
/*
* Update tagged queuing modifier if using command tag queuing
*/
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
if (scsi_populate_tag_msg(cmd, tag)) {
switch (tag[0]) {
case HEAD_OF_QUEUE_TAG:
@@ -1413,6 +1423,9 @@ qla24xx_build_scsi_crc_2_iocbs(srb_t *sp, struct cmd_type_crc_2 *cmd_pkt,
} else {
fcp_cmnd->task_attribute = 0;
}
#else
fcp_cmnd->task_attribute = 0;
#endif
cmd_pkt->fcp_rsp_dseg_len = 0; /* Let response come in status iocb */
@@ -1523,7 +1536,9 @@ qla24xx_start_scsi(srb_t *sp)
struct scsi_cmnd *cmd = GET_CMD_SP(sp);
struct scsi_qla_host *vha = sp->fcport->vha;
struct qla_hw_data *ha = vha->hw;
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
char tag[2];
#endif
/* Setup device pointers. */
ret = 0;
@@ -1607,6 +1622,7 @@ qla24xx_start_scsi(srb_t *sp)
int_to_scsilun(cmd->device->lun, &cmd_pkt->lun);
host_to_fcp_swap((uint8_t *)&cmd_pkt->lun, sizeof(cmd_pkt->lun));
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
/* Update tagged queuing modifier -- default is TSK_SIMPLE (0). */
if (scsi_populate_tag_msg(cmd, tag)) {
switch (tag[0]) {
@@ -1618,6 +1634,7 @@ qla24xx_start_scsi(srb_t *sp)
break;
}
}
#endif
/* Load SCSI command packet. */
memcpy(cmd_pkt->fcp_cdb, cmd->cmnd, cmd->cmd_len);
@@ -2315,7 +2332,9 @@ qla82xx_start_scsi(srb_t *sp)
struct qla_hw_data *ha = vha->hw;
struct req_que *req = NULL;
struct rsp_que *rsp = NULL;
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
char tag[2];
#endif
/* Setup device pointers. */
ret = 0;
@@ -2494,6 +2513,7 @@ sufficient_dsds:
else if (cmd->sc_data_direction == DMA_FROM_DEVICE)
ctx->fcp_cmnd->additional_cdb_len |= 2;
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
/*
* Update tagged queuing modifier -- default is TSK_SIMPLE (0).
*/
@@ -2509,6 +2529,7 @@ sufficient_dsds:
break;
}
}
#endif
/* Populate the FCP_PRIO. */
if (ha->flags.fcp_prio_enabled)
@@ -2570,6 +2591,7 @@ sufficient_dsds:
host_to_fcp_swap((uint8_t *)&cmd_pkt->lun,
sizeof(cmd_pkt->lun));
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
/*
* Update tagged queuing modifier -- default is TSK_SIMPLE (0).
*/
@@ -2583,6 +2605,7 @@ sufficient_dsds:
break;
}
}
#endif
/* Populate the FCP_PRIO. */
if (ha->flags.fcp_prio_enabled)

16
qla2x00t/qla_os.c
View File

@@ -264,7 +264,8 @@ static int qla2xxx_eh_target_reset(struct scsi_cmnd *);
static int qla2xxx_eh_bus_reset(struct scsi_cmnd *);
static int qla2xxx_eh_host_reset(struct scsi_cmnd *);
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && \
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && \
!defined(CONFIG_SUSE_KERNEL) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
@@ -272,7 +273,9 @@ static int qla2x00_change_queue_depth(struct scsi_device *, int);
#else
static int qla2x00_change_queue_depth(struct scsi_device *, int, int);
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
static int qla2x00_change_queue_type(struct scsi_device *, int);
#endif
struct scsi_host_template qla2xxx_driver_template = {
.module = THIS_MODULE,
@@ -295,8 +298,10 @@ struct scsi_host_template qla2xxx_driver_template = {
.slave_destroy = qla2xxx_slave_destroy,
.scan_finished = qla2xxx_scan_finished,
.scan_start = qla2xxx_scan_start,
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
.change_queue_depth = qla2x00_change_queue_depth,
.change_queue_type = qla2x00_change_queue_type,
#endif
.this_id = -1,
.cmd_per_lun = 3,
.use_clustering = ENABLE_CLUSTERING,
@@ -1452,10 +1457,14 @@ qla2xxx_slave_configure(struct scsi_device *sdev)
struct fc_rport *rport = starget_to_rport(sdev->sdev_target);
struct req_que *req = vha->req;
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
if (sdev->tagged_supported)
scsi_activate_tcq(sdev, req->max_q_depth);
else
scsi_deactivate_tcq(sdev, req->max_q_depth);
#else
scsi_change_queue_depth(sdev, req->max_q_depth);
#endif
rport->dev_loss_tmo = ha->port_down_retry_count;
@@ -1468,7 +1477,8 @@ qla2xxx_slave_destroy(struct scsi_device *sdev)
sdev->hostdata = NULL;
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && \
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && \
!defined(CONFIG_SUSE_KERNEL) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
@@ -1539,6 +1549,7 @@ qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL) && (!defined(RHEL_RELEASE_CODE) || RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1)) */
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0)
static int
qla2x00_change_queue_type(struct scsi_device *sdev, int tag_type)
{
@@ -1553,6 +1564,7 @@ qla2x00_change_queue_type(struct scsi_device *sdev, int tag_type)
return tag_type;
}
#endif
/**
* qla2x00_config_dma_addressing() - Configure OS DMA addressing method.