From patchwork Mon Jan 28 16:03:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angus Ainslie X-Patchwork-Id: 10783953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3163A13B4 for ; Mon, 28 Jan 2019 16:04:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F7862BA07 for ; Mon, 28 Jan 2019 16:04:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1333E2BA5D; Mon, 28 Jan 2019 16:04:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 929442BA6B for ; Mon, 28 Jan 2019 16:04:55 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=+IIxpB3IHApXnZvW2ZozbICqtaLMWw0VVhRzSEfemMA=; b=gMo9KH6vtaUHZXyoBwf8y60QMC wFkWEf2fO0P9US72wGimNkxhMTkhFQ2kJvtARwXDPOVNbsliX7k0BxKp2GDddlH4hL187UnyjRY43 phOAxmwUiDFMg9BdpnGKonsei/l2Mw8sR9rEcWn7UW2sAmYH71ZMtxApwO9otMH+3Q+XyKsVrbSWj wUz0jdzZCrDcUX1drO9euXvKgJjiATf+PVgIeq1nAx5QRTnZhr8wE74PIDdxjR9Pz/iJOCBCw4nxL 7i32vXfrfTvAVMGBHpg4c+gT/hDvhY+69TcV61Yb1+NzsP+f2h1peypnIrBdeqv9N1HVaW5cbqB0J avrsCqKg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1go9P1-0003o4-Ed; Mon, 28 Jan 2019 16:04:51 +0000 Received: from node.akkea.ca ([192.155.83.177]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1go9Om-0003aM-9A for linux-arm-kernel@lists.infradead.org; Mon, 28 Jan 2019 16:04:37 +0000 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 2881E4E2051; Mon, 28 Jan 2019 16:04:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548691476; bh=ecV0FVs8pf7wdJfAacDQzQaog4WDhg7OxsMhlavdhgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lTJ+XIUVtTk4URuf4yUWWjGUu6oJYao6apmwhCZlqZCO9bmK/kU3ZVYhfTKzqNlDo EmZtICPbHgeRA8bpS043UjNJzK9FSrEylyNSxoOW/bl2u29wQiPR7EP3spWpE5ggfE xlOZY13ZkqcFdYtx8XBvmoaX3BHbn7cCL3gS4eIc= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yBjyiNuthFzc; Mon, 28 Jan 2019 16:04:35 +0000 (UTC) Received: from localhost.localdomain (198-48-167-13.cpe.pppoe.ca [198.48.167.13]) by node.akkea.ca (Postfix) with ESMTPSA id 1EB5C4E2050; Mon, 28 Jan 2019 16:04:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548691475; bh=ecV0FVs8pf7wdJfAacDQzQaog4WDhg7OxsMhlavdhgo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Q38CLUPcP7VsYjz2Y7Ew1otNBIBpfmXBeDb3RfFgOObN9oiwpnXbCCztMVGIvFOYD AEUoDE1bupPv9s9hmD5sHhGnYd4dJhWdJTn6clxHuTB7xwO3X3g6HTINxxNvwA/L21 XeYENDHeXyIqWjVUrMlQKBc/PXsm9PM8UjVcE9lg= From: "Angus Ainslie (Purism)" To: angus@akkea.ca Subject: [PATCH v6 1/3] dmaengine: imx-sdma: add clock ratio 1:1 check Date: Mon, 28 Jan 2019 09:03:21 -0700 Message-Id: <20190128160323.28170-2-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190128160323.28170-1-angus@akkea.ca> References: <20190120023150.17138-1-angus@akkea.ca> <20190128160323.28170-1-angus@akkea.ca> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190128_080436_326646_AD89AC27 X-CRM114-Status: GOOD ( 10.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Baluta , linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, Vinod Koul , NXP Linux Team , Pengutronix Kernel Team , angus.ainslie@puri.sm, linux-arm-kernel@lists.infradead.org, Lucas Stach MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On i.mx8 mscale B0 chip, AHB/SDMA clock ratio 2:1 can't be supportted, since SDMA clock ratio has to be increased to 250Mhz, AHB can't reach to 500Mhz, so use 1:1 instead. Based on NXP commit MLK-16841-1 by Robin Gong Signed-off-by: Angus Ainslie (Purism) Reviewed-by: Lucas Stach --- drivers/dma/imx-sdma.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 0b3a67ff8e82..757fad2fbfae 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -440,6 +440,8 @@ struct sdma_engine { unsigned int irq; dma_addr_t bd0_phys; struct sdma_buffer_descriptor *bd0; + /* clock ratio for AHB:SDMA core. 1:1 is 1, 2:1 is 0*/ + bool clk_ratio; }; static int sdma_config_write(struct dma_chan *chan, @@ -662,8 +664,11 @@ static int sdma_run_channel0(struct sdma_engine *sdma) dev_err(sdma->dev, "Timeout waiting for CH0 ready\n"); /* Set bits of CONFIG register with dynamic context switching */ - if (readl(sdma->regs + SDMA_H_CONFIG) == 0) - writel_relaxed(SDMA_H_CONFIG_CSM, sdma->regs + SDMA_H_CONFIG); + reg = readl(sdma->regs + SDMA_H_CONFIG); + if ((reg & SDMA_H_CONFIG_CSM) == 0) { + reg |= SDMA_H_CONFIG_CSM; + writel_relaxed(reg, sdma->regs + SDMA_H_CONFIG); + } return ret; } @@ -1840,6 +1845,9 @@ static int sdma_init(struct sdma_engine *sdma) if (ret) goto disable_clk_ipg; + if (clk_get_rate(sdma->clk_ahb) == clk_get_rate(sdma->clk_ipg)) + sdma->clk_ratio = 1; + /* Be sure SDMA has not started yet */ writel_relaxed(0, sdma->regs + SDMA_H_C0PTR); @@ -1880,8 +1888,10 @@ static int sdma_init(struct sdma_engine *sdma) writel_relaxed(0x4050, sdma->regs + SDMA_CHN0ADDR); /* Set bits of CONFIG register but with static context switching */ - /* FIXME: Check whether to set ACR bit depending on clock ratios */ - writel_relaxed(0, sdma->regs + SDMA_H_CONFIG); + if (sdma->clk_ratio) + writel_relaxed(SDMA_H_CONFIG_ACR, sdma->regs + SDMA_H_CONFIG); + else + writel_relaxed(0, sdma->regs + SDMA_H_CONFIG); writel_relaxed(ccb_phys, sdma->regs + SDMA_H_C0PTR); From patchwork Mon Jan 28 16:03:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angus Ainslie X-Patchwork-Id: 10783957 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 40311184E for ; Mon, 28 Jan 2019 16:05:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CBF52B92E for ; Mon, 28 Jan 2019 16:05:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 209B22BA2E; Mon, 28 Jan 2019 16:05:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 123802BC1D for ; Mon, 28 Jan 2019 16:05:50 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=K97z6/6fMKWf0+MnNXvhhpM7GxWgdTqdc8G9T5lRzM8=; b=e1AFSjuY1SJ5UmZr0ZmvkSnUBQ 4kWo4lQ2gFccd8aiFM+vzRMyMtSTHFe66fGAkoJi79zeaHAdzk8ytn4bu8YAPGP8Iq9QrvWrxWRmg Tny8G7W/igYHamjHQUbNt+mMWTsSI5st83pXeieQJrCnTNi01u1v9NeOjGOoFIDYkMOAHW2WWPGXG XBe1qRRdiKWZMvHkfBexhEu1TUlBXOObDjFiEH6OMwjVliolzQuYUT++MYy7+k2MD3PNdVH7svlPR 5pmOVfKCemvS9kUZtpMgJ5ZgSF7Rlusbi1hqJOlViFgWhlnaYA/vfSCTTSRf3Tv+UiDmbYR8hyfU9 yyN2czuw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1go9Pt-0005fu-Sc; Mon, 28 Jan 2019 16:05:45 +0000 Received: from node.akkea.ca ([192.155.83.177]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1go9Om-0003ae-Tm for linux-arm-kernel@lists.infradead.org; Mon, 28 Jan 2019 16:04:43 +0000 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id C95774E2056; Mon, 28 Jan 2019 16:04:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548691476; bh=I60JoXZ0Fpb5JUjsLYBGi9hotAmLYskNzq8pFwZSRaI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xgDx0vTLB7wYTmcpSyFIzwKN1e+HojjwX1fhgOfCRBZkFainI8Zf7L70+mjqrbiT5 A+hkyCuEpZ9C6x9LGBa/nbjGklJjX/Ocij8BoKYHyi/aorqiDjjHr+ex1Q2wIhNQXt enIwJYLBTR2uSpPOySgOEPggRmw4ZsF+dMVlF3ig= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id syvnqMpJKrZF; Mon, 28 Jan 2019 16:04:36 +0000 (UTC) Received: from localhost.localdomain (198-48-167-13.cpe.pppoe.ca [198.48.167.13]) by node.akkea.ca (Postfix) with ESMTPSA id D4C134E204B; Mon, 28 Jan 2019 16:04:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548691476; bh=I60JoXZ0Fpb5JUjsLYBGi9hotAmLYskNzq8pFwZSRaI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xgDx0vTLB7wYTmcpSyFIzwKN1e+HojjwX1fhgOfCRBZkFainI8Zf7L70+mjqrbiT5 A+hkyCuEpZ9C6x9LGBa/nbjGklJjX/Ocij8BoKYHyi/aorqiDjjHr+ex1Q2wIhNQXt enIwJYLBTR2uSpPOySgOEPggRmw4ZsF+dMVlF3ig= From: "Angus Ainslie (Purism)" To: angus@akkea.ca Subject: [PATCH v6 2/3] dmaengine: imx-sdma: add a test for imx8mq multi sdma devices Date: Mon, 28 Jan 2019 09:03:22 -0700 Message-Id: <20190128160323.28170-3-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190128160323.28170-1-angus@akkea.ca> References: <20190120023150.17138-1-angus@akkea.ca> <20190128160323.28170-1-angus@akkea.ca> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190128_080436_961929_FA0B5C0D X-CRM114-Status: GOOD ( 11.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Baluta , linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, Vinod Koul , NXP Linux Team , Pengutronix Kernel Team , angus.ainslie@puri.sm, linux-arm-kernel@lists.infradead.org, Lucas Stach MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP On i.mx8mq, there are two sdma instances, and the common dma framework will get a channel dynamically from any available sdma instance whether it's the first sdma device or the second sdma device. Some IPs like SAI only work with sdma2 not sdma1. To make sure the sdma channel is from the correct sdma device, use the node pointer to match. Signed-off-by: Angus Ainslie (Purism) Reviewed-by: Lucas Stach Tested-by: Daniel Baluta --- drivers/dma/imx-sdma.c | 6 ++++++ include/linux/platform_data/dma-imx.h | 1 + 2 files changed, 7 insertions(+) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 757fad2fbfae..d2fae53be689 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1914,11 +1914,16 @@ static int sdma_init(struct sdma_engine *sdma) static bool sdma_filter_fn(struct dma_chan *chan, void *fn_param) { struct sdma_channel *sdmac = to_sdma_chan(chan); + struct sdma_engine *sdma = sdmac->sdma; struct imx_dma_data *data = fn_param; if (!imx_dma_is_general_purpose(chan)) return false; + /* return false if it's not the right device */ + if (sdma->dev->of_node != data->of_node) + return false; + sdmac->data = *data; chan->private = &sdmac->data; @@ -1946,6 +1951,7 @@ static struct dma_chan *sdma_xlate(struct of_phandle_args *dma_spec, * be set to sdmac->event_id1. */ data.dma_request2 = 0; + data.of_node = ofdma->of_node; return dma_request_channel(mask, sdma_filter_fn, &data); } diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h index 7d964e787299..9daea8d42a10 100644 --- a/include/linux/platform_data/dma-imx.h +++ b/include/linux/platform_data/dma-imx.h @@ -55,6 +55,7 @@ struct imx_dma_data { int dma_request2; /* secondary DMA request line */ enum sdma_peripheral_type peripheral_type; int priority; + struct device_node *of_node; }; static inline int imx_dma_is_ipu(struct dma_chan *chan) From patchwork Mon Jan 28 16:03:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angus Ainslie X-Patchwork-Id: 10783955 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CB8DF13B4 for ; Mon, 28 Jan 2019 16:05:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA71F2BA24 for ; Mon, 28 Jan 2019 16:05:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADFC62BC23; Mon, 28 Jan 2019 16:05:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5E8232BA2F for ; Mon, 28 Jan 2019 16:05:33 +0000 (UTC) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=DSYEClYSP7d7MKCdA78V6Y7GkGyDhUH6JSQDA9cuT80=; b=QiqTKjygq/KKprnCV6a99jyS5f iHUEzr8g+ZBpP5Gpa1UGw5RrEPz5dXyXVy6E4Gi8WDlo4AAcqLhx8gfF6MBDW29nVBrG6PevHfz/Z JRqs2xQwxYskTU4bArjy1xFHzb38BY2L0dMpUnDF81cWbV1LTF/azozrbM/fr/Aze2dw/+heoWNLv xoxmkOZbzX5rDMtXEsYmUnW31C5UbWF7qgrduBacxzOz1hDNbIJH6aBT4I9eNl7gRr5Zg15IUv3U2 SOrGwgMw+2G95hihQE5iyfrEou2TRrZ5HeXNOfgHPppprgyBhiVWBCSquATsq+C8CJnQcWXnXLSFA QxQWJu/Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1go9Pf-0005R0-B1; Mon, 28 Jan 2019 16:05:31 +0000 Received: from node.akkea.ca ([192.155.83.177]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1go9On-0003b0-Kv for linux-arm-kernel@lists.infradead.org; Mon, 28 Jan 2019 16:04:39 +0000 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 82E3F4E2050; Mon, 28 Jan 2019 16:04:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548691477; bh=J7FDNerUzu+c8gJAAHJsx3fEWW03ezFNiCXJWstnopY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Pdi7HOeDTff0lwHqmDv1isZrwh2zGigGDmTauCj+xzTkALue16Pxxeunh0YUSuTab pgPSxtacyzurFT+C2ErrLyFqSE8PD1PN1QKDEqLHoDQa/UdX8v8OjAqRbl7oP/KJpo tN/EQIa5rpfNj5XI3LVlYS31B0kC99NhH/48wGUs= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YivCd2jEN6LV; Mon, 28 Jan 2019 16:04:37 +0000 (UTC) Received: from localhost.localdomain (198-48-167-13.cpe.pppoe.ca [198.48.167.13]) by node.akkea.ca (Postfix) with ESMTPSA id 953DB4E204D; Mon, 28 Jan 2019 16:04:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548691477; bh=J7FDNerUzu+c8gJAAHJsx3fEWW03ezFNiCXJWstnopY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Pdi7HOeDTff0lwHqmDv1isZrwh2zGigGDmTauCj+xzTkALue16Pxxeunh0YUSuTab pgPSxtacyzurFT+C2ErrLyFqSE8PD1PN1QKDEqLHoDQa/UdX8v8OjAqRbl7oP/KJpo tN/EQIa5rpfNj5XI3LVlYS31B0kC99NhH/48wGUs= From: "Angus Ainslie (Purism)" To: angus@akkea.ca Subject: [PATCH v6 3/3] dmaengine: imx-sdma: fix consistent dma test failures Date: Mon, 28 Jan 2019 09:03:23 -0700 Message-Id: <20190128160323.28170-4-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190128160323.28170-1-angus@akkea.ca> References: <20190120023150.17138-1-angus@akkea.ca> <20190128160323.28170-1-angus@akkea.ca> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190128_080437_834215_0EB488CC X-CRM114-Status: UNSURE ( 8.28 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Baluta , linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, Vinod Koul , NXP Linux Team , Pengutronix Kernel Team , angus.ainslie@puri.sm, linux-arm-kernel@lists.infradead.org, Lucas Stach MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Without the copy being aligned sdma1 fails ~10% of the time Signed-off-by: Angus Ainslie (Purism) --- drivers/dma/imx-sdma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index d2fae53be689..e7d4d8390813 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -2114,6 +2114,7 @@ static int sdma_probe(struct platform_device *pdev) sdma->dma_device.device_prep_dma_memcpy = sdma_prep_memcpy; sdma->dma_device.device_issue_pending = sdma_issue_pending; sdma->dma_device.dev->dma_parms = &sdma->dma_parms; + sdma->dma_device.copy_align = 2; dma_set_max_seg_size(sdma->dma_device.dev, SDMA_BD_MAX_CNT); platform_set_drvdata(pdev, sdma);