From patchwork Mon Oct 12 15:20:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 54777 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id D50E223001 for ; Mon, 12 Oct 2015 15:05:48 +0000 (UTC) Received: by lbcao8 with SMTP id ao8sf70872019lbc.1 for ; Mon, 12 Oct 2015 08:05:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=dndSFPzFYmUlgKdna/1p+qgVqowJL4FFgBhCcXEW9E8=; b=LBPy6m2JekJnNC9GYQR0HJXZVA5heQcwHrkvXRypbcNPuogJX1TF6JC4wNfa/zOR7G JwlEG+vgM6IyNOzYK9bw52gU5dmuaxuWkga7oD9VbOvEPKQXwPdb3toBtuTa63OVtUNT +fgg5Mai+EKosnmc0VoOYwVUwSi3muQyxUJM3onH73bSpneMXAjmpkoXraoA/k/vrc60 CPsTtLteKYx4EsJZERjWWMvY8+6vLMcvGDFZS2o3kCDAaleJpOEp1BgUFo2EfxAkfQLO lBS64BBcKfwqjAOTHbVOkiaic/0u/uMJGIQ4NK0T3VYa/TbHW/ica0z5Eonq7slSPHlQ iMKg== X-Gm-Message-State: ALoCoQmqudhWrflU3HlSBVGuB1JHbBu2viaYnVqLbjA4GzYgKzAiY8WiR+DZ0Z2edgHnRjseBXk9 X-Received: by 10.112.144.99 with SMTP id sl3mr5683897lbb.12.1444662347574; Mon, 12 Oct 2015 08:05:47 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.82.3 with SMTP id g3ls551029lfb.10.gmail; Mon, 12 Oct 2015 08:05:47 -0700 (PDT) X-Received: by 10.112.16.199 with SMTP id i7mr12543426lbd.105.1444662347434; Mon, 12 Oct 2015 08:05:47 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id 42si11526311lfr.77.2015.10.12.08.05.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Oct 2015 08:05:47 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbcao8 with SMTP id ao8so146193236lbc.3 for ; Mon, 12 Oct 2015 08:05:47 -0700 (PDT) X-Received: by 10.112.202.35 with SMTP id kf3mr12697617lbc.19.1444662347280; Mon, 12 Oct 2015 08:05:47 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1599337lbq; Mon, 12 Oct 2015 08:05:46 -0700 (PDT) X-Received: by 10.60.43.105 with SMTP id v9mr15986242oel.6.1444662337853; Mon, 12 Oct 2015 08:05:37 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m130si9007941oif.92.2015.10.12.08.05.37; Mon, 12 Oct 2015 08:05:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752071AbbJLPFg (ORCPT + 7 others); Mon, 12 Oct 2015 11:05:36 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:11757 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751576AbbJLPFf (ORCPT ); Mon, 12 Oct 2015 11:05:35 -0400 Received: from 172.24.1.49 (EHLO szxeml432-hub.china.huawei.com) ([172.24.1.49]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CUB61541; Mon, 12 Oct 2015 23:05:20 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by szxeml432-hub.china.huawei.com (10.82.67.209) with Microsoft SMTP Server id 14.3.235.1; Mon, 12 Oct 2015 23:05:04 +0800 From: John Garry To: CC: , , , , , , , , , John Garry Subject: [PATCH 20/25] scsi: hisi_sas: add smp protocol support Date: Mon, 12 Oct 2015 23:20:32 +0800 Message-ID: <1444663237-238302-21-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444663237-238302-1-git-send-email-john.garry@huawei.com> References: <1444663237-238302-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.garry@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add support for smp function, which allows devices attached by expander to be controlled. Signed-off-by: John Garry --- drivers/scsi/hisi_sas/hisi_sas.h | 4 ++ drivers/scsi/hisi_sas/hisi_sas_main.c | 9 +++- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 97 +++++++++++++++++++++++++++++++++- 3 files changed, 107 insertions(+), 3 deletions(-) diff --git a/drivers/scsi/hisi_sas/hisi_sas.h b/drivers/scsi/hisi_sas/hisi_sas.h index 265d9bd..be2cdf5 100644 --- a/drivers/scsi/hisi_sas/hisi_sas.h +++ b/drivers/scsi/hisi_sas/hisi_sas.h @@ -34,6 +34,8 @@ (((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 #define HISI_SAS_RESET_REG_CNT 5 @@ -372,6 +374,8 @@ extern int get_free_slot_v1_hw(struct hisi_hba *hisi_hba, int *q, int *s); extern int prep_ssp_v1_hw(struct hisi_hba *hisi_hba, struct hisi_sas_tei *tei, int is_tmf, struct hisi_sas_tmf_task *tmf); +extern int prep_smp_v1_hw(struct hisi_hba *hisi_hba, + struct hisi_sas_tei *tei); extern int interrupt_init_v1_hw(struct hisi_hba *hisi_hba); extern int interrupt_openall_v1_hw(struct hisi_hba *hisi_hba); extern int hw_init_v1_hw(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 36ef8cd..91620b0 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -109,6 +109,11 @@ void hisi_sas_slot_task_free(struct hisi_hba *hisi_hba, memset(slot, 0, sizeof(*slot)); } +static int hisi_sas_task_prep_smp(struct hisi_hba *hisi_hba, + struct hisi_sas_tei *tei) +{ + return prep_smp_v1_hw(hisi_hba, tei); +} static int hisi_sas_task_prep_ssp(struct hisi_hba *hisi_hba, struct hisi_sas_tei *tei, int is_tmf, @@ -235,10 +240,12 @@ static int hisi_sas_task_prep(struct sas_task *task, tei.n_elem = n_elem; tei.slot = slot; switch (task->task_proto) { + case SAS_PROTOCOL_SMP: + rc = hisi_sas_task_prep_smp(hisi_hba, &tei); + break; case SAS_PROTOCOL_SSP: rc = hisi_sas_task_prep_ssp(hisi_hba, &tei, is_tmf, tmf); break; - case SAS_PROTOCOL_SMP: case SAS_PROTOCOL_SATA: case SAS_PROTOCOL_STP: case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP: diff --git a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c index 2ad2ffa..b470c72 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +++ b/drivers/scsi/hisi_sas/hisi_sas_v1_hw.c @@ -913,6 +913,80 @@ static int prep_prd_sge_v1_hw(struct hisi_hba *hisi_hba, return 0; } +int prep_smp_v1_hw(struct hisi_hba *hisi_hba, + struct hisi_sas_tei *tei) +{ + struct sas_task *task = tei->task; + struct hisi_sas_cmd_hdr *hdr = tei->hdr; + struct domain_device *device = task->dev; + struct device *dev = &hisi_hba->pdev->dev; + struct hisi_sas_port *port = tei->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; + struct hisi_sas_slot *slot = tei->slot; + + /* + * 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(tei->iptt << CMD_HDR_IPTT_OFF); + + hdr->cmd_table_addr_lo = cpu_to_le32(lower_32_bits(req_dma_addr)); + hdr->cmd_table_addr_hi = cpu_to_le32(upper_32_bits(req_dma_addr)); + + hdr->sts_buffer_addr_lo = + cpu_to_le32(lower_32_bits(slot->status_buffer_dma)); + hdr->sts_buffer_addr_hi = + cpu_to_le32(upper_32_bits(slot->status_buffer_dma)); + + return 0; + +err_out_resp: + dma_unmap_sg(dev, &tei->task->smp_task.smp_resp, 1, + DMA_FROM_DEVICE); +err_out_req: + dma_unmap_sg(dev, &tei->task->smp_task.smp_req, 1, + DMA_TO_DEVICE); + return rc; +} int prep_ssp_v1_hw(struct hisi_hba *hisi_hba, struct hisi_sas_tei *tei, int is_tmf, @@ -1132,11 +1206,14 @@ static void slot_err_v1_hw(struct hisi_hba *hisi_hba, } break; case SAS_PROTOCOL_SMP: + tstat->stat = SAM_STAT_CHECK_CONDITION; + break; + case SAS_PROTOCOL_SATA: case SAS_PROTOCOL_STP: case SAS_PROTOCOL_SATA | SAS_PROTOCOL_STP: { - dev_err(dev, "slot err: SMP/SATA/STP not supported"); + dev_err(dev, "slot err: SATA/STP not supported"); } break; default: @@ -1245,8 +1322,24 @@ int slot_complete_v1_hw(struct hisi_hba *hisi_hba, break; } case SAS_PROTOCOL_SMP: - dev_err(dev, "slot complete: SMP not supported"); + { + void *to; + struct scatterlist *sg_resp = &task->smp_task.smp_resp; + + tstat->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: