|
 |
24d93b |
From 081008132942c3c50c43d1fded60080cfa8cda91 Mon Sep 17 00:00:00 2001
|
|
|
24d93b |
From: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
|
|
|
24d93b |
Date: Wed, 26 Oct 2016 13:34:40 +0530
|
|
|
24d93b |
Subject: [PATCH 09/11] scsi: mpt3sas: Use the new MPI 2.6 32-bit Atomic
|
|
|
24d93b |
Request Descriptors for SAS35 devices.
|
|
|
24d93b |
|
|
|
24d93b |
Support Atomic Request Descriptors for Ventura/SAS35 devices.
|
|
|
24d93b |
|
|
|
24d93b |
Signed-off-by: Chaitra P B <chaitra.basappa@broadcom.com>
|
|
|
24d93b |
Signed-off-by: Sathya Prakash <sathya.prakash@broadcom.com>
|
|
|
24d93b |
Signed-off-by: Suganath Prabu S <suganath-prabu.subramani@broadcom.com>
|
|
|
24d93b |
Reviewed-by: Hannes Reinecke <hare@suse.com>
|
|
|
24d93b |
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
|
|
|
24d93b |
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
|
|
|
24d93b |
---
|
|
|
24d93b |
drivers/scsi/mpt3sas/mpt3sas_base.c | 141 +++++++++++++++++++++++++++----
|
|
|
24d93b |
drivers/scsi/mpt3sas/mpt3sas_base.h | 18 ++--
|
|
|
24d93b |
drivers/scsi/mpt3sas/mpt3sas_config.c | 2 +-
|
|
|
24d93b |
drivers/scsi/mpt3sas/mpt3sas_ctl.c | 22 ++---
|
|
|
24d93b |
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 24 +++---
|
|
|
24d93b |
drivers/scsi/mpt3sas/mpt3sas_transport.c | 8 +-
|
|
|
24d93b |
6 files changed, 161 insertions(+), 54 deletions(-)
|
|
|
24d93b |
|
|
|
24d93b |
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
|
|
|
24d93b |
index b26fa23..9ef253b 100644
|
|
|
24d93b |
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
|
|
|
24d93b |
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
|
|
|
24d93b |
@@ -850,7 +850,7 @@ _base_async_event(struct MPT3SAS_ADAPTER *ioc, u8 msix_index, u32 reply)
|
|
|
24d93b |
ack_request->EventContext = mpi_reply->EventContext;
|
|
|
24d93b |
ack_request->VF_ID = 0; /* TODO */
|
|
|
24d93b |
ack_request->VP_ID = 0;
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
|
|
|
24d93b |
out:
|
|
|
24d93b |
|
|
|
24d93b |
@@ -2454,15 +2454,15 @@ _base_writeq(__u64 b, volatile void __iomem *addr, spinlock_t *writeq_lock)
|
|
|
24d93b |
#endif
|
|
|
24d93b |
|
|
|
24d93b |
/**
|
|
|
24d93b |
- * mpt3sas_base_put_smid_scsi_io - send SCSI_IO request to firmware
|
|
|
24d93b |
+ * _base_put_smid_scsi_io - send SCSI_IO request to firmware
|
|
|
24d93b |
* @ioc: per adapter object
|
|
|
24d93b |
* @smid: system request message index
|
|
|
24d93b |
* @handle: device handle
|
|
|
24d93b |
*
|
|
|
24d93b |
* Return nothing.
|
|
|
24d93b |
*/
|
|
|
24d93b |
-void
|
|
|
24d93b |
-mpt3sas_base_put_smid_scsi_io(struct MPT3SAS_ADAPTER *ioc, u16 smid, u16 handle)
|
|
|
24d93b |
+static void
|
|
|
24d93b |
+_base_put_smid_scsi_io(struct MPT3SAS_ADAPTER *ioc, u16 smid, u16 handle)
|
|
|
24d93b |
{
|
|
|
24d93b |
Mpi2RequestDescriptorUnion_t descriptor;
|
|
|
24d93b |
u64 *request = (u64 *)&descriptor;
|
|
|
24d93b |
@@ -2478,15 +2478,15 @@ mpt3sas_base_put_smid_scsi_io(struct MPT3SAS_ADAPTER *ioc, u16 smid, u16 handle)
|
|
|
24d93b |
}
|
|
|
24d93b |
|
|
|
24d93b |
/**
|
|
|
24d93b |
- * mpt3sas_base_put_smid_fast_path - send fast path request to firmware
|
|
|
24d93b |
+ * _base_put_smid_fast_path - send fast path request to firmware
|
|
|
24d93b |
* @ioc: per adapter object
|
|
|
24d93b |
* @smid: system request message index
|
|
|
24d93b |
* @handle: device handle
|
|
|
24d93b |
*
|
|
|
24d93b |
* Return nothing.
|
|
|
24d93b |
*/
|
|
|
24d93b |
-void
|
|
|
24d93b |
-mpt3sas_base_put_smid_fast_path(struct MPT3SAS_ADAPTER *ioc, u16 smid,
|
|
|
24d93b |
+static void
|
|
|
24d93b |
+_base_put_smid_fast_path(struct MPT3SAS_ADAPTER *ioc, u16 smid,
|
|
|
24d93b |
u16 handle)
|
|
|
24d93b |
{
|
|
|
24d93b |
Mpi2RequestDescriptorUnion_t descriptor;
|
|
|
24d93b |
@@ -2503,14 +2503,14 @@ mpt3sas_base_put_smid_fast_path(struct MPT3SAS_ADAPTER *ioc, u16 smid,
|
|
|
24d93b |
}
|
|
|
24d93b |
|
|
|
24d93b |
/**
|
|
|
24d93b |
- * mpt3sas_base_put_smid_hi_priority - send Task Managment request to firmware
|
|
|
24d93b |
+ * _base_put_smid_hi_priority - send Task Management request to firmware
|
|
|
24d93b |
* @ioc: per adapter object
|
|
|
24d93b |
* @smid: system request message index
|
|
|
24d93b |
* @msix_task: msix_task will be same as msix of IO incase of task abort else 0.
|
|
|
24d93b |
* Return nothing.
|
|
|
24d93b |
*/
|
|
|
24d93b |
-void
|
|
|
24d93b |
-mpt3sas_base_put_smid_hi_priority(struct MPT3SAS_ADAPTER *ioc, u16 smid,
|
|
|
24d93b |
+static void
|
|
|
24d93b |
+_base_put_smid_hi_priority(struct MPT3SAS_ADAPTER *ioc, u16 smid,
|
|
|
24d93b |
u16 msix_task)
|
|
|
24d93b |
{
|
|
|
24d93b |
Mpi2RequestDescriptorUnion_t descriptor;
|
|
|
24d93b |
@@ -2527,14 +2527,14 @@ mpt3sas_base_put_smid_hi_priority(struct MPT3SAS_ADAPTER *ioc, u16 smid,
|
|
|
24d93b |
}
|
|
|
24d93b |
|
|
|
24d93b |
/**
|
|
|
24d93b |
- * mpt3sas_base_put_smid_default - Default, primarily used for config pages
|
|
|
24d93b |
+ * _base_put_smid_default - Default, primarily used for config pages
|
|
|
24d93b |
* @ioc: per adapter object
|
|
|
24d93b |
* @smid: system request message index
|
|
|
24d93b |
*
|
|
|
24d93b |
* Return nothing.
|
|
|
24d93b |
*/
|
|
|
24d93b |
-void
|
|
|
24d93b |
-mpt3sas_base_put_smid_default(struct MPT3SAS_ADAPTER *ioc, u16 smid)
|
|
|
24d93b |
+static void
|
|
|
24d93b |
+_base_put_smid_default(struct MPT3SAS_ADAPTER *ioc, u16 smid)
|
|
|
24d93b |
{
|
|
|
24d93b |
Mpi2RequestDescriptorUnion_t descriptor;
|
|
|
24d93b |
u64 *request = (u64 *)&descriptor;
|
|
|
24d93b |
@@ -2549,6 +2549,95 @@ mpt3sas_base_put_smid_default(struct MPT3SAS_ADAPTER *ioc, u16 smid)
|
|
|
24d93b |
}
|
|
|
24d93b |
|
|
|
24d93b |
/**
|
|
|
24d93b |
+* _base_put_smid_scsi_io_atomic - send SCSI_IO request to firmware using
|
|
|
24d93b |
+* Atomic Request Descriptor
|
|
|
24d93b |
+* @ioc: per adapter object
|
|
|
24d93b |
+* @smid: system request message index
|
|
|
24d93b |
+* @handle: device handle, unused in this function, for function type match
|
|
|
24d93b |
+*
|
|
|
24d93b |
+* Return nothing.
|
|
|
24d93b |
+*/
|
|
|
24d93b |
+static void
|
|
|
24d93b |
+_base_put_smid_scsi_io_atomic(struct MPT3SAS_ADAPTER *ioc, u16 smid,
|
|
|
24d93b |
+ u16 handle)
|
|
|
24d93b |
+{
|
|
|
24d93b |
+ Mpi26AtomicRequestDescriptor_t descriptor;
|
|
|
24d93b |
+ u32 *request = (u32 *)&descriptor;
|
|
|
24d93b |
+
|
|
|
24d93b |
+ descriptor.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_SCSI_IO;
|
|
|
24d93b |
+ descriptor.MSIxIndex = _base_get_msix_index(ioc);
|
|
|
24d93b |
+ descriptor.SMID = cpu_to_le16(smid);
|
|
|
24d93b |
+
|
|
|
24d93b |
+ writel(cpu_to_le32(*request), &ioc->chip->AtomicRequestDescriptorPost);
|
|
|
24d93b |
+}
|
|
|
24d93b |
+
|
|
|
24d93b |
+/**
|
|
|
24d93b |
+ * _base_put_smid_fast_path_atomic - send fast path request to firmware
|
|
|
24d93b |
+ * using Atomic Request Descriptor
|
|
|
24d93b |
+ * @ioc: per adapter object
|
|
|
24d93b |
+ * @smid: system request message index
|
|
|
24d93b |
+ * @handle: device handle, unused in this function, for function type match
|
|
|
24d93b |
+ * Return nothing
|
|
|
24d93b |
+ */
|
|
|
24d93b |
+static void
|
|
|
24d93b |
+_base_put_smid_fast_path_atomic(struct MPT3SAS_ADAPTER *ioc, u16 smid,
|
|
|
24d93b |
+ u16 handle)
|
|
|
24d93b |
+{
|
|
|
24d93b |
+ Mpi26AtomicRequestDescriptor_t descriptor;
|
|
|
24d93b |
+ u32 *request = (u32 *)&descriptor;
|
|
|
24d93b |
+
|
|
|
24d93b |
+ descriptor.RequestFlags = MPI25_REQ_DESCRIPT_FLAGS_FAST_PATH_SCSI_IO;
|
|
|
24d93b |
+ descriptor.MSIxIndex = _base_get_msix_index(ioc);
|
|
|
24d93b |
+ descriptor.SMID = cpu_to_le16(smid);
|
|
|
24d93b |
+
|
|
|
24d93b |
+ writel(cpu_to_le32(*request), &ioc->chip->AtomicRequestDescriptorPost);
|
|
|
24d93b |
+}
|
|
|
24d93b |
+
|
|
|
24d93b |
+/**
|
|
|
24d93b |
+ * _base_put_smid_hi_priority_atomic - send Task Management request to
|
|
|
24d93b |
+ * firmware using Atomic Request Descriptor
|
|
|
24d93b |
+ * @ioc: per adapter object
|
|
|
24d93b |
+ * @smid: system request message index
|
|
|
24d93b |
+ * @msix_task: msix_task will be same as msix of IO incase of task abort else 0
|
|
|
24d93b |
+ *
|
|
|
24d93b |
+ * Return nothing.
|
|
|
24d93b |
+ */
|
|
|
24d93b |
+static void
|
|
|
24d93b |
+_base_put_smid_hi_priority_atomic(struct MPT3SAS_ADAPTER *ioc, u16 smid,
|
|
|
24d93b |
+ u16 msix_task)
|
|
|
24d93b |
+{
|
|
|
24d93b |
+ Mpi26AtomicRequestDescriptor_t descriptor;
|
|
|
24d93b |
+ u32 *request = (u32 *)&descriptor;
|
|
|
24d93b |
+
|
|
|
24d93b |
+ descriptor.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_HIGH_PRIORITY;
|
|
|
24d93b |
+ descriptor.MSIxIndex = msix_task;
|
|
|
24d93b |
+ descriptor.SMID = cpu_to_le16(smid);
|
|
|
24d93b |
+
|
|
|
24d93b |
+ writel(cpu_to_le32(*request), &ioc->chip->AtomicRequestDescriptorPost);
|
|
|
24d93b |
+}
|
|
|
24d93b |
+
|
|
|
24d93b |
+/**
|
|
|
24d93b |
+ * _base_put_smid_default - Default, primarily used for config pages
|
|
|
24d93b |
+ * use Atomic Request Descriptor
|
|
|
24d93b |
+ * @ioc: per adapter object
|
|
|
24d93b |
+ * @smid: system request message index
|
|
|
24d93b |
+ *
|
|
|
24d93b |
+ * Return nothing.
|
|
|
24d93b |
+ */
|
|
|
24d93b |
+static void
|
|
|
24d93b |
+_base_put_smid_default_atomic(struct MPT3SAS_ADAPTER *ioc, u16 smid)
|
|
|
24d93b |
+{
|
|
|
24d93b |
+ Mpi26AtomicRequestDescriptor_t descriptor;
|
|
|
24d93b |
+ u32 *request = (u32 *)&descriptor;
|
|
|
24d93b |
+
|
|
|
24d93b |
+ descriptor.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE;
|
|
|
24d93b |
+ descriptor.MSIxIndex = _base_get_msix_index(ioc);
|
|
|
24d93b |
+ descriptor.SMID = cpu_to_le16(smid);
|
|
|
24d93b |
+
|
|
|
24d93b |
+ writel(cpu_to_le32(*request), &ioc->chip->AtomicRequestDescriptorPost);
|
|
|
24d93b |
+}
|
|
|
24d93b |
+
|
|
|
24d93b |
+/**
|
|
|
24d93b |
* _base_display_OEMs_branding - Display branding string
|
|
|
24d93b |
* @ioc: per adapter object
|
|
|
24d93b |
*
|
|
|
24d93b |
@@ -4058,7 +4147,7 @@ mpt3sas_base_sas_iounit_control(struct MPT3SAS_ADAPTER *ioc,
|
|
|
24d93b |
mpi_request->Operation == MPI2_SAS_OP_PHY_LINK_RESET)
|
|
|
24d93b |
ioc->ioc_link_reset_in_progress = 1;
|
|
|
24d93b |
init_completion(&ioc->base_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
timeleft = wait_for_completion_timeout(&ioc->base_cmds.done,
|
|
|
24d93b |
msecs_to_jiffies(10000));
|
|
|
24d93b |
if ((mpi_request->Operation == MPI2_SAS_OP_PHY_HARD_RESET ||
|
|
|
24d93b |
@@ -4160,7 +4249,7 @@ mpt3sas_base_scsi_enclosure_processor(struct MPT3SAS_ADAPTER *ioc,
|
|
|
24d93b |
ioc->base_cmds.smid = smid;
|
|
|
24d93b |
memcpy(request, mpi_request, sizeof(Mpi2SepReply_t));
|
|
|
24d93b |
init_completion(&ioc->base_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
timeleft = wait_for_completion_timeout(&ioc->base_cmds.done,
|
|
|
24d93b |
msecs_to_jiffies(10000));
|
|
|
24d93b |
if (!(ioc->base_cmds.status & MPT3_CMD_COMPLETE)) {
|
|
|
24d93b |
@@ -4351,6 +4440,8 @@ _base_get_ioc_facts(struct MPT3SAS_ADAPTER *ioc, int sleep_flag)
|
|
|
24d93b |
if ((facts->IOCCapabilities &
|
|
|
24d93b |
MPI2_IOCFACTS_CAPABILITY_RDPQ_ARRAY_CAPABLE))
|
|
|
24d93b |
ioc->rdpq_array_capable = 1;
|
|
|
24d93b |
+ if (facts->IOCCapabilities & MPI26_IOCFACTS_CAPABILITY_ATOMIC_REQ)
|
|
|
24d93b |
+ ioc->atomic_desc_capable = 1;
|
|
|
24d93b |
facts->FWVersion.Word = le32_to_cpu(mpi_reply.FWVersion.Word);
|
|
|
24d93b |
facts->IOCRequestFrameSize =
|
|
|
24d93b |
le16_to_cpu(mpi_reply.IOCRequestFrameSize);
|
|
|
24d93b |
@@ -4582,7 +4673,7 @@ _base_send_port_enable(struct MPT3SAS_ADAPTER *ioc, int sleep_flag)
|
|
|
24d93b |
mpi_request->Function = MPI2_FUNCTION_PORT_ENABLE;
|
|
|
24d93b |
|
|
|
24d93b |
init_completion(&ioc->port_enable_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
timeleft = wait_for_completion_timeout(&ioc->port_enable_cmds.done,
|
|
|
24d93b |
300*HZ);
|
|
|
24d93b |
if (!(ioc->port_enable_cmds.status & MPT3_CMD_COMPLETE)) {
|
|
|
24d93b |
@@ -4646,7 +4737,7 @@ mpt3sas_port_enable(struct MPT3SAS_ADAPTER *ioc)
|
|
|
24d93b |
memset(mpi_request, 0, sizeof(Mpi2PortEnableRequest_t));
|
|
|
24d93b |
mpi_request->Function = MPI2_FUNCTION_PORT_ENABLE;
|
|
|
24d93b |
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
return 0;
|
|
|
24d93b |
}
|
|
|
24d93b |
|
|
|
24d93b |
@@ -4767,7 +4858,7 @@ _base_event_notification(struct MPT3SAS_ADAPTER *ioc, int sleep_flag)
|
|
|
24d93b |
mpi_request->EventMasks[i] =
|
|
|
24d93b |
cpu_to_le32(ioc->event_masks[i]);
|
|
|
24d93b |
init_completion(&ioc->base_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
timeleft = wait_for_completion_timeout(&ioc->base_cmds.done, 30*HZ);
|
|
|
24d93b |
if (!(ioc->base_cmds.status & MPT3_CMD_COMPLETE)) {
|
|
|
24d93b |
pr_err(MPT3SAS_FMT "%s: timeout\n",
|
|
|
24d93b |
@@ -5316,9 +5407,23 @@ mpt3sas_base_attach(struct MPT3SAS_ADAPTER *ioc)
|
|
|
24d93b |
ioc->build_sg = &_base_build_sg_ieee;
|
|
|
24d93b |
ioc->build_zero_len_sge = &_base_build_zero_len_sge_ieee;
|
|
|
24d93b |
ioc->sge_size_ieee = sizeof(Mpi2IeeeSgeSimple64_t);
|
|
|
24d93b |
+
|
|
|
24d93b |
break;
|
|
|
24d93b |
}
|
|
|
24d93b |
|
|
|
24d93b |
+ if (ioc->atomic_desc_capable) {
|
|
|
24d93b |
+ ioc->put_smid_default = &_base_put_smid_default_atomic;
|
|
|
24d93b |
+ ioc->put_smid_scsi_io = &_base_put_smid_scsi_io_atomic;
|
|
|
24d93b |
+ ioc->put_smid_fast_path = &_base_put_smid_fast_path_atomic;
|
|
|
24d93b |
+ ioc->put_smid_hi_priority = &_base_put_smid_hi_priority_atomic;
|
|
|
24d93b |
+ } else {
|
|
|
24d93b |
+ ioc->put_smid_default = &_base_put_smid_default;
|
|
|
24d93b |
+ ioc->put_smid_scsi_io = &_base_put_smid_scsi_io;
|
|
|
24d93b |
+ ioc->put_smid_fast_path = &_base_put_smid_fast_path;
|
|
|
24d93b |
+ ioc->put_smid_hi_priority = &_base_put_smid_hi_priority;
|
|
|
24d93b |
+ }
|
|
|
24d93b |
+
|
|
|
24d93b |
+
|
|
|
24d93b |
/*
|
|
|
24d93b |
* These function pointers for other requests that don't
|
|
|
24d93b |
* the require IEEE scatter gather elements.
|
|
|
24d93b |
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h
|
|
|
24d93b |
index 240c360..b8c8be4 100644
|
|
|
24d93b |
--- a/drivers/scsi/mpt3sas/mpt3sas_base.h
|
|
|
24d93b |
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.h
|
|
|
24d93b |
@@ -740,7 +740,10 @@ typedef void (*MPT_BUILD_SG)(struct MPT3SAS_ADAPTER *ioc, void *psge,
|
|
|
24d93b |
typedef void (*MPT_BUILD_ZERO_LEN_SGE)(struct MPT3SAS_ADAPTER *ioc,
|
|
|
24d93b |
void *paddr);
|
|
|
24d93b |
|
|
|
24d93b |
-
|
|
|
24d93b |
+/* To support atomic and non atomic descriptors*/
|
|
|
24d93b |
+typedef void (*PUT_SMID_IO_FP_HIP) (struct MPT3SAS_ADAPTER *ioc, u16 smid,
|
|
|
24d93b |
+ u16 funcdep);
|
|
|
24d93b |
+typedef void (*PUT_SMID_DEFAULT) (struct MPT3SAS_ADAPTER *ioc, u16 smid);
|
|
|
24d93b |
|
|
|
24d93b |
/* IOC Facts and Port Facts converted from little endian to cpu */
|
|
|
24d93b |
union mpi3_version_union {
|
|
|
24d93b |
@@ -1208,6 +1211,12 @@ struct MPT3SAS_ADAPTER {
|
|
|
24d93b |
void *device_remove_in_progress;
|
|
|
24d93b |
u16 device_remove_in_progress_sz;
|
|
|
24d93b |
u8 is_gen35_ioc;
|
|
|
24d93b |
+ u8 atomic_desc_capable;
|
|
|
24d93b |
+ PUT_SMID_IO_FP_HIP put_smid_scsi_io;
|
|
|
24d93b |
+ PUT_SMID_IO_FP_HIP put_smid_fast_path;
|
|
|
24d93b |
+ PUT_SMID_IO_FP_HIP put_smid_hi_priority;
|
|
|
24d93b |
+ PUT_SMID_DEFAULT put_smid_default;
|
|
|
24d93b |
+
|
|
|
24d93b |
};
|
|
|
24d93b |
|
|
|
24d93b |
typedef u8 (*MPT_CALLBACK)(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index,
|
|
|
24d93b |
@@ -1253,13 +1262,6 @@ u16 mpt3sas_base_get_smid_scsiio(struct MPT3SAS_ADAPTER *ioc, u8 cb_idx,
|
|
|
24d93b |
|
|
|
24d93b |
u16 mpt3sas_base_get_smid(struct MPT3SAS_ADAPTER *ioc, u8 cb_idx);
|
|
|
24d93b |
void mpt3sas_base_free_smid(struct MPT3SAS_ADAPTER *ioc, u16 smid);
|
|
|
24d93b |
-void mpt3sas_base_put_smid_scsi_io(struct MPT3SAS_ADAPTER *ioc, u16 smid,
|
|
|
24d93b |
- u16 handle);
|
|
|
24d93b |
-void mpt3sas_base_put_smid_fast_path(struct MPT3SAS_ADAPTER *ioc, u16 smid,
|
|
|
24d93b |
- u16 handle);
|
|
|
24d93b |
-void mpt3sas_base_put_smid_hi_priority(struct MPT3SAS_ADAPTER *ioc,
|
|
|
24d93b |
- u16 smid, u16 msix_task);
|
|
|
24d93b |
-void mpt3sas_base_put_smid_default(struct MPT3SAS_ADAPTER *ioc, u16 smid);
|
|
|
24d93b |
void mpt3sas_base_initialize_callback_handler(void);
|
|
|
24d93b |
u8 mpt3sas_base_register_callback_handler(MPT_CALLBACK cb_func);
|
|
|
24d93b |
void mpt3sas_base_release_callback_handler(u8 cb_idx);
|
|
|
24d93b |
diff --git a/drivers/scsi/mpt3sas/mpt3sas_config.c b/drivers/scsi/mpt3sas/mpt3sas_config.c
|
|
|
24d93b |
index a6914ec..b024e14 100644
|
|
|
24d93b |
--- a/drivers/scsi/mpt3sas/mpt3sas_config.c
|
|
|
24d93b |
+++ b/drivers/scsi/mpt3sas/mpt3sas_config.c
|
|
|
24d93b |
@@ -385,7 +385,7 @@ _config_request(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigRequest_t
|
|
|
24d93b |
memcpy(config_request, mpi_request, sizeof(Mpi2ConfigRequest_t));
|
|
|
24d93b |
_config_display_some_debug(ioc, smid, "config_request", NULL);
|
|
|
24d93b |
init_completion(&ioc->config_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
timeleft = wait_for_completion_timeout(&ioc->config_cmds.done,
|
|
|
24d93b |
timeout*HZ);
|
|
|
24d93b |
if (!(ioc->config_cmds.status & MPT3_CMD_COMPLETE)) {
|
|
|
24d93b |
diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
|
|
|
24d93b |
index a66c0c8..8273e8c 100644
|
|
|
24d93b |
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
|
|
|
24d93b |
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
|
|
|
24d93b |
@@ -813,9 +813,9 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
|
|
|
24d93b |
ioc->build_sg(ioc, psge, data_out_dma, data_out_sz,
|
|
|
24d93b |
data_in_dma, data_in_sz);
|
|
|
24d93b |
if (mpi_request->Function == MPI2_FUNCTION_SCSI_IO_REQUEST)
|
|
|
24d93b |
- mpt3sas_base_put_smid_scsi_io(ioc, smid, device_handle);
|
|
|
24d93b |
+ ioc->put_smid_scsi_io(ioc, smid, device_handle);
|
|
|
24d93b |
else
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
break;
|
|
|
24d93b |
}
|
|
|
24d93b |
case MPI2_FUNCTION_SCSI_TASK_MGMT:
|
|
|
24d93b |
@@ -850,7 +850,7 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
|
|
|
24d93b |
tm_request->DevHandle));
|
|
|
24d93b |
ioc->build_sg_mpi(ioc, psge, data_out_dma, data_out_sz,
|
|
|
24d93b |
data_in_dma, data_in_sz);
|
|
|
24d93b |
- mpt3sas_base_put_smid_hi_priority(ioc, smid, 0);
|
|
|
24d93b |
+ ioc->put_smid_hi_priority(ioc, smid, 0);
|
|
|
24d93b |
break;
|
|
|
24d93b |
}
|
|
|
24d93b |
case MPI2_FUNCTION_SMP_PASSTHROUGH:
|
|
|
24d93b |
@@ -881,7 +881,7 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
|
|
|
24d93b |
}
|
|
|
24d93b |
ioc->build_sg(ioc, psge, data_out_dma, data_out_sz, data_in_dma,
|
|
|
24d93b |
data_in_sz);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
break;
|
|
|
24d93b |
}
|
|
|
24d93b |
case MPI2_FUNCTION_SATA_PASSTHROUGH:
|
|
|
24d93b |
@@ -896,7 +896,7 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
|
|
|
24d93b |
}
|
|
|
24d93b |
ioc->build_sg(ioc, psge, data_out_dma, data_out_sz, data_in_dma,
|
|
|
24d93b |
data_in_sz);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
break;
|
|
|
24d93b |
}
|
|
|
24d93b |
case MPI2_FUNCTION_FW_DOWNLOAD:
|
|
|
24d93b |
@@ -904,7 +904,7 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
|
|
|
24d93b |
{
|
|
|
24d93b |
ioc->build_sg(ioc, psge, data_out_dma, data_out_sz, data_in_dma,
|
|
|
24d93b |
data_in_sz);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
break;
|
|
|
24d93b |
}
|
|
|
24d93b |
case MPI2_FUNCTION_TOOLBOX:
|
|
|
24d93b |
@@ -919,7 +919,7 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
|
|
|
24d93b |
ioc->build_sg_mpi(ioc, psge, data_out_dma, data_out_sz,
|
|
|
24d93b |
data_in_dma, data_in_sz);
|
|
|
24d93b |
}
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
break;
|
|
|
24d93b |
}
|
|
|
24d93b |
case MPI2_FUNCTION_SAS_IO_UNIT_CONTROL:
|
|
|
24d93b |
@@ -938,7 +938,7 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg,
|
|
|
24d93b |
default:
|
|
|
24d93b |
ioc->build_sg_mpi(ioc, psge, data_out_dma, data_out_sz,
|
|
|
24d93b |
data_in_dma, data_in_sz);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
break;
|
|
|
24d93b |
}
|
|
|
24d93b |
|
|
|
24d93b |
@@ -1533,7 +1533,7 @@ _ctl_diag_register_2(struct MPT3SAS_ADAPTER *ioc,
|
|
|
24d93b |
cpu_to_le32(ioc->product_specific[buffer_type][i]);
|
|
|
24d93b |
|
|
|
24d93b |
init_completion(&ioc->ctl_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
timeleft = wait_for_completion_timeout(&ioc->ctl_cmds.done,
|
|
|
24d93b |
MPT3_IOCTL_DEFAULT_TIMEOUT*HZ);
|
|
|
24d93b |
|
|
|
24d93b |
@@ -1882,7 +1882,7 @@ mpt3sas_send_diag_release(struct MPT3SAS_ADAPTER *ioc, u8 buffer_type,
|
|
|
24d93b |
mpi_request->VP_ID = 0;
|
|
|
24d93b |
|
|
|
24d93b |
init_completion(&ioc->ctl_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
timeleft = wait_for_completion_timeout(&ioc->ctl_cmds.done,
|
|
|
24d93b |
MPT3_IOCTL_DEFAULT_TIMEOUT*HZ);
|
|
|
24d93b |
|
|
|
24d93b |
@@ -2150,7 +2150,7 @@ _ctl_diag_read_buffer(struct MPT3SAS_ADAPTER *ioc, void __user *arg)
|
|
|
24d93b |
mpi_request->VP_ID = 0;
|
|
|
24d93b |
|
|
|
24d93b |
init_completion(&ioc->ctl_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
timeleft = wait_for_completion_timeout(&ioc->ctl_cmds.done,
|
|
|
24d93b |
MPT3_IOCTL_DEFAULT_TIMEOUT*HZ);
|
|
|
24d93b |
|
|
|
24d93b |
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
|
|
24d93b |
index 0ff2ed3..0dcf826 100644
|
|
|
24d93b |
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
|
|
24d93b |
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
|
|
|
24d93b |
@@ -2339,7 +2339,7 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, uint channel,
|
|
|
24d93b |
msix_task = scsi_lookup->msix_io;
|
|
|
24d93b |
else
|
|
|
24d93b |
msix_task = 0;
|
|
|
24d93b |
- mpt3sas_base_put_smid_hi_priority(ioc, smid, msix_task);
|
|
|
24d93b |
+ ioc->put_smid_hi_priority(ioc, smid, msix_task);
|
|
|
24d93b |
timeleft = wait_for_completion_timeout(&ioc->tm_cmds.done, timeout*HZ);
|
|
|
24d93b |
if (!(ioc->tm_cmds.status & MPT3_CMD_COMPLETE)) {
|
|
|
24d93b |
pr_err(MPT3SAS_FMT "%s: timeout\n",
|
|
|
24d93b |
@@ -3252,7 +3252,7 @@ _scsih_tm_tr_send(struct MPT3SAS_ADAPTER *ioc, u16 handle)
|
|
|
24d93b |
mpi_request->DevHandle = cpu_to_le16(handle);
|
|
|
24d93b |
mpi_request->TaskType = MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET;
|
|
|
24d93b |
set_bit(handle, ioc->device_remove_in_progress);
|
|
|
24d93b |
- mpt3sas_base_put_smid_hi_priority(ioc, smid, 0);
|
|
|
24d93b |
+ ioc->put_smid_hi_priority(ioc, smid, 0);
|
|
|
24d93b |
mpt3sas_trigger_master(ioc, MASTER_TRIGGER_DEVICE_REMOVAL);
|
|
|
24d93b |
|
|
|
24d93b |
out:
|
|
|
24d93b |
@@ -3351,7 +3351,7 @@ _scsih_tm_tr_complete(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index,
|
|
|
24d93b |
mpi_request->Function = MPI2_FUNCTION_SAS_IO_UNIT_CONTROL;
|
|
|
24d93b |
mpi_request->Operation = MPI2_SAS_OP_REMOVE_DEVICE;
|
|
|
24d93b |
mpi_request->DevHandle = mpi_request_tm->DevHandle;
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid_sas_ctrl);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid_sas_ctrl);
|
|
|
24d93b |
|
|
|
24d93b |
return _scsih_check_for_pending_tm(ioc, smid);
|
|
|
24d93b |
}
|
|
|
24d93b |
@@ -3446,7 +3446,7 @@ _scsih_tm_tr_volume_send(struct MPT3SAS_ADAPTER *ioc, u16 handle)
|
|
|
24d93b |
mpi_request->Function = MPI2_FUNCTION_SCSI_TASK_MGMT;
|
|
|
24d93b |
mpi_request->DevHandle = cpu_to_le16(handle);
|
|
|
24d93b |
mpi_request->TaskType = MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET;
|
|
|
24d93b |
- mpt3sas_base_put_smid_hi_priority(ioc, smid, 0);
|
|
|
24d93b |
+ ioc->put_smid_hi_priority(ioc, smid, 0);
|
|
|
24d93b |
}
|
|
|
24d93b |
|
|
|
24d93b |
/**
|
|
|
24d93b |
@@ -3538,7 +3538,7 @@ _scsih_issue_delayed_event_ack(struct MPT3SAS_ADAPTER *ioc, u16 smid, u16 event,
|
|
|
24d93b |
ack_request->EventContext = event_context;
|
|
|
24d93b |
ack_request->VF_ID = 0; /* TODO */
|
|
|
24d93b |
ack_request->VP_ID = 0;
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
}
|
|
|
24d93b |
|
|
|
24d93b |
/**
|
|
|
24d93b |
@@ -3595,7 +3595,7 @@ _scsih_issue_delayed_sas_io_unit_ctrl(struct MPT3SAS_ADAPTER *ioc,
|
|
|
24d93b |
mpi_request->Function = MPI2_FUNCTION_SAS_IO_UNIT_CONTROL;
|
|
|
24d93b |
mpi_request->Operation = MPI2_SAS_OP_REMOVE_DEVICE;
|
|
|
24d93b |
mpi_request->DevHandle = handle;
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
}
|
|
|
24d93b |
|
|
|
24d93b |
/**
|
|
|
24d93b |
@@ -4218,12 +4218,12 @@ scsih_qcmd(struct Scsi_Host *shost, struct scsi_cmnd *scmd)
|
|
|
24d93b |
if (sas_target_priv_data->flags & MPT_TARGET_FASTPATH_IO) {
|
|
|
24d93b |
mpi_request->IoFlags = cpu_to_le16(scmd->cmd_len |
|
|
|
24d93b |
MPI25_SCSIIO_IOFLAGS_FAST_PATH);
|
|
|
24d93b |
- mpt3sas_base_put_smid_fast_path(ioc, smid, handle);
|
|
|
24d93b |
+ ioc->put_smid_fast_path(ioc, smid, handle);
|
|
|
24d93b |
} else
|
|
|
24d93b |
- mpt3sas_base_put_smid_scsi_io(ioc, smid,
|
|
|
24d93b |
+ ioc->put_smid_scsi_io(ioc, smid,
|
|
|
24d93b |
le16_to_cpu(mpi_request->DevHandle));
|
|
|
24d93b |
} else
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
return 0;
|
|
|
24d93b |
|
|
|
24d93b |
out:
|
|
|
24d93b |
@@ -4719,7 +4719,7 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply)
|
|
|
24d93b |
memcpy(mpi_request->CDB.CDB32, scmd->cmnd, scmd->cmd_len);
|
|
|
24d93b |
mpi_request->DevHandle =
|
|
|
24d93b |
cpu_to_le16(sas_device_priv_data->sas_target->handle);
|
|
|
24d93b |
- mpt3sas_base_put_smid_scsi_io(ioc, smid,
|
|
|
24d93b |
+ ioc->put_smid_scsi_io(ioc, smid,
|
|
|
24d93b |
sas_device_priv_data->sas_target->handle);
|
|
|
24d93b |
return 0;
|
|
|
24d93b |
}
|
|
|
24d93b |
@@ -6330,7 +6330,7 @@ _scsih_ir_fastpath(struct MPT3SAS_ADAPTER *ioc, u16 handle, u8 phys_disk_num)
|
|
|
24d93b |
handle, phys_disk_num));
|
|
|
24d93b |
|
|
|
24d93b |
init_completion(&ioc->scsih_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
wait_for_completion_timeout(&ioc->scsih_cmds.done, 10*HZ);
|
|
|
24d93b |
|
|
|
24d93b |
if (!(ioc->scsih_cmds.status & MPT3_CMD_COMPLETE)) {
|
|
|
24d93b |
@@ -8180,7 +8180,7 @@ _scsih_ir_shutdown(struct MPT3SAS_ADAPTER *ioc)
|
|
|
24d93b |
if (!ioc->hide_ir_msg)
|
|
|
24d93b |
pr_info(MPT3SAS_FMT "IR shutdown (sending)\n", ioc->name);
|
|
|
24d93b |
init_completion(&ioc->scsih_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
wait_for_completion_timeout(&ioc->scsih_cmds.done, 10*HZ);
|
|
|
24d93b |
|
|
|
24d93b |
if (!(ioc->scsih_cmds.status & MPT3_CMD_COMPLETE)) {
|
|
|
24d93b |
diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c
|
|
|
24d93b |
index a01b235..4b7c32b 100644
|
|
|
24d93b |
--- a/drivers/scsi/mpt3sas/mpt3sas_transport.c
|
|
|
24d93b |
+++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c
|
|
|
24d93b |
@@ -393,7 +393,7 @@ _transport_expander_report_manufacture(struct MPT3SAS_ADAPTER *ioc,
|
|
|
24d93b |
"report_manufacture - send to sas_addr(0x%016llx)\n",
|
|
|
24d93b |
ioc->name, (unsigned long long)sas_address));
|
|
|
24d93b |
init_completion(&ioc->transport_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
timeleft = wait_for_completion_timeout(&ioc->transport_cmds.done,
|
|
|
24d93b |
10*HZ);
|
|
|
24d93b |
|
|
|
24d93b |
@@ -1197,7 +1197,7 @@ _transport_get_expander_phy_error_log(struct MPT3SAS_ADAPTER *ioc,
|
|
|
24d93b |
ioc->name, (unsigned long long)phy->identify.sas_address,
|
|
|
24d93b |
phy->number));
|
|
|
24d93b |
init_completion(&ioc->transport_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
timeleft = wait_for_completion_timeout(&ioc->transport_cmds.done,
|
|
|
24d93b |
10*HZ);
|
|
|
24d93b |
|
|
|
24d93b |
@@ -1516,7 +1516,7 @@ _transport_expander_phy_control(struct MPT3SAS_ADAPTER *ioc,
|
|
|
24d93b |
ioc->name, (unsigned long long)phy->identify.sas_address,
|
|
|
24d93b |
phy->number, phy_operation));
|
|
|
24d93b |
init_completion(&ioc->transport_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
timeleft = wait_for_completion_timeout(&ioc->transport_cmds.done,
|
|
|
24d93b |
10*HZ);
|
|
|
24d93b |
|
|
|
24d93b |
@@ -2036,7 +2036,7 @@ _transport_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
|
|
|
24d93b |
"%s - sending smp request\n", ioc->name, __func__));
|
|
|
24d93b |
|
|
|
24d93b |
init_completion(&ioc->transport_cmds.done);
|
|
|
24d93b |
- mpt3sas_base_put_smid_default(ioc, smid);
|
|
|
24d93b |
+ ioc->put_smid_default(ioc, smid);
|
|
|
24d93b |
timeleft = wait_for_completion_timeout(&ioc->transport_cmds.done,
|
|
|
24d93b |
10*HZ);
|
|
|
24d93b |
|
|
|
24d93b |
--
|
|
|
24d93b |
1.8.3.1
|
|
|
24d93b |
|