From mboxrd@z Thu Jan 1 00:00:00 1970 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 67A75C433ED for ; Fri, 23 Apr 2021 01:30:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3A963613CC for ; Fri, 23 Apr 2021 01:30:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236126AbhDWBbO (ORCPT ); Thu, 22 Apr 2021 21:31:14 -0400 Received: from mx07-00376f01.pphosted.com ([185.132.180.163]:24280 "EHLO mx07-00376f01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239964AbhDWBbN (ORCPT ); Thu, 22 Apr 2021 21:31:13 -0400 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 13N0xc8A008391; 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=awzIVRW0kyxiBcPd5wocecT8nM+8mcnAfpBf9ybxBdg=; b=bxaItgavqMXaxTyTOTB35Iv7B3OEyDPvESTXNTxpFbSNceEsqQ8kKADHR/bTIa4N9AY1 AN0fZZfIFkMgBPyaQ8j2SWNRUok++0y3Ab8q2O9lWmDaFqbbRgfMIVx2jfZQ9di2M9CQ a/mhOWeo4F7fjGBn3GF+AXR3KrLjeFz/TfJhSWRgREJlxKIufr8ZIBi3IwQ0B4WqPTx1 5rfl5GmX2lTnyyW2Lu+61JkUq03e962v3pnjo3BhP9Ba5FC6vuJ0YZWTpo0Q0FMKsmeW mvLBGTj5SxU4PPp4uHACJ8+X7+d2N0ht+XONdfw+fX9UH4kgLKe8692ulFoGDtry2ES+ rg== Received: from hhmail05.hh.imgtec.org ([217.156.249.195]) by mx07-00376f01.pphosted.com with ESMTP id 382p9395yh-3 (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 2/4] dmaengine: xilinx_dma: Add channel configuration setting callback Date: Fri, 23 Apr 2021 02:19:11 +0100 Message-ID: <20210423011913.13122-3-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 Content-Type: text/plain 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: a834GjnaYGV2bEHFbYpeLkGpU18nVCid X-Proofpoint-ORIG-GUID: a834GjnaYGV2bEHFbYpeLkGpU18nVCid Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org This callback allows the DMA Engine API user to set a per-channel configuration structure before calling dmaengine_prep_slave_sg. This is a prerequisite for being able to do CDMA SG transfers, because one of the transfer ends is meant to be a preconfigured contiguous block of memory. A later implementation of CDMA SG transfers will access this configuration structure, and is therefore dependent on this change. Signed-off-by: Adrian Larumbe --- drivers/dma/xilinx/xilinx_dma.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c index 3f859de593dc..49c7093e2487 100644 --- a/drivers/dma/xilinx/xilinx_dma.c +++ b/drivers/dma/xilinx/xilinx_dma.c @@ -392,6 +392,7 @@ struct xilinx_dma_tx_descriptor { * @irq: Channel IRQ * @id: Channel ID * @direction: Transfer direction + * @cfg: DMA slave channel configuration * @num_frms: Number of frames * @has_sg: Support scatter transfers * @cyclic: Check for cyclic transfers. @@ -429,6 +430,7 @@ struct xilinx_dma_chan { int irq; int id; enum dma_transfer_direction direction; + struct dma_slave_config cfg; int num_frms; bool has_sg; bool cyclic; @@ -2565,6 +2567,21 @@ static void xilinx_dma_chan_remove(struct xilinx_dma_chan *chan) list_del(&chan->common.device_node); } +/** + * xilinx_dma_slave_config - Set the channel config + * @dchan: DMA channel + * @cfg: DMA slave channel configuration + */ +static int xilinx_dma_slave_config(struct dma_chan *dchan, + struct dma_slave_config *cfg) +{ + struct xilinx_dma_chan *chan = to_xilinx_chan(dchan); + + chan->cfg = *cfg; + + return 0; +} + static int axidma_clk_init(struct platform_device *pdev, struct clk **axi_clk, struct clk **tx_clk, struct clk **rx_clk, struct clk **sg_clk, struct clk **tmp_clk) @@ -3095,6 +3112,7 @@ static int xilinx_dma_probe(struct platform_device *pdev) xdev->common.device_terminate_all = xilinx_dma_terminate_all; xdev->common.device_tx_status = xilinx_dma_tx_status; xdev->common.device_issue_pending = xilinx_dma_issue_pending; + xdev->common.device_config = xilinx_dma_slave_config; if (xdev->dma_config->dmatype == XDMA_TYPE_AXIDMA) { dma_cap_set(DMA_CYCLIC, xdev->common.cap_mask); xdev->common.device_prep_slave_sg = xilinx_dma_prep_slave_sg; -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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 28CAEC433ED for ; Fri, 23 Apr 2021 01:22:26 +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 708B4613C4 for ; Fri, 23 Apr 2021 01:22:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 708B4613C4 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=ZpGI6YOjKCAIDX+Wi98XKER8a+QkujbGHBSHUD7xnTU=; b=Xw96P+5HMFlVve3+f0x94ikhd LvVzPbdkhiqCBGaRd2ZhWKqekvCufKUfPWmP7KXuucoR3A8MAjfahC4hALB9yiAyHJW4QcIKvjvuj GzhcZUA2sHh+wJSq2+q3kiCTaGPd9LTR2ab7Z6eYjamPLrWUcncdjaqUXSWcTVY0HrthnPKV5XyzS enksbYkTTBfbNh+aqE5mroR98LOMgkxvw6sV8MBzDdOlzNaM+zizht3fVBBnn16H7K1TXepQv4ero Ij26xseDaPRjP17LC8/Z1n72cm8QgOInpMogYw8rQ6lEmOmbxmosRscP8SyR+6n5mMe3QIxwjMCGH 05fmw6HVA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lZkUX-000Fbb-O3; Fri, 23 Apr 2021 01:20:22 +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 1lZkTr-000FWQ-V1 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=awzIVRW0kyxiBcPd5wocecT8nM+8mcnAfpBf9ybxBdg=; b=xgu0lxbl57TesPhivtf8Xnhb98 zHtYXxoHfcyPWti14Re17zK0Rgg5Ni96AZkp5IFFddC7aK6vPuFFSHQVrri7+g/wm06c4GqK7W8M2 z9sTMKPbLMy5TvQVvhxnXcK6AWnJiQas6mfPK81R0DcWu8qCITEiP5xZe7Y8C1y5Kp8o8jd88aOKs X0OaCuRDV2gC2KbFZRKW86PO/RLvqZ5bDHklQN1O8lgg6Ysig8lynIenDNEBAYCvqv/S/CrR35bjO 7DgKvKtZLikooqeolzb7OC8ap7tBtYov2U3JYBaqwxMM1xx6KhfhB7NBcdXBSVB48aUiCJNZ68Y/c CS4HC7XA==; 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-00E4va-9D 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 13N0xc8A008391; 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=awzIVRW0kyxiBcPd5wocecT8nM+8mcnAfpBf9ybxBdg=; b=bxaItgavqMXaxTyTOTB35Iv7B3OEyDPvESTXNTxpFbSNceEsqQ8kKADHR/bTIa4N9AY1 AN0fZZfIFkMgBPyaQ8j2SWNRUok++0y3Ab8q2O9lWmDaFqbbRgfMIVx2jfZQ9di2M9CQ a/mhOWeo4F7fjGBn3GF+AXR3KrLjeFz/TfJhSWRgREJlxKIufr8ZIBi3IwQ0B4WqPTx1 5rfl5GmX2lTnyyW2Lu+61JkUq03e962v3pnjo3BhP9Ba5FC6vuJ0YZWTpo0Q0FMKsmeW mvLBGTj5SxU4PPp4uHACJ8+X7+d2N0ht+XONdfw+fX9UH4kgLKe8692ulFoGDtry2ES+ rg== Received: from hhmail05.hh.imgtec.org ([217.156.249.195]) by mx07-00376f01.pphosted.com with ESMTP id 382p9395yh-3 (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 2/4] dmaengine: xilinx_dma: Add channel configuration setting callback Date: Fri, 23 Apr 2021 02:19:11 +0100 Message-ID: <20210423011913.13122-3-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: a834GjnaYGV2bEHFbYpeLkGpU18nVCid X-Proofpoint-ORIG-GUID: a834GjnaYGV2bEHFbYpeLkGpU18nVCid X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210422_181936_188948_3B2800BA X-CRM114-Status: GOOD ( 16.00 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This callback allows the DMA Engine API user to set a per-channel configuration structure before calling dmaengine_prep_slave_sg. This is a prerequisite for being able to do CDMA SG transfers, because one of the transfer ends is meant to be a preconfigured contiguous block of memory. A later implementation of CDMA SG transfers will access this configuration structure, and is therefore dependent on this change. Signed-off-by: Adrian Larumbe --- drivers/dma/xilinx/xilinx_dma.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c index 3f859de593dc..49c7093e2487 100644 --- a/drivers/dma/xilinx/xilinx_dma.c +++ b/drivers/dma/xilinx/xilinx_dma.c @@ -392,6 +392,7 @@ struct xilinx_dma_tx_descriptor { * @irq: Channel IRQ * @id: Channel ID * @direction: Transfer direction + * @cfg: DMA slave channel configuration * @num_frms: Number of frames * @has_sg: Support scatter transfers * @cyclic: Check for cyclic transfers. @@ -429,6 +430,7 @@ struct xilinx_dma_chan { int irq; int id; enum dma_transfer_direction direction; + struct dma_slave_config cfg; int num_frms; bool has_sg; bool cyclic; @@ -2565,6 +2567,21 @@ static void xilinx_dma_chan_remove(struct xilinx_dma_chan *chan) list_del(&chan->common.device_node); } +/** + * xilinx_dma_slave_config - Set the channel config + * @dchan: DMA channel + * @cfg: DMA slave channel configuration + */ +static int xilinx_dma_slave_config(struct dma_chan *dchan, + struct dma_slave_config *cfg) +{ + struct xilinx_dma_chan *chan = to_xilinx_chan(dchan); + + chan->cfg = *cfg; + + return 0; +} + static int axidma_clk_init(struct platform_device *pdev, struct clk **axi_clk, struct clk **tx_clk, struct clk **rx_clk, struct clk **sg_clk, struct clk **tmp_clk) @@ -3095,6 +3112,7 @@ static int xilinx_dma_probe(struct platform_device *pdev) xdev->common.device_terminate_all = xilinx_dma_terminate_all; xdev->common.device_tx_status = xilinx_dma_tx_status; xdev->common.device_issue_pending = xilinx_dma_issue_pending; + xdev->common.device_config = xilinx_dma_slave_config; if (xdev->dma_config->dmatype == XDMA_TYPE_AXIDMA) { dma_cap_set(DMA_CYCLIC, xdev->common.cap_mask); xdev->common.device_prep_slave_sg = xilinx_dma_prep_slave_sg; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel