From: John Garry <john.garry@huawei.com>
To: <jejb@linux.vnet.ibm.com>, <martin.petersen@oracle.com>
Cc: <john.garry2@mail.dcu.ie>, <linuxarm@huawei.com>,
<linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<arnd@arndb.de>, Xiang Chen <chenxiang66@hisilicon.com>,
John Garry <john.garry@huawei.com>
Subject: [PATCH v2 05/22] scsi: hisi_sas: relocate get_ncq_tag_v2_hw()
Date: Thu, 25 May 2017 20:04:54 +0800 [thread overview]
Message-ID: <1495713911-80476-6-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1495713911-80476-1-git-send-email-john.garry@huawei.com>
From: Xiang Chen <chenxiang66@hisilicon.com>
Relocate get_ncq_tag_v2_hw() to a common location, as
future hw versions will require it.
Also rename with "hisi_sas_" prefix for consistency.
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
---
drivers/scsi/hisi_sas/hisi_sas.h | 1 +
drivers/scsi/hisi_sas/hisi_sas_main.c | 15 +++++++++++++++
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 16 +---------------
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index d0c0844..210daec 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -359,6 +359,7 @@ struct hisi_sas_command_table_ssp {
extern struct hisi_sas_port *to_hisi_sas_port(struct asd_sas_port *sas_port);
extern void hisi_sas_sata_done(struct sas_task *task,
struct hisi_sas_slot *slot);
+extern int hisi_sas_get_ncq_tag(struct sas_task *task, u32 *tag);
extern int hisi_sas_probe(struct platform_device *pdev,
const struct hisi_sas_hw *ops);
extern int hisi_sas_remove(struct platform_device *pdev);
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index 3f2bb8e..aaa7f5d 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -103,6 +103,21 @@ void hisi_sas_sata_done(struct sas_task *task,
}
EXPORT_SYMBOL_GPL(hisi_sas_sata_done);
+int hisi_sas_get_ncq_tag(struct sas_task *task, u32 *tag)
+{
+ struct ata_queued_cmd *qc = task->uldd_task;
+
+ if (qc) {
+ if (qc->tf.command == ATA_CMD_FPDMA_WRITE ||
+ qc->tf.command == ATA_CMD_FPDMA_READ) {
+ *tag = qc->tag;
+ return 1;
+ }
+ }
+ return 0;
+}
+EXPORT_SYMBOL_GPL(hisi_sas_get_ncq_tag);
+
static struct hisi_hba *dev_to_hisi_hba(struct domain_device *device)
{
return device->port->ha->lldd_ha;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
index 51140dc..e64047c 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
@@ -2328,20 +2328,6 @@ static void slot_err_v2_hw(struct hisi_hba *hisi_hba,
return sts;
}
-static int get_ncq_tag_v2_hw(struct sas_task *task, u32 *tag)
-{
- struct ata_queued_cmd *qc = task->uldd_task;
-
- if (qc) {
- if (qc->tf.command == ATA_CMD_FPDMA_WRITE ||
- qc->tf.command == ATA_CMD_FPDMA_READ) {
- *tag = qc->tag;
- return 1;
- }
- }
- return 0;
-}
-
static int prep_ata_v2_hw(struct hisi_hba *hisi_hba,
struct hisi_sas_slot *slot)
{
@@ -2389,7 +2375,7 @@ static int prep_ata_v2_hw(struct hisi_hba *hisi_hba,
hdr->dw1 = cpu_to_le32(dw1);
/* dw2 */
- if (task->ata_task.use_ncq && get_ncq_tag_v2_hw(task, &hdr_tag)) {
+ if (task->ata_task.use_ncq && hisi_sas_get_ncq_tag(task, &hdr_tag)) {
task->ata_task.fis.sector_count |= (u8) (hdr_tag << 3);
dw2 |= hdr_tag << CMD_HDR_NCQ_TAG_OFF;
}
--
1.9.1
next prev parent reply other threads:[~2017-05-25 11:41 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-25 12:04 [PATCH v2 00/22] hisi_sas: hip08 support John Garry
2017-05-25 12:04 ` [PATCH v2 01/22] scsi: hisi_sas: fix timeout check in hisi_sas_internal_task_abort() John Garry
2017-05-25 12:04 ` [PATCH v2 02/22] scsi: hisi_sas: optimise the usage of hisi_hba.lock John Garry
2017-05-26 0:23 ` kbuild test robot
2017-05-26 8:52 ` Arnd Bergmann
2017-05-25 12:04 ` [PATCH v2 03/22] scsi: hisi_sas: relocate get_ata_protocol() John Garry
2017-05-25 12:04 ` [PATCH v2 04/22] scsi: hisi_sas: relocate sata_done_v2_hw() John Garry
2017-05-25 12:04 ` John Garry [this message]
2017-05-25 12:04 ` [PATCH v2 06/22] scsi: hisi_sas: add pci_dev in hisi_hba struct John Garry
2017-05-25 12:04 ` [PATCH v2 07/22] scsi: hisi_sas: create hisi_sas_get_fw_info() John Garry
2017-05-29 10:53 ` Arnd Bergmann
2017-05-29 11:18 ` John Garry
2017-05-29 11:22 ` Arnd Bergmann
2017-05-25 12:04 ` [PATCH v2 08/22] scsi: hisi_sas: add skeleton v3 hw driver John Garry
2017-05-25 12:04 ` [PATCH v2 09/22] scsi: hisi_sas: add initialisation for v3 pci-based controller John Garry
2017-05-25 12:04 ` [PATCH v2 10/22] scsi: hisi_sas: add v3 hw init John Garry
2017-05-25 12:05 ` [PATCH v2 11/22] scsi: hisi_sas: add v3 hw PHY init John Garry
2017-05-25 12:05 ` [PATCH v2 12/22] scsi: hisi_sas: add phy up/down/bcast and channel ISR John Garry
2017-05-25 12:05 ` [PATCH v2 13/22] scsi: hisi_sas: add v3 cq interrupt handler John Garry
2017-05-25 12:05 ` [PATCH v2 14/22] scsi: hisi_sas: add v3 code to send SSP frame John Garry
2017-05-25 12:05 ` [PATCH v2 15/22] scsi: hisi_sas: add v3 code to send SMP frame John Garry
2017-05-25 12:05 ` [PATCH v2 16/22] scsi: hisi_sas: add v3 code to send ATA frame John Garry
2017-05-25 12:05 ` [PATCH v2 17/22] scsi: hisi_sas: add v3 code for itct setup and free John Garry
2017-05-25 12:05 ` [PATCH v2 18/22] scsi: hisi_sas: add v3 code to send internal abort command John Garry
2017-05-25 12:05 ` [PATCH v2 19/22] scsi: hisi_sas: add get_wideport_bitmap_v3_hw() John Garry
2017-05-25 12:05 ` [PATCH v2 20/22] scsi: hisi_sas: Add v3 code to support ECC and AXI bus fatal error John Garry
2017-05-25 12:05 ` [PATCH v2 21/22] scsi: hisi_sas: add v3 code to fill some more hw function pointers John Garry
2017-05-25 12:05 ` [PATCH v2 22/22] scsi: hisi_sas: modify internal abort dev flow for v3 hw John Garry
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1495713911-80476-6-git-send-email-john.garry@huawei.com \
--to=john.garry@huawei.com \
--cc=arnd@arndb.de \
--cc=chenxiang66@hisilicon.com \
--cc=jejb@linux.vnet.ibm.com \
--cc=john.garry2@mail.dcu.ie \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®