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

qla2x00t: Remove support for kernel versions before 3.10

Browse Source 
The SCST has dropped support for kernels older than 3.10.0 (RHEL 7 / Centos 7) since SCST v3.6.
This commit is contained in:
Chesnokov Gleb
2021-12-11 21:59:53 +03:00
committed by Gleb Chesnokov
parent 0a05b57009
commit 8aec03276a
6 changed files with 4 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
qla2x00t/qla2x00-target/qla2x00t.c
View File

@@ -197,15 +197,8 @@ static bool q2t_is_tgt_enabled(struct scst_tgt *tgt);
#define ENABLE_NPIV 0 /* NPIV does not work */
#if ENABLE_NPIV
#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) || \
defined(FC_VPORT_CREATE_DEFINED))
static ssize_t q2t_add_vtarget(const char *target_name, char *params);
static ssize_t q2t_del_vtarget(const char *target_name);
#else
#warning Patch scst_fc_vport_create was not applied on\
your kernel. Adding NPIV targets using SCST sysfs interface will be disabled.
#endif /*((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) || \
defined(FC_VPORT_CREATE_DEFINED))*/
#endif /* ENABLE_NPIV */
/*
@@ -242,12 +235,8 @@ static struct scst_tgt_template tgt2x_template = {
.enable_target = q2t_enable_tgt,
.is_target_enabled = q2t_is_tgt_enabled,
#if ENABLE_NPIV
#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) || \
defined(FC_VPORT_CREATE_DEFINED))
.add_target = q2t_add_vtarget,
.del_target = q2t_del_vtarget,
#endif /*((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) || \
defined(FC_VPORT_CREATE_DEFINED))*/
.add_target_parameters = "node_name, parent_host",
#endif
.tgtt_attrs = q2tt_attrs,
@@ -6458,8 +6447,6 @@ static int q2t_parse_wwn(const char *ns, u64 *nm)
}
#if ENABLE_NPIV
#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) || \
defined(FC_VPORT_CREATE_DEFINED))
static ssize_t q2t_add_vtarget(const char *target_name, char *params)
{
int res;
@@ -6571,8 +6558,6 @@ out:
TRACE_EXIT_RES(res);
return res;
}
#endif /*((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) || \
defined(FC_VPORT_CREATE_DEFINED))*/
#endif /* ENABLE_NPIV */
static int q2t_get_initiator_port_transport_id(struct scst_tgt *tgt,

4
qla2x00t/qla2x_tgt.h
View File

@@ -132,13 +132,9 @@ qla2x00_send_enable_lun(scsi_qla_host_t *vha, bool enable)
}
extern void qla2xxx_add_targets(void);
#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) || \
defined(FC_VPORT_CREATE_DEFINED))
extern size_t
qla2xxx_add_vtarget(u64 port_name, u64 node_name, u64 parent_host);
extern size_t qla2xxx_del_vtarget(u64 port_name);
#endif /*((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) || \
defined(FC_VPORT_CREATE_DEFINED))*/
extern void qla_unknown_atio_work_fn(struct work_struct *work);

78
qla2x00t/qla_attr.c
View File

@@ -441,13 +441,7 @@ static DEVICE_ATTR(port_database,
#endif /* CONFIG_SCSI_QLA2XXX_TARGET */
static ssize_t
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
qla2x00_sysfs_read_fw_dump(
#else
qla2x00_sysfs_read_fw_dump(struct file *file,
#endif
struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
@@ -476,13 +470,7 @@ qla2x00_sysfs_read_fw_dump(struct file *file,
}
static ssize_t
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
qla2x00_sysfs_write_fw_dump(
#else
qla2x00_sysfs_write_fw_dump(struct file *file,
#endif
struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
@@ -561,13 +549,7 @@ static struct bin_attribute sysfs_fw_dump_attr = {
};
static ssize_t
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
qla2x00_sysfs_read_nvram(
#else
qla2x00_sysfs_read_nvram(struct file *file,
#endif
struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
@@ -587,13 +569,7 @@ qla2x00_sysfs_read_nvram(struct file *file,
}
static ssize_t
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
qla2x00_sysfs_write_nvram(
#else
qla2x00_sysfs_write_nvram(struct file *file,
#endif
struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
@@ -662,13 +638,7 @@ static struct bin_attribute sysfs_nvram_attr = {
};
static ssize_t
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
qla2x00_sysfs_read_optrom(
#else
qla2x00_sysfs_read_optrom(struct file *file,
#endif
struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
@@ -685,13 +655,7 @@ qla2x00_sysfs_read_optrom(struct file *file,
}
static ssize_t
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
qla2x00_sysfs_write_optrom(
#else
qla2x00_sysfs_write_optrom(struct file *file,
#endif
struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
@@ -723,13 +687,7 @@ static struct bin_attribute sysfs_optrom_attr = {
};
static ssize_t
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
qla2x00_sysfs_write_optrom_ctl(
#else
qla2x00_sysfs_write_optrom_ctl(struct file *file,
#endif
struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
@@ -894,13 +852,7 @@ static struct bin_attribute sysfs_optrom_ctl_attr = {
};
static ssize_t
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
qla2x00_sysfs_read_vpd(
#else
qla2x00_sysfs_read_vpd(struct file *file,
#endif
struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
@@ -922,13 +874,7 @@ qla2x00_sysfs_read_vpd(struct file *file,
}
static ssize_t
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
qla2x00_sysfs_write_vpd(
#else
qla2x00_sysfs_write_vpd(struct file *file,
#endif
struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
@@ -982,13 +928,7 @@ static struct bin_attribute sysfs_vpd_attr = {
};
static ssize_t
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
qla2x00_sysfs_read_sfp(
#else
qla2x00_sysfs_read_sfp(struct file *file,
#endif
struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
@@ -1050,13 +990,7 @@ static struct bin_attribute sysfs_sfp_attr = {
};
static ssize_t
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
qla2x00_sysfs_write_reset(
#else
qla2x00_sysfs_write_reset(struct file *file,
#endif
struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
@@ -1132,13 +1066,7 @@ static struct bin_attribute sysfs_reset_attr = {
};
static ssize_t
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
qla2x00_sysfs_read_xgmac_stats(
#else
qla2x00_sysfs_read_xgmac_stats(struct file *file,
#endif
struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)
@@ -1191,13 +1119,7 @@ static struct bin_attribute sysfs_xgmac_stats_attr = {
};
static ssize_t
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) && \
(!defined(RHEL_RELEASE_CODE) || \
RHEL_RELEASE_CODE -0 < RHEL_RELEASE_VERSION(6, 1))
qla2x00_sysfs_read_dcbx_tlv(
#else
qla2x00_sysfs_read_dcbx_tlv(struct file *file,
#endif
struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t count)

7
qla2x00t/qla_def.h
View File

@@ -40,13 +40,6 @@
#include <linux/bsg-lib.h>
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 32)
#error
#error ***This version of qla2xxx does not support distributions based on***
#error ***kernels less than 2.6.32.***
#error
#endif
#include <scsi/scsi.h>
#include <scsi/scsi_host.h>
#include <scsi/scsi_device.h>

4
qla2x00t/qla_nx.c
View File

@@ -1181,11 +1181,7 @@ qla82xx_pinit_from_rom(scsi_qla_host_t *vha)
ql_log(ql_log_info, vha, 0x0072,
"%d CRB init values found in ROM.\n", n);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)
buf = kmalloc_array(n, sizeof(struct crb_addr_pair), GFP_KERNEL);
#else
buf = kmalloc(n * sizeof(struct crb_addr_pair), GFP_KERNEL);
#endif
if (buf == NULL) {
ql_log(ql_log_fatal, vha, 0x010c,
"Unable to allocate memory.\n");

86
qla2x00t/qla_os.c
View File

@@ -13,10 +13,6 @@
#include <linux/mutex.h>
#include <linux/version.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
#error Kernel 2.6.26 or above is needed to build the qla2x00t driver
#endif
#include <scsi/scsi_tcq.h>
#include <scsi/scsicam.h>
#include <scsi/scsi_transport.h>
@@ -255,36 +251,22 @@ static int qla2xxx_queuecommand_lck(struct scsi_cmnd *cmd,
#else
static int qla2xxx_queuecommand_lck(struct scsi_cmnd *cmd);
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
static DEF_SCSI_QCMD(qla2xxx_queuecommand);
#endif
static int qla2xxx_eh_abort(struct scsi_cmnd *);
static int qla2xxx_eh_device_reset(struct scsi_cmnd *);
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(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))
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_depth(struct scsi_device *, int, int);
static int qla2x00_change_queue_type(struct scsi_device *, int);
#endif
struct scsi_host_template qla2xxx_driver_template = {
.module = THIS_MODULE,
.name = QLA2XXX_DRIVER_NAME,
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37)
.queuecommand = qla2xxx_queuecommand_lck,
#else
.queuecommand = qla2xxx_queuecommand,
#endif
.eh_abort_handler = qla2xxx_eh_abort,
.eh_device_reset_handler = qla2xxx_eh_device_reset,
@@ -963,25 +945,6 @@ sp_get(struct srb *sp)
atomic_inc(&sp->ref_count);
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL)
static void
qla2x00_block_error_handler(struct scsi_cmnd *cmnd)
{
struct Scsi_Host *shost = cmnd->device->host;
struct fc_rport *rport = starget_to_rport(scsi_target(cmnd->device));
unsigned long flags;
spin_lock_irqsave(shost->host_lock, flags);
while (rport->port_state == FC_PORTSTATE_BLOCKED) {
spin_unlock_irqrestore(shost->host_lock, flags);
msleep(1000);
spin_lock_irqsave(shost->host_lock, flags);
}
spin_unlock_irqrestore(shost->host_lock, flags);
return;
}
#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL) */
/**************************************************************************
* qla2xxx_eh_abort
*
@@ -1011,13 +974,10 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
if (!CMD_SP(cmd))
return SUCCESS;
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL)
qla2x00_block_error_handler(cmd);
#else
ret = fc_block_scsi_eh(cmd);
if (ret != SUCCESS && ret != 0)
return ret;
#endif
ret = SUCCESS;
id = cmd->device->id;
@@ -1140,13 +1100,9 @@ __qla2xxx_eh_generic_reset(char *name, enum nexus_wait_type type,
return FAILED;
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL)
qla2x00_block_error_handler(cmd);
#else
err = fc_block_scsi_eh(cmd);
if (err != SUCCESS && err != 0)
return err;
#endif
ql_log(ql_log_info, vha, 0x8009,
"%s RESET ISSUED nexus=%ld:%d:%lld cmd=%p.\n", name, vha->host_no,
@@ -1238,13 +1194,10 @@ qla2xxx_eh_bus_reset(struct scsi_cmnd *cmd)
return ret;
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL)
qla2x00_block_error_handler(cmd);
#else
ret = fc_block_scsi_eh(cmd);
if (ret != SUCCESS && ret != 0)
return ret;
#endif
ret = FAILED;
ql_log(ql_log_info, vha, 0x8012,
@@ -1476,20 +1429,7 @@ qla2xxx_slave_destroy(struct scsi_device *sdev)
sdev->hostdata = NULL;
}
#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))
static int
qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth)
{
scsi_adjust_queue_depth(sdev, scsi_get_tag_type(sdev), qdepth);
return sdev->queue_depth;
}
#else /* 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 void qla2x00_handle_queue_full(struct scsi_device *sdev, int qdepth)
{
@@ -1546,9 +1486,6 @@ qla2x00_change_queue_depth(struct scsi_device *sdev, int qdepth, int reason)
return sdev->queue_depth;
}
#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)
{
@@ -2301,8 +2238,6 @@ out:
}
EXPORT_SYMBOL(qla2xxx_add_targets);
#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) || \
defined(FC_VPORT_CREATE_DEFINED))
size_t qla2xxx_add_vtarget(u64 port_name, u64 node_name, u64 parent_host)
{
struct Scsi_Host *shost = NULL;
@@ -2382,12 +2317,6 @@ size_t qla2xxx_del_vtarget(u64 port_name)
}
EXPORT_SYMBOL(qla2xxx_del_vtarget);
#else
#warning "Patch scst_fc_vport_create was not applied on\
your kernel. Adding NPIV targets using SCST sysfs interface will be disabled."
#endif /*((LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) || \
defined(FC_VPORT_CREATE_DEFINED))*/
void qla_unknown_atio_work_fn(struct work_struct *work)
{
struct qla_hw_data *ha = container_of(work, struct qla_hw_data,
@@ -2399,9 +2328,6 @@ void qla_unknown_atio_work_fn(struct work_struct *work)
#endif /* CONFIG_SCSI_QLA2XXX_TARGET */
static int
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0))
__devinit
#endif
qla2x00_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
{
int ret = -ENODEV;
@@ -4618,11 +4544,7 @@ static uint32_t qla82xx_error_recovery(scsi_qla_host_t *base_vha)
ql_dbg(ql_dbg_aer, base_vha, 0x9007,
"Finding pci device at function = 0x%x.\n", fn);
other_pdev =
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) && !defined(CONFIG_SUSE_KERNEL)
pci_get_bus_and_slot(
#else
pci_get_domain_bus_and_slot(pci_domain_nr(ha->pdev->bus),
#endif
ha->pdev->bus->number, PCI_DEVFN(PCI_SLOT(ha->pdev->devfn),
fn));