From patchwork Fri Apr 23 01:19:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Larumbe X-Patchwork-Id: 12219365 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E6A6C433B4 for ; Fri, 23 Apr 2021 01:22:27 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B68ED613C4 for ; Fri, 23 Apr 2021 01:22:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B68ED613C4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=imgtec.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID:Date: Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=L1aC2Qa7ZUfDKK/zoW7OW+PH6e6IuUJa1MPH5T1wTjs=; b=rASn4noHnNGbQoScSsH/I/UiQ CUBGkI5ePUEdp/PKoP3scTFCi5hRjZBGabpBTVJYwDL6xk6PWY1o7N+bHV8oYKfRT2+49vqA+L3PD NTM8ZEVZks0IHPTnUN0VOoor7fijjeO+PQSQpIOnxIIDRhXjAcJogr9dRIeVIkPHLiZIgd3cMurqZ I9G4YDmBnOrqEr/GvR630hy1w4S7TSuFWJLyTWOLZ0D/xkZM8CbafnANdkpB0intRVtGZilFWBOKM KR5APqyMv4hGreUysnpPK5mMmRWsHMFA9nysPRQB+zf6vBTKmElbmqo44rV4RWRmKHtekp7kL4OG/ 0im7zXajw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZkUh-000FeE-Tf; Fri, 23 Apr 2021 01:20:32 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZkTs-000FWR-1U for linux-arm-kernel@desiato.infradead.org; Fri, 23 Apr 2021 01:19:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=XlA+4FJwvL4EmuhKI3jEajb+NI7k0i/aj8fKtHDXVuY=; b=XQj7BXWU2B4iKcuxOyALKXSEZM R+ril44of3jN4Q+sTVrTwfaWe8dVXgd5J4qJiGYTU8dZQvzOJ4gmCyHfe/0KzOIswHQ4HilbLaWJU UsEtE9bn+46AEIE1U4dgx8lOqLGC35kIFWd3P+k8RGpbLuHu9jlcMOd2dZ/6I4wNk4d1wsGbNtT96 NnOiPg4mlrW7Bn8EHsBNUWm9G7Y+aE6XUFUwt/8wzqU/vXn5al//sKcUO2yBzSqEvwNvo1LsI/g3d fM0ZX/+ig6DjYvBlCCLoSwPmyK5L2wzicpgJYbgXzsF+v7knZ7B+5IBd89MK8jtpo5fxh4Cmc3HdN B8D+6oNQ==; Received: from mx07-00376f01.pphosted.com ([185.132.180.163]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lZkTn-00E4vb-7r for linux-arm-kernel@lists.infradead.org; Fri, 23 Apr 2021 01:19:38 +0000 Received: from pps.filterd (m0168889.ppops.net [127.0.0.1]) by mx07-00376f01.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 13N0xc8B008391; Fri, 23 Apr 2021 02:19:27 +0100 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=imgtec.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=dk201812; bh=XlA+4FJwvL4EmuhKI3jEajb+NI7k0i/aj8fKtHDXVuY=; b=EiQ+vftHhrWze6/8+KrZfd/wTJyJ2ea2ojkHtonStb4OfZRevfonDJOUv8/KEUffSXIP LU4YYViuINwRfzgaZ0Ya8RsuZVIM43kEA9E6OvNjhNeyq8T3GOa6vnLFLf+U6CUAI336 tsWVj5iOJc7mmOOaCUN7kWckuzClj236rp0Ayg0EeY+LeSBOc7XvePbkPPotkQ4mvOkG g19qoklXwTgqoSojUK4Fhg6qGsMO4BazkGn/5RbbI3Uy5lgz4y2YggPxVAIccxZdW/0n NAVH/bQOgo7VvNUvP8bPeOsbnXfPX0AXpWhwI0HchCLU4d+DmDS7Fl4OKQzp3oUI7b0J Eg== Received: from hhmail05.hh.imgtec.org ([217.156.249.195]) by mx07-00376f01.pphosted.com with ESMTP id 382p9395yh-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 23 Apr 2021 02:19:27 +0100 Received: from adrianlarumbe-HP-Elite-7500-Series-MT.hh.imgtec.org (10.100.70.86) by HHMAIL05.hh.imgtec.org (10.100.10.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Fri, 23 Apr 2021 02:19:25 +0100 From: Adrian Larumbe To: , CC: , , Subject: [PATCH 3/4] dmaengine: xilinx_dma: Add CDMA SG transfer support Date: Fri, 23 Apr 2021 02:19:12 +0100 Message-ID: <20210423011913.13122-4-adrian.martinezlarumbe@imgtec.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210423011913.13122-1-adrian.martinezlarumbe@imgtec.com> References: <20210423011913.13122-1-adrian.martinezlarumbe@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [10.100.70.86] X-ClientProxiedBy: HHMAIL05.hh.imgtec.org (10.100.10.120) To HHMAIL05.hh.imgtec.org (10.100.10.120) X-EXCLAIMER-MD-CONFIG: 15a78312-3e47-46eb-9010-2e54d84a9631 X-Proofpoint-GUID: pKvPiUeNmStKTaGDpMW4RbWm-ygOPVd9 X-Proofpoint-ORIG-GUID: pKvPiUeNmStKTaGDpMW4RbWm-ygOPVd9 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210422_181936_155940_C04A341F X-CRM114-Status: GOOD ( 24.28 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org CDMA devices have built-in SG capability, but it was not leveraged by the driver. It adds a new binding for CDMA's device_prep_slave_sg, which looks up the memory address supplied in a previous call to dmaengine_slave_config as the beginning of a contiguous chunk of memory, for either the source or destination of the transfer. DMA_PRIVATE capability needs to be set for a CDMA channel too, or else the DMA Engine core will take a reference upon registration, and it won't be further available for callers of dma_request_chan. Signed-off-by: Adrian Larumbe --- drivers/dma/xilinx/xilinx_dma.c | 131 +++++++++++++++++++++++++++++++- 1 file changed, 127 insertions(+), 4 deletions(-) diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c index 49c7093e2487..40c6cf8bf0e6 100644 --- a/drivers/dma/xilinx/xilinx_dma.c +++ b/drivers/dma/xilinx/xilinx_dma.c @@ -2433,6 +2433,130 @@ xilinx_mcdma_prep_slave_sg(struct dma_chan *dchan, struct scatterlist *sgl, return NULL; } +/** + * xilinx_cdma_prep_slave_sg - prepare descriptors for a DMA_SLAVE transaction + * @dchan: DMA channel + * @sgl: scatterlist to transfer to/from + * @sg_len: number of entries in @scatterlist + * @direction: DMA direction + * @flags: transfer ack flags + * @context: APP words of the descriptor + * + * Return: Async transaction descriptor on success and NULL on failure + */ +static struct dma_async_tx_descriptor +*xilinx_cdma_prep_slave_sg(struct dma_chan *dchan, struct scatterlist *sgl, + unsigned int sg_len, + enum dma_transfer_direction direction, + unsigned long flags, void *context) +{ + struct xilinx_dma_chan *chan = to_xilinx_chan(dchan); + struct xilinx_cdma_tx_segment *segment, *prev = NULL; + struct xilinx_dma_tx_descriptor *desc; + struct xilinx_cdma_desc_hw *hw; + dma_addr_t dma_dst, dma_src, dma_addr; + size_t len, avail; + + (void)flags; + (void)context; + + if (!is_slave_direction(direction)) { + dev_err(chan->xdev->dev, + "%s: bad direction?\n", __func__); + return NULL; + } + + if (unlikely(sg_len == 0 || !sgl)) + return NULL; + + dma_src = 0; + dma_dst = 0; + + if (direction == DMA_DEV_TO_MEM) + dma_src = chan->cfg.src_addr; + else + dma_dst = chan->cfg.dst_addr; + + desc = xilinx_dma_alloc_tx_descriptor(chan); + if (!desc) + return NULL; + + dma_async_tx_descriptor_init(&desc->async_tx, &chan->common); + desc->async_tx.tx_submit = xilinx_dma_tx_submit; + + avail = sg_dma_len(sgl); + /* + * Loop until there is either no more source or no more + * destination scatterlist entries + */ + while (true) { + len = min_t(size_t, avail, chan->xdev->max_buffer_len); + if (len == 0) + goto fetch; + + /* Allocate the link descriptor from DMA pool */ + segment = xilinx_cdma_alloc_tx_segment(chan); + if (!segment) + goto error; + + dma_addr = sg_dma_address(sgl) + sg_dma_len(sgl) - avail; + + if (direction == DMA_DEV_TO_MEM) + dma_dst = dma_addr; + else + dma_src = dma_addr; + + hw = &segment->hw; + hw->control = len; + hw->src_addr = dma_src; + hw->dest_addr = dma_dst; + if (chan->ext_addr) { + hw->src_addr_msb = upper_32_bits(dma_src); + hw->dest_addr_msb = upper_32_bits(dma_dst); + } + + if (prev) { + prev->hw.next_desc = segment->phys; + if (chan->ext_addr) + prev->hw.next_desc_msb = upper_32_bits(segment->phys); + } + + prev = segment; + avail -= len; + list_add_tail(&segment->node, &desc->segments); + + if (direction == DMA_DEV_TO_MEM) + dma_src += len; + else + dma_dst += len; +fetch: + /* Fetch the next scatterlist entry */ + if (avail == 0) { + if (sg_len == 0) + break; + sgl = sg_next(sgl); + if (!sgl) + break; + sg_len--; + avail = sg_dma_len(sgl); + } + } + + /* Link the last hardware descriptor with the first. */ + segment = list_first_entry(&desc->segments, + struct xilinx_cdma_tx_segment, node); + desc->async_tx.phys = segment->phys; + prev->hw.next_desc = segment->phys; + if (chan->ext_addr) + prev->hw.next_desc_msb = upper_32_bits(segment->phys); + + return &desc->async_tx; + +error: + xilinx_dma_free_tx_descriptor(chan, desc); + return NULL; +} + /** * xilinx_dma_terminate_all - Halt the channel and free descriptors * @dchan: Driver specific DMA Channel pointer @@ -3100,10 +3224,8 @@ static int xilinx_dma_probe(struct platform_device *pdev) xdev->common.dev = &pdev->dev; INIT_LIST_HEAD(&xdev->common.channels); - if (!(xdev->dma_config->dmatype == XDMA_TYPE_CDMA)) { - dma_cap_set(DMA_SLAVE, xdev->common.cap_mask); - dma_cap_set(DMA_PRIVATE, xdev->common.cap_mask); - } + dma_cap_set(DMA_SLAVE, xdev->common.cap_mask); + dma_cap_set(DMA_PRIVATE, xdev->common.cap_mask); xdev->common.device_alloc_chan_resources = xilinx_dma_alloc_chan_resources; @@ -3124,6 +3246,7 @@ static int xilinx_dma_probe(struct platform_device *pdev) } else if (xdev->dma_config->dmatype == XDMA_TYPE_CDMA) { dma_cap_set(DMA_MEMCPY, xdev->common.cap_mask); xdev->common.device_prep_dma_memcpy = xilinx_cdma_prep_memcpy; + xdev->common.device_prep_slave_sg = xilinx_cdma_prep_slave_sg; /* Residue calculation is supported by only AXI DMA and CDMA */ xdev->common.residue_granularity = DMA_RESIDUE_GRANULARITY_SEGMENT;