mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: John Garry <john.garry@huawei.com>
To: <JBottomley@odin.com>, <robh+dt@kernel.org>, <pawel.moll@arm.com>,
	<mark.rutland@arm.com>, <ijc+devicetree@hellion.org.uk>,
	<galak@codeaurora.org>, <arnd@arndb.de>
Cc: <linux-scsi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<devicetree@vger.kernel.org>, <linuxarm@huawei.com>,
	<john.garry2@mail.dcu.ie>, <hare@suse.de>, <xuwei5@hisilicon.com>,
	<zhangfei.gao@linaro.org>, John Garry <john.garry@huawei.com>
Subject: [PATCH v3 27/32] scsi: hisi_sas: add smp protocol support
Date: Tue, 10 Nov 2015 00:32:32 +0800	[thread overview]
Message-ID: <1447086757-147706-28-git-send-email-john.garry@huawei.com> (raw)
In-Reply-To: <1447086757-147706-1-git-send-email-john.garry@huawei.com>

Add support for smp function, which allows devices
attached by expander to be controlled

Signed-off-by: John Garry <john.garry@huawei.com>
---
 drivers/scsi/hisi_sas/hisi_sas.h       |  3 ++
 drivers/scsi/hisi_sas/hisi_sas_main.c  |  9 ++++
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 88 ++++++++++++++++++++++++++++++++++
 3 files changed, 100 insertions(+)

diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h
index bcef33c..f2355db 100644
--- a/drivers/scsi/hisi_sas/hisi_sas.h
+++ b/drivers/scsi/hisi_sas/hisi_sas.h
@@ -36,6 +36,7 @@
 		(((sizeof(union hisi_sas_command_table)+3)/4)*4)
 
 #define HISI_SAS_MAX_SSP_RESP_SZ (sizeof(struct ssp_frame_hdr) + 1024)
+#define HISI_SAS_MAX_SMP_RESP_SZ 1028
 
 #define HISI_SAS_NAME_LEN 32
 
@@ -134,6 +135,8 @@ struct hisi_sas_hw {
 	int (*prep_ssp)(struct hisi_hba *hisi_hba,
 			struct hisi_sas_slot *slot, int is_tmf,
 			struct hisi_sas_tmf_task *tmf);
+	int (*prep_smp)(struct hisi_hba *hisi_hba,
+			struct hisi_sas_slot *slot);
 	int (*slot_complete)(struct hisi_hba *hisi_hba,
 			     struct hisi_sas_slot *slot, int abort);
 	void (*free_device)(struct hisi_hba *hisi_hba,
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c
index e573512..95535e5 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_main.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -98,6 +98,12 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, struct sas_task *task,
 }
 EXPORT_SYMBOL_GPL(hisi_sas_slot_task_free);
 
+static int hisi_sas_task_prep_smp(struct hisi_hba *hisi_hba,
+				  struct hisi_sas_slot *slot)
+{
+	return hisi_hba->hw->prep_smp(hisi_hba, slot);
+}
+
 static int hisi_sas_task_prep_ssp(struct hisi_hba *hisi_hba,
 				  struct hisi_sas_slot *slot, int is_tmf,
 				  struct hisi_sas_tmf_task *tmf)
@@ -215,6 +221,9 @@ static int hisi_sas_task_prep(struct sas_task *task, struct hisi_hba *hisi_hba,
 	memset(slot->cmd_hdr, 0, sizeof(struct hisi_sas_cmd_hdr));
 
 	switch (task->task_proto) {
+	case SAS_PROTOCOL_SMP:
+		rc = hisi_sas_task_prep_smp(hisi_hba, slot);
+		break;
 	case SAS_PROTOCOL_SSP:
 		rc = hisi_sas_task_prep_ssp(hisi_hba, slot, is_tmf, tmf);
 		break;
diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
index 8f66d06..0a07e15 100644
--- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c
@@ -903,6 +903,74 @@ static int prep_prd_sge_v1_hw(struct hisi_hba *hisi_hba,
 	return 0;
 }
 
+static int prep_smp_v1_hw(struct hisi_hba *hisi_hba,
+			  struct hisi_sas_slot *slot)
+{
+	struct sas_task *task = slot->task;
+	struct hisi_sas_cmd_hdr *hdr = slot->cmd_hdr;
+	struct domain_device *device = task->dev;
+	struct device *dev = &hisi_hba->pdev->dev;
+	struct hisi_sas_port *port = slot->port;
+	struct scatterlist *sg_req, *sg_resp;
+	struct hisi_sas_device *sas_dev = device->lldd_dev;
+	dma_addr_t req_dma_addr;
+	unsigned int req_len, resp_len;
+	int elem, rc;
+
+	/*
+	* DMA-map SMP request, response buffers
+	*/
+	/* req */
+	sg_req = &task->smp_task.smp_req;
+	elem = dma_map_sg(dev, sg_req, 1, DMA_TO_DEVICE);
+	if (!elem)
+		return -ENOMEM;
+	req_len = sg_dma_len(sg_req);
+	req_dma_addr = sg_dma_address(sg_req);
+
+	/* resp */
+	sg_resp = &task->smp_task.smp_resp;
+	elem = dma_map_sg(dev, sg_resp, 1, DMA_FROM_DEVICE);
+	if (!elem) {
+		rc = -ENOMEM;
+		goto err_out_req;
+	}
+	resp_len = sg_dma_len(sg_resp);
+	if ((req_len & 0x3) || (resp_len & 0x3)) {
+		rc = -EINVAL;
+		goto err_out_resp;
+	}
+
+	/* create header */
+	/* dw0 */
+	hdr->dw0 = cpu_to_le32((port->id << CMD_HDR_PORT_OFF) |
+			       (1 << CMD_HDR_PRIORITY_OFF) | /* high pri */
+			       (1 << CMD_HDR_MODE_OFF) | /* ini mode */
+			       (2 << CMD_HDR_CMD_OFF)); /* smp */
+
+	/* map itct entry */
+	hdr->dw1 = cpu_to_le32(sas_dev->device_id << CMD_HDR_DEVICE_ID_OFF);
+
+	/* dw2 */
+	hdr->dw2 = cpu_to_le32((((req_len-4)/4) << CMD_HDR_CFL_OFF) |
+			       (HISI_SAS_MAX_SMP_RESP_SZ/4 <<
+			       CMD_HDR_MRFL_OFF));
+
+	hdr->transfer_tags = cpu_to_le32(slot->idx << CMD_HDR_IPTT_OFF);
+
+	hdr->cmd_table_addr = cpu_to_le64(req_dma_addr);
+	hdr->sts_buffer_addr = cpu_to_le64(slot->status_buffer_dma);
+
+	return 0;
+
+err_out_resp:
+	dma_unmap_sg(dev, &slot->task->smp_task.smp_resp, 1,
+		     DMA_FROM_DEVICE);
+err_out_req:
+	dma_unmap_sg(dev, &slot->task->smp_task.smp_req, 1,
+		     DMA_TO_DEVICE);
+	return rc;
+}
 
 static int prep_ssp_v1_hw(struct hisi_hba *hisi_hba,
 			  struct hisi_sas_slot *slot, int is_tmf,
@@ -1223,6 +1291,25 @@ static int slot_complete_v1_hw(struct hisi_hba *hisi_hba,
 		sas_ssp_task_response(dev, task, iu);
 		break;
 	}
+	case SAS_PROTOCOL_SMP:
+	{
+		void *to;
+		struct scatterlist *sg_resp = &task->smp_task.smp_resp;
+
+		ts->stat = SAM_STAT_GOOD;
+		to = kmap_atomic(sg_page(sg_resp));
+
+		dma_unmap_sg(dev, &task->smp_task.smp_resp, 1,
+			     DMA_FROM_DEVICE);
+		dma_unmap_sg(dev, &task->smp_task.smp_req, 1,
+			     DMA_TO_DEVICE);
+		memcpy(to + sg_resp->offset,
+		       slot->status_buffer +
+		       sizeof(struct hisi_sas_err_record),
+		       sg_dma_len(sg_resp));
+		kunmap_atomic(to);
+		break;
+	}
 	case SAS_PROTOCOL_SATA:
 	case SAS_PROTOCOL_STP:
 	case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP:
@@ -1598,6 +1685,7 @@ static const struct hisi_sas_hw hisi_sas_v1_hw = {
 	.setup_itct = setup_itct_v1_hw,
 	.sl_notify = sl_notify_v1_hw,
 	.free_device = free_device_v1_hw,
+	.prep_smp = prep_smp_v1_hw,
 	.prep_ssp = prep_ssp_v1_hw,
 	.get_free_slot = get_free_slot_v1_hw,
 	.start_delivery = start_delivery_v1_hw,
-- 
1.9.1


  parent reply	other threads:[~2015-11-09 16:22 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-09 16:32 [PATCH v3 00/32] HiSilicon SAS driver John Garry
2015-11-09 16:32 ` [PATCH v3 01/32] [SCSI] sas: centralise ssp frame information units John Garry
2015-11-09 16:32 ` [PATCH v3 02/32] devicetree: bindings: scsi: HiSi SAS John Garry
2015-11-09 18:01   ` Rob Herring
2015-11-10 11:09     ` John Garry
2015-11-10 13:16       ` Rob Herring
2015-11-09 16:32 ` [PATCH v3 03/32] scsi: hisi_sas: add initial bare main driver John Garry
2015-11-09 16:32 ` [PATCH v3 04/32] scsi: hisi_sas: add scsi host registration John Garry
2015-11-09 16:32 ` [PATCH v3 05/32] scsi: hisi_sas: scan device tree John Garry
2015-11-09 16:32 ` [PATCH v3 06/32] scsi: hisi_sas: add HW DMA structures John Garry
2015-11-09 16:32 ` [PATCH v3 07/32] scsi: hisi_sas: allocate memories and create pools John Garry
2015-11-09 16:32 ` [PATCH v3 08/32] scsi: hisi_sas: add hisi_sas_remove John Garry
2015-11-10  3:48   ` Wei Fang
2015-11-10 10:55     ` John Garry
2015-11-09 16:32 ` [PATCH v3 09/32] scsi: hisi_sas: add slot init code John Garry
2015-11-09 16:32 ` [PATCH v3 10/32] scsi: hisi_sas: add cq structure initialization John Garry
2015-11-09 16:32 ` [PATCH v3 11/32] scsi: hisi_sas: add phy SAS ADDR initialization John Garry
2015-11-09 16:28   ` Arnd Bergmann
2015-11-09 16:51     ` John Garry
2015-11-09 16:32 ` [PATCH v3 12/32] scsi: hisi_sas: set dev DMA mask John Garry
2015-11-09 16:32 ` [PATCH v3 13/32] scsi: hisi_sas: add hisi_hba workqueue John Garry
2015-11-09 16:32 ` [PATCH v3 14/32] scsi: hisi_sas: add hisi sas device type John Garry
2015-11-09 16:32 ` [PATCH v3 15/32] scsi: hisi_sas: add phy and port init John Garry
2015-11-09 16:32 ` [PATCH v3 16/32] scsi: hisi_sas: add timer and spinlock init John Garry
2015-11-09 16:32 ` [PATCH v3 17/32] scsi: hisi_sas: add v1 hw module init John Garry
2015-11-09 16:32 ` [PATCH v3 18/32] scsi: hisi_sas: add v1 hardware register definitions John Garry
2015-11-09 16:32 ` [PATCH v3 19/32] scsi: hisi_sas: add v1 HW initialisation code John Garry
2015-11-09 16:32 ` [PATCH v3 20/32] scsi: hisi_sas: add v1 hw interrupt init John Garry
2015-11-09 16:32 ` [PATCH v3 21/32] scsi: hisi_sas: add path from phyup irq to SAS framework John Garry
2015-11-09 16:32 ` [PATCH v3 22/32] scsi: hisi_sas: add ssp command function John Garry
2015-11-09 16:32 ` [PATCH v3 23/32] scsi: hisi_sas: add cq interrupt handler John Garry
2015-11-09 16:32 ` [PATCH v3 24/32] scsi: hisi_sas: add dev_found and dev_gone John Garry
2015-11-09 16:32 ` [PATCH v3 25/32] scsi: hisi_sas: add abnormal irq handler John Garry
2015-11-09 16:32 ` [PATCH v3 26/32] scsi: hisi_sas: add bcast interrupt handler John Garry
2015-11-09 16:32 ` John Garry [this message]
2015-11-09 16:32 ` [PATCH v3 28/32] scsi: hisi_sas: add scan finished and start John Garry
2015-11-09 16:32 ` [PATCH v3 29/32] scsi: hisi_sas: add tmf methods John Garry
2015-11-09 16:32 ` [PATCH v3 30/32] scsi: hisi_sas: add control phy handler John Garry
2015-11-09 16:32 ` [PATCH v3 31/32] scsi: hisi_sas: add fatal irq handler John Garry
2015-11-09 16:32 ` [PATCH v3 32/32] MAINTAINERS: add maintainer for HiSi SAS driver John Garry
2015-11-09 16:40 ` [PATCH v3 00/32] HiSilicon " Arnd Bergmann
2015-11-10  7:15 ` Hannes Reinecke

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=1447086757-147706-28-git-send-email-john.garry@huawei.com \
    --to=john.garry@huawei.com \
    --cc=JBottomley@odin.com \
    --cc=arnd@arndb.de \
    --cc=devicetree@vger.kernel.org \
    --cc=galak@codeaurora.org \
    --cc=hare@suse.de \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=john.garry2@mail.dcu.ie \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=linuxarm@huawei.com \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=xuwei5@hisilicon.com \
    --cc=zhangfei.gao@linaro.org \
    /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®