From patchwork Tue Sep 12 10:44:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 812762 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ode+7S/A"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ti.com header.i=@ti.com header.b="D4EGEbzZ"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xs1dp6Sgbz9s7g for ; Tue, 12 Sep 2017 20:45:02 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tc4GNUBzlPoPWTjZ/FvJ0vrqb58xuNJIF/zjnllnRFI=; b=Ode+7S/ALmPS+B zfSn6Hwpv/avrwTn0x7ccHGdF9VgzlH35xJLpeuxv0yc0mlRllwYItBiPGYyETQTlfzUkjPyumE4X +JBLAXYqNaNOVXiivVFV+FDc9hC18nqMtnRjKze9OIp51htttANDZAe43Q0TBoFflE7WOTwoYR0NI oIIovcmzA4IYd+bFBrJdiOWe24R4vREOVBtCvzinURMogCD12KYCStFR+efgBaWrAQrZrbsWgh9al oKnTUiNFJKPi0GXbFaq14Z3LEmb16kNvMzwRkBTtywdZQzfk8kseFcNkMEgmllEm7jAtM+r+84nyY 8OH/JOx8VclDT8BTK8eA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1drigd-0000OS-VX; Tue, 12 Sep 2017 10:44:59 +0000 Received: from lelnx194.ext.ti.com ([198.47.27.80]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1drigZ-0000Kz-5P for linux-arm-kernel@lists.infradead.org; Tue, 12 Sep 2017 10:44:57 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id v8CAiTQB016598; Tue, 12 Sep 2017 05:44:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1505213069; bh=fbCHR3Ke4MLlWfJjPY5XWtqHcKkeqC0PbwvYGw5Jqx0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=D4EGEbzZTYORFceZuYEe+JnMvbziFQwsYQmNZHB19Q3Q3JR4CFw8i4BiWW/F9R/1m f/AyBV1AD5NyXarmbGGBchTnbffDaamRGl8i1vzZpf70OZoNLtOTm1FC28qirUnsdk amfjSpEkkbwIX7O6BjqdU4TiM1GYb4J23e6nKcqA= Received: from DLEE104.ent.ti.com (dlee104.ent.ti.com [157.170.170.34]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CAiT12032305; Tue, 12 Sep 2017 05:44:29 -0500 Received: from DLEE113.ent.ti.com (157.170.170.24) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34; Tue, 12 Sep 2017 05:44:29 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend Transport; Tue, 12 Sep 2017 05:44:29 -0500 Received: from feketebors.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CAiOu2007788; Tue, 12 Sep 2017 05:44:27 -0500 From: Peter Ujfalusi To: , Subject: [PATCH 1/5] dmaengine: edma: Implement protection for invalid max_burst Date: Tue, 12 Sep 2017 13:44:20 +0300 Message-ID: <20170912104424.18495-2-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170912104424.18495-1-peter.ujfalusi@ti.com> References: <20170912104424.18495-1-peter.ujfalusi@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170912_034455_329493_8EF67208 X-CRM114-Status: UNSURE ( 7.71 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [198.47.27.80 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dmaengine@vger.kernel.org, t-kristo@ti.com, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Set the device's max_burst to 32767 (CIDX is 16bit signed value) so clients can take this into consideration when setting up the trasnfer. During slave transfer preparation check if the requested maxburst is valid. Signed-off-by: Peter Ujfalusi --- drivers/dma/edma.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 3879f80a4815..6970355abdc9 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -891,6 +891,10 @@ static int edma_slave_config(struct dma_chan *chan, cfg->dst_addr_width == DMA_SLAVE_BUSWIDTH_8_BYTES) return -EINVAL; + if (cfg->src_maxburst > chan->device->max_burst || + cfg->dst_maxburst > chan->device->max_burst) + return -EINVAL; + memcpy(&echan->cfg, cfg, sizeof(echan->cfg)); return 0; @@ -1855,6 +1859,7 @@ static void edma_dma_init(struct edma_cc *ecc, bool legacy_mode) s_ddev->dst_addr_widths = EDMA_DMA_BUSWIDTHS; s_ddev->directions |= (BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV)); s_ddev->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; + s_ddev->max_burst = SZ_32K - 1; /* CIDX: 16bit signed */ s_ddev->dev = ecc->dev; INIT_LIST_HEAD(&s_ddev->channels); From patchwork Tue Sep 12 10:44:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 812766 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="p212/Pu0"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ti.com header.i=@ti.com header.b="o0eM2EXH"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xs1hF5NjZz9s7M for ; Tue, 12 Sep 2017 20:47:09 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=HrUQvBt+vjeeX/Y98o3i0QNalb3yutye44vQjVHAXTU=; b=p212/Pu0Q1+5HA PflClaUf3DPIo5MBQtO/82F4zqaTDlYmhWprlx1Mg3tLlPVOgi8tu+rnlcdf4ITYPqT9pvefsrGEY 7ISdbFoZTL7OEafMqoPfsvioRIsgclyGQTH85R/uY5IImegEX1DTTiFgU8duCrkY6xVq6OAqXHjrG Xi+qE67LAhSi+zIZdye9x5sxyo/7Jk0rhDjHclagcsa8eIhLByU7mscRbIqtS9s4CXrn1M1fjrBBT 1Ym2BqwtfczLXHRcjjllSOLrCNhlQfUPO+unaDu4cqeELenF/jINpI93S/YR6TjkkOmTfDzeNKkUt RTLRSE09SJ2AT4rDjkcg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1driie-00037Y-SG; Tue, 12 Sep 2017 10:47:04 +0000 Received: from fllnx209.ext.ti.com ([198.47.19.16]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1drigx-0000VG-KI for linux-arm-kernel@lists.infradead.org; Tue, 12 Sep 2017 10:45:27 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllnx209.ext.ti.com (8.15.1/8.15.1) with ESMTP id v8CAia6F021914; Tue, 12 Sep 2017 05:44:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1505213076; bh=zLA+ZWMFeEmJYbJ9Y+24IZzTs+LTZf/DqhsFuebaQRI=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=o0eM2EXHivnljc0dmdAVwrqcFsPI/Wu+fSgHzrDyVmFOMqLL+37oQOp4trcqMeLkV fxl2EYDMIHGsuWaMZ7ahrFXTTMMcrV/HU7Ds6UiIioaNsCFRth5XDUAf/wPDjAn/Ix PxzYqw1qgtUehoJC+BeWu4/bcEQDSR3RRteWDFnE= Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CAiVpi032321; Tue, 12 Sep 2017 05:44:31 -0500 Received: from DFLE108.ent.ti.com (10.64.6.29) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34; Tue, 12 Sep 2017 05:44:31 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend Transport; Tue, 12 Sep 2017 05:44:31 -0500 Received: from feketebors.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CAiOu3007788; Tue, 12 Sep 2017 05:44:29 -0500 From: Peter Ujfalusi To: , Subject: [PATCH 2/5] dmaengine: omap-dma: Implement protection for invalid max_burst Date: Tue, 12 Sep 2017 13:44:21 +0300 Message-ID: <20170912104424.18495-3-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170912104424.18495-1-peter.ujfalusi@ti.com> References: <20170912104424.18495-1-peter.ujfalusi@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170912_034520_139863_AE963769 X-CRM114-Status: UNSURE ( 7.76 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [198.47.19.16 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dmaengine@vger.kernel.org, t-kristo@ti.com, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Set the device's max_burst to 16777215 (EN is 24bit unsigned value) so clients can take this into consideration when setting up the trasnfer. During slave transfer preparation check if the requested maxburst is valid. Signed-off-by: Peter Ujfalusi --- drivers/dma/omap-dma.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index 8c1665c8fe33..f6dd849159d8 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -1288,6 +1288,10 @@ static int omap_dma_slave_config(struct dma_chan *chan, struct dma_slave_config cfg->dst_addr_width == DMA_SLAVE_BUSWIDTH_8_BYTES) return -EINVAL; + if (cfg->src_maxburst > chan->device->max_burst || + cfg->dst_maxburst > chan->device->max_burst) + return -EINVAL; + memcpy(&c->cfg, cfg, sizeof(c->cfg)); return 0; @@ -1482,6 +1486,7 @@ static int omap_dma_probe(struct platform_device *pdev) od->ddev.dst_addr_widths = OMAP_DMA_BUSWIDTHS; od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; + od->ddev.max_burst = SZ_16M - 1; /* CCEN: 24bit unsigned */ od->ddev.dev = &pdev->dev; INIT_LIST_HEAD(&od->ddev.channels); spin_lock_init(&od->lock); From patchwork Tue Sep 12 10:44:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 812764 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AnWZJI8e"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ti.com header.i=@ti.com header.b="ieo5D2BP"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xs1gH1fjSz9s7g for ; Tue, 12 Sep 2017 20:46:19 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=slnz1nYfS4s7Z2dlQGr56IVkrZOu6Yhz1xTGYLJQ7Hs=; b=AnWZJI8eYm3J1z 9m+X/RlRcMSGNLTV2J/zndSL1QxhPKZ1ggDTmU2XxOu0FNL4G7jbNadUUsjvDsBEg8vNd2+Sk53dk ka7DNRvoXisSdB6DeetDauA+1yDoAQ75DwMlGou9B0urLLZ0DejRvFf+6hDjmlUM5uNgeAB38SM52 zZYEdGnfzvB6P4tYwN+Di2UQufSJqvhYbhW9beZ88ba8nz6fKEuS8IiAJg+iu+bYIE/J1iNqrwCaE Gvbntc1H3aI9SlVAm6bImyiD2lzdN20muezoNB1QfKbYq7bTzNA3Bu0FalWEwY0LJje8F+LZscZkR 1X5SvU3jvBMfbIOkmuVw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1drihr-0002RD-6n; Tue, 12 Sep 2017 10:46:15 +0000 Received: from lelnx194.ext.ti.com ([198.47.27.80]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1drigZ-0000LD-AJ for linux-arm-kernel@lists.infradead.org; Tue, 12 Sep 2017 10:45:01 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id v8CAiYhR016602; Tue, 12 Sep 2017 05:44:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1505213074; bh=e1qO2uS0sbFXRdqboLwk6OSJ4UvLUwxAA6JQwLv5dDc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=ieo5D2BPIH12j04DIAsccZb2xofVjNzi5ky59vxMrckcYwALVAoxlF+6nGty6oLqR ibAfaIqwAZycqmF5c7arGp2phH8F0+mxtt/1qP/6s3VlJ/hl1EgKql06HGBd1VP2e7 FKfIsrCccDURemFpxQtIQtGTz7AajlCg2gaG2hYI= Received: from DLEE102.ent.ti.com (dlee102.ent.ti.com [157.170.170.32]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CAiYFK032350; Tue, 12 Sep 2017 05:44:34 -0500 Received: from DLEE112.ent.ti.com (157.170.170.23) by DLEE102.ent.ti.com (157.170.170.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34; Tue, 12 Sep 2017 05:44:33 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend Transport; Tue, 12 Sep 2017 05:44:33 -0500 Received: from feketebors.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CAiOu4007788; Tue, 12 Sep 2017 05:44:31 -0500 From: Peter Ujfalusi To: , Subject: [PATCH 3/5] dmaengine: Support for querying maximum trasnfer length (of an SG element) Date: Tue, 12 Sep 2017 13:44:22 +0300 Message-ID: <20170912104424.18495-4-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170912104424.18495-1-peter.ujfalusi@ti.com> References: <20170912104424.18495-1-peter.ujfalusi@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170912_034455_545181_6C38262C X-CRM114-Status: GOOD ( 10.49 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [198.47.27.80 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dmaengine@vger.kernel.org, t-kristo@ti.com, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Certain DMA engines have limitation on the maximum size of a transfer they can support. This size limitation is per SG element or for period length in cyclic transfers. In TI's eDMA and sDMA this limitation is not really a length limit, but it is the number of bursts that we can support in one transfer. With this callback the DMA drivers can provide hints to clients on how they should set up their buffers (sglist, cyclic buffer). Without this the clients must have open coded workarounds in place for each and every DMA engine they might be interfacing with to have correct length for the transfers. Signed-off-by: Peter Ujfalusi --- include/linux/dmaengine.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 8319101170fc..739824b94c1b 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -705,6 +705,9 @@ struct dma_filter { * @device_prep_dma_imm_data: DMA's 8 byte immediate data to the dst address * @device_config: Pushes a new configuration to a channel, return 0 or an error * code + * @device_get_max_len: Get the maximum supported length in bytes of a slave + * transfer based on the set dma_slave_config. The length limitation + * applies to each SG element's length. * @device_pause: Pauses any transfer happening on a channel. Returns * 0 or an error code * @device_resume: Resumes any transfer on a channel previously @@ -792,6 +795,8 @@ struct dma_device { int (*device_config)(struct dma_chan *chan, struct dma_slave_config *config); + u32 (*device_get_max_len)(struct dma_chan *chan, + enum dma_transfer_direction dir); int (*device_pause)(struct dma_chan *chan); int (*device_resume)(struct dma_chan *chan); int (*device_terminate_all)(struct dma_chan *chan); @@ -812,6 +817,15 @@ static inline int dmaengine_slave_config(struct dma_chan *chan, return -ENOSYS; } +static inline u32 dmaengine_slave_get_max_len(struct dma_chan *chan, + enum dma_transfer_direction dir) +{ + if (chan->device->device_get_max_len) + return chan->device->device_get_max_len(chan, dir); + + return 0; +} + static inline bool is_slave_direction(enum dma_transfer_direction direction) { return (direction == DMA_MEM_TO_DEV) || (direction == DMA_DEV_TO_MEM); From patchwork Tue Sep 12 10:44:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 812765 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KgSu28MV"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ti.com header.i=@ti.com header.b="hjOA7QXm"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xs1gk5Kfqz9s7M for ; Tue, 12 Sep 2017 20:46:42 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Xd4TMiX+4h6SNMxKnOFaIIX/xdpIzqb9DkV/rMcTEek=; b=KgSu28MVbhCVVJ HsZ727aJZGI/6QcpBk0jd8U8jaWLrUCuh19FB5P4Fbb0iPwXejK+GVWkbnjGal83nZV5M3aCEGRYI cZte8zb9Yd/r/Tbund7o1EJKJgvH+tsDTF3jlv3qU3w/KAkl1/XyOliXMig6E5Klpx+luMen+aDAT 9BtJ6z+U/a5bA9B8orxtKrActUW2u6+QYxXILuHpUevBTvYNaDNZL+19J2OEUPmsnk7ik3SoaCDnX FeB+9QSFseRD8RXiIYjJQ1eQyNU0q0JIOIVLX7+GHTvidwUwNRy9q6FO316noEuOUqSt6eo/nCLpD xK3v8JajydBC+bxzmY/w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1driiE-0002l1-VK; Tue, 12 Sep 2017 10:46:38 +0000 Received: from lelnx193.ext.ti.com ([198.47.27.77]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1drigc-0000LW-K3 for linux-arm-kernel@lists.infradead.org; Tue, 12 Sep 2017 10:45:00 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx193.ext.ti.com (8.15.1/8.15.1) with ESMTP id v8CAiaGv018302; Tue, 12 Sep 2017 05:44:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1505213076; bh=d33L8/srOSJ5JMoAdteSs1oR1/iBm8YLFGRnXsFqoEc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=hjOA7QXm6NxZn3IYbUVZoQOYyqWoPiar5UiszllMTX7zDKCwSainyrE8Vey7BoYeZ /0dFtHxD9lk3eV4n6vFDEOwiwNq10S59UTB6mOsLoCo4wosLemMlC4dbwSd+3PsSBk OhZbH4glImyXvqP6zSCiB3VXx0QFJNtEqTHwwHKo= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CAiaOT032364; Tue, 12 Sep 2017 05:44:36 -0500 Received: from DFLE110.ent.ti.com (10.64.6.31) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34; Tue, 12 Sep 2017 05:44:35 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend Transport; Tue, 12 Sep 2017 05:44:35 -0500 Received: from feketebors.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CAiOu5007788; Tue, 12 Sep 2017 05:44:34 -0500 From: Peter Ujfalusi To: , Subject: [PATCH 4/5] dmaengine: edma: Implement device_get_max_len callback Date: Tue, 12 Sep 2017 13:44:23 +0300 Message-ID: <20170912104424.18495-5-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170912104424.18495-1-peter.ujfalusi@ti.com> References: <20170912104424.18495-1-peter.ujfalusi@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170912_034458_761841_92867899 X-CRM114-Status: UNSURE ( 8.25 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [198.47.27.77 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dmaengine@vger.kernel.org, t-kristo@ti.com, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org eDMA can support maximum of 65535 number of bursts in one transfer. The limitation is because the CCNT counter is 16bit unsigned. Signed-off-by: Peter Ujfalusi --- drivers/dma/edma.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 6970355abdc9..14c52574262c 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -900,6 +900,28 @@ static int edma_slave_config(struct dma_chan *chan, return 0; } +static u32 edma_get_max_len(struct dma_chan *chan, + enum dma_transfer_direction dir) +{ + struct edma_chan *echan = to_edma_chan(chan); + enum dma_slave_buswidth dev_width; + u32 burst; + + if (!is_slave_direction(dir)) + return 0; + + if (dir == DMA_DEV_TO_MEM) { + dev_width = echan->cfg.src_addr_width; + burst = echan->cfg.src_maxburst; + } else { + burst = echan->cfg.dst_maxburst; + dev_width = echan->cfg.dst_addr_width; + } + + /* CCNT: 16bit unsigned. Number of bursts */ + return dev_width * burst * (SZ_64K - 1); +} + static int edma_dma_pause(struct dma_chan *chan) { struct edma_chan *echan = to_edma_chan(chan); @@ -1850,6 +1872,7 @@ static void edma_dma_init(struct edma_cc *ecc, bool legacy_mode) s_ddev->device_issue_pending = edma_issue_pending; s_ddev->device_tx_status = edma_tx_status; s_ddev->device_config = edma_slave_config; + s_ddev->device_get_max_len = edma_get_max_len; s_ddev->device_pause = edma_dma_pause; s_ddev->device_resume = edma_dma_resume; s_ddev->device_terminate_all = edma_terminate_all; From patchwork Tue Sep 12 10:44:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 812763 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="eUHCec0V"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ti.com header.i=@ti.com header.b="FV75i/1B"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xs1fq2k3gz9s7g for ; Tue, 12 Sep 2017 20:45:55 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=o4oubHwGGjcfJzCWR+rBLj0BNAu7Mt1zS8NYVg3hg/A=; b=eUHCec0VJl5zrx oVO0f5dRF/BCtjscCjrpIkXq2iG9BY7ewUFJ4SXNcXXdOuWtIVanM4qib0DxL+DSd3y2P4Dr5Band uAzyYPeNqw2SCPDvbt8G/31IOD6+pPeigalYKHLGtwaJREl78FqTMoycZAaonuwVVpXotigzJRTP0 VrFBIzgN09wp9dRghwtXidQzqn7Yo0Rf7uA9+Gbox5s1y3N3QXgO1/3JbCHXxs7mXLsavWgs3yaBs pfsuqjPnfed8/p0xClu7dVC0PCw4FJQ+lpvTMc9u1nUMT/6vmHSGOs1ESoyVWiZnahWM6llFcWCPU ojkFvDZ9HUuZat0YLHTQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1drihT-00026O-2p; Tue, 12 Sep 2017 10:45:51 +0000 Received: from lelnx194.ext.ti.com ([198.47.27.80]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1driga-0000Lj-WB for linux-arm-kernel@lists.infradead.org; Tue, 12 Sep 2017 10:44:58 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by lelnx194.ext.ti.com (8.15.1/8.15.1) with ESMTP id v8CAicrq016610; Tue, 12 Sep 2017 05:44:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1505213078; bh=MfXNTKdx2O+K5V99+SqHjd6ytn6Ax6gG65JH7CWntMU=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=FV75i/1BICHpPxIqiJFsLUEywaCbFLvPVqi8iXbTumJoMVo9J0Cm2tYocirtYNvqN IQtk8+WGcD5aiZ96bwMXLmyhZTuYlWxlrPPKSWuebHxQ9Tl7wAOfKXOafnRDxuD0Bd aEFhN8qRkjpoMlnWqMshN5mTcqnXs6LpG+hn6u4Y= Received: from DFLE112.ent.ti.com (dfle112.ent.ti.com [10.64.6.33]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CAicRM032393; Tue, 12 Sep 2017 05:44:38 -0500 Received: from DFLE107.ent.ti.com (10.64.6.28) by DFLE112.ent.ti.com (10.64.6.33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.845.34; Tue, 12 Sep 2017 05:44:38 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE107.ent.ti.com (10.64.6.28) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.845.34 via Frontend Transport; Tue, 12 Sep 2017 05:44:38 -0500 Received: from feketebors.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id v8CAiOu6007788; Tue, 12 Sep 2017 05:44:36 -0500 From: Peter Ujfalusi To: , Subject: [PATCH 5/5] dmaengine: omap-dma: Implement device_get_max_len callback Date: Tue, 12 Sep 2017 13:44:24 +0300 Message-ID: <20170912104424.18495-6-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170912104424.18495-1-peter.ujfalusi@ti.com> References: <20170912104424.18495-1-peter.ujfalusi@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170912_034457_146956_1A45FE5C X-CRM114-Status: UNSURE ( 8.00 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [198.47.27.80 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dmaengine@vger.kernel.org, t-kristo@ti.com, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org sDMA can support maximum of 65535 number of bursts in one transfer. The limitation is because the CFN counter is 16bit unsigned. Signed-off-by: Peter Ujfalusi --- drivers/dma/omap-dma.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c index f6dd849159d8..6418be98a782 100644 --- a/drivers/dma/omap-dma.c +++ b/drivers/dma/omap-dma.c @@ -1297,6 +1297,28 @@ static int omap_dma_slave_config(struct dma_chan *chan, struct dma_slave_config return 0; } +static u32 omap_dma_get_max_len(struct dma_chan *chan, + enum dma_transfer_direction dir) +{ + struct omap_chan *c = to_omap_dma_chan(chan); + enum dma_slave_buswidth dev_width; + u32 burst; + + if (!is_slave_direction(dir)) + return 0; + + if (dir == DMA_DEV_TO_MEM) { + dev_width = c->cfg.src_addr_width; + burst = c->cfg.src_maxburst; + } else { + burst = c->cfg.dst_maxburst; + dev_width = c->cfg.dst_addr_width; + } + + /* CFN: 16bit unsigned. Number of bursts */ + return dev_width * burst * (SZ_64K - 1); +} + static int omap_dma_terminate_all(struct dma_chan *chan) { struct omap_chan *c = to_omap_dma_chan(chan); @@ -1478,6 +1500,7 @@ static int omap_dma_probe(struct platform_device *pdev) od->ddev.device_prep_dma_memcpy = omap_dma_prep_dma_memcpy; od->ddev.device_prep_interleaved_dma = omap_dma_prep_dma_interleaved; od->ddev.device_config = omap_dma_slave_config; + od->ddev.device_get_max_len = omap_dma_get_max_len; od->ddev.device_pause = omap_dma_pause; od->ddev.device_resume = omap_dma_resume; od->ddev.device_terminate_all = omap_dma_terminate_all;