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

qla2x00t-32gbit: Backport to kernel v4.9

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8105 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2019-03-29 01:43:15 +00:00
parent a0d4136e5c
commit 849adf540b
4 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
qla2x00t-32gbit/qla_fw.h
View File

@@ -7,8 +7,17 @@
#ifndef __QLA_FW_H #ifndef __QLA_FW_H
#define __QLA_FW_H #define __QLA_FW_H
#include <linux/version.h>
#include <linux/nvme.h> #include <linux/nvme.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
#include <linux/nvme-fc.h> #include <linux/nvme-fc.h>
#endif
#ifdef INSIDE_KERNEL_TREE
#include <scst/backport.h>
#else
#include "backport.h"
#endif
#define MBS_CHECKSUM_ERROR 0x4010 #define MBS_CHECKSUM_ERROR 0x4010
#define MBS_INVALID_PRODUCT_KEY 0x4020 #define MBS_INVALID_PRODUCT_KEY 0x4020

19
qla2x00t-32gbit/qla_isr.c
View File

@@ -25,7 +25,9 @@
#include <scsi/scsi_bsg_fc.h> #include <scsi/scsi_bsg_fc.h>
#include <scsi/scsi_eh.h> #include <scsi/scsi_eh.h>
#include <scsi/fc/fc_fs.h> #include <scsi/fc/fc_fs.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
#include <linux/nvme-fc-driver.h> #include <linux/nvme-fc-driver.h>
#endif
static void qla2x00_mbx_completion(scsi_qla_host_t *, uint16_t); static void qla2x00_mbx_completion(scsi_qla_host_t *, uint16_t);
static void qla2x00_status_entry(scsi_qla_host_t *, struct rsp_que *, void *); static void qla2x00_status_entry(scsi_qla_host_t *, struct rsp_que *, void *);
@@ -3443,6 +3445,13 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
struct qla_msix_entry *qentry; struct qla_msix_entry *qentry;
scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev); scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev);
int min_vecs = QLA_BASE_VECTORS; int min_vecs = QLA_BASE_VECTORS;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
if (QLA_TGT_MODE_ENABLED() && (ql2xenablemsix != 0) &&
IS_ATIO_MSIX_CAPABLE(ha)) {
min_vecs++;
}
#else
struct irq_affinity desc = { struct irq_affinity desc = {
.pre_vectors = QLA_BASE_VECTORS, .pre_vectors = QLA_BASE_VECTORS,
}; };
@@ -3452,7 +3461,12 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
desc.pre_vectors++; desc.pre_vectors++;
min_vecs++; min_vecs++;
} }
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
ret = pci_alloc_irq_vectors(ha->pdev, min_vecs, ha->msix_count,
PCI_IRQ_MSIX);
#else
if (USER_CTRL_IRQ(ha) || !ha->mqiobase) { if (USER_CTRL_IRQ(ha) || !ha->mqiobase) {
/* user wants to control IRQ setting for target mode */ /* user wants to control IRQ setting for target mode */
ret = pci_alloc_irq_vectors(ha->pdev, min_vecs, ret = pci_alloc_irq_vectors(ha->pdev, min_vecs,
@@ -3461,6 +3475,7 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
ret = pci_alloc_irq_vectors_affinity(ha->pdev, min_vecs, ret = pci_alloc_irq_vectors_affinity(ha->pdev, min_vecs,
ha->msix_count, PCI_IRQ_MSIX | PCI_IRQ_AFFINITY, ha->msix_count, PCI_IRQ_MSIX | PCI_IRQ_AFFINITY,
&desc); &desc);
#endif
if (ret < 0) { if (ret < 0) {
ql_log(ql_log_fatal, vha, 0x00c7, ql_log(ql_log_fatal, vha, 0x00c7,
@@ -3489,7 +3504,11 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
"Adjusted Max no of queues pairs: %d.\n", ha->max_qpairs); "Adjusted Max no of queues pairs: %d.\n", ha->max_qpairs);
} }
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
vha->irq_offset = desc.pre_vectors; vha->irq_offset = desc.pre_vectors;
#else
vha->irq_offset = min_vecs;
#endif
ha->msix_entries = kcalloc(ha->msix_count, ha->msix_entries = kcalloc(ha->msix_count,
sizeof(struct qla_msix_entry), sizeof(struct qla_msix_entry),
GFP_KERNEL); GFP_KERNEL);

6
qla2x00t-32gbit/qla_nvme.c
View File

@@ -5,6 +5,10 @@
* See LICENSE.qla2xxx for copyright and licensing details. * See LICENSE.qla2xxx for copyright and licensing details.
*/ */
#include <linux/version.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/nvme.h> #include <linux/nvme.h>
@@ -717,3 +721,5 @@ int qla_nvme_register_hba(struct scsi_qla_host *vha)
return ret; return ret;
} }
#endif

26
qla2x00t-32gbit/qla_nvme.h
View File

@@ -10,7 +10,9 @@
#include <linux/blk-mq.h> #include <linux/blk-mq.h>
#include <uapi/scsi/fc/fc_fs.h> #include <uapi/scsi/fc/fc_fs.h>
#include <uapi/scsi/fc/fc_els.h> #include <uapi/scsi/fc/fc_els.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
#include <linux/nvme-fc-driver.h> #include <linux/nvme-fc-driver.h>
#endif
#include "qla_def.h" #include "qla_def.h"
@@ -139,6 +141,7 @@ struct pt_ls4_rx_unsol {
uint32_t payload[3]; uint32_t payload[3];
}; };
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 10, 0)
/* /*
* Global functions prototype in qla_nvme.c source file. * Global functions prototype in qla_nvme.c source file.
*/ */
@@ -146,7 +149,30 @@ int qla_nvme_register_hba(struct scsi_qla_host *);
int qla_nvme_register_remote(struct scsi_qla_host *, struct fc_port *); int qla_nvme_register_remote(struct scsi_qla_host *, struct fc_port *);
void qla_nvme_delete(struct scsi_qla_host *); void qla_nvme_delete(struct scsi_qla_host *);
void qla_nvme_abort(struct qla_hw_data *, struct srb *sp, int res); void qla_nvme_abort(struct qla_hw_data *, struct srb *sp, int res);
#else
static inline int qla_nvme_register_hba(struct scsi_qla_host *vha)
{
return -ENOTSUPP;
}
static inline int qla_nvme_register_remote(struct scsi_qla_host *vha,
struct fc_port *fcport)
{
return -ENOTSUPP;
}
static inline void qla_nvme_delete(struct scsi_qla_host *vha)
{
}
static inline void qla_nvme_abort(struct qla_hw_data *ha, struct srb *sp,
int res)
{
}
#endif
void qla24xx_nvme_ls4_iocb(struct scsi_qla_host *, struct pt_ls4_request *, void qla24xx_nvme_ls4_iocb(struct scsi_qla_host *, struct pt_ls4_request *,
struct req_que *); struct req_que *);
void qla24xx_async_gffid_sp_done(void *, int); void qla24xx_async_gffid_sp_done(void *, int);
#endif #endif