From patchwork Wed Oct 11 14:01:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9999735 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 831DA603B5 for ; Wed, 11 Oct 2017 14:02:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 765A828A51 for ; Wed, 11 Oct 2017 14:02:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AEFA28A53; Wed, 11 Oct 2017 14:02:26 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 12D5128A52 for ; Wed, 11 Oct 2017 14:02:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752187AbdJKOCZ (ORCPT ); Wed, 11 Oct 2017 10:02:25 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:52604 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751691AbdJKOCY (ORCPT ); Wed, 11 Oct 2017 10:02:24 -0400 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0MdFJL-1dkTqT1gdn-00ITsr; Wed, 11 Oct 2017 16:01:46 +0200 From: Arnd Bergmann To: Vinod Koul , Maxime Coquelin , Alexandre Torgue Cc: Arnd Bergmann , Dan Williams , Pierre-Yves MORDRET , "M'boumba Cedric Madianga" , dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] dmaengine: stm32-mdma: avoid 64-bit division Date: Wed, 11 Oct 2017 16:01:31 +0200 Message-Id: <20171011140144.3746128-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:gDAi/RaQsC3OYHAkfz/saLOAqPN3QbyeWv37uk63+CoGO7FGYja d+wl4nqePiK7Hwt8iGdZbXR7UkaYqMXCXvV//NS7yZlRnIorx2Xer/T25R5+lCgFDNOYsM7 GCDoTPsZUdMNjjKaadwUwYcWw/4Ib1CJuay8F/yB1YvGg71U8ZjjpgoMVauJ2lIzOnpm3/0 vJUre0igmbzRcpqussUZg== X-UI-Out-Filterresults: notjunk:1; V01:K0:1BNQkuC0Lhg=:b8ubLJGQ1k899CwlvMnltW nPCZXlCKs8mDlHdQhcEDueVSXxNA+7APXECE8pSpiDVtIIGvqI+qRpQWClWqYA/hzoyazrKkb C8EaQN3jS87WcD8mE6+dkVgmKelFebk0cp8HjT7ODmL+we35QMklKBWqH6nGB6tQtQCIIPVq+ jVKNv3PRcy0WdFr4A4zOgHCJZVumVOoq6c4OZfQ0QpAZLch81cUqKGHfEtkOVaO1ery5k1uh3 rmUehEu8kthJyzLti85n06a2wRJgLGlWObFuWF6y9dE0Cq3N1dbuVVOCWpfuvj9KZo8pNOqLq eoweYh31fcr6eh5sNLURC/MA5PRcNalB9qTPdWDXSNqawfz+idUqKn+xXspf+CxnQ9Cpfu0Ms CJPBOmj11dLzlhaZE8VWOwk9LNnzeuYqfI0LYmTrYY0f4/vib2/7JeX3FI+ulGoi9Gyi7NJ+W KiZ9EOapa0NRDzkKU9jOZEGxpkPZT9tUW0OTGn0eq6cjVW15ye8Qk6QDfOj0jjysblUdV0DfV 4m/LhNw+vMhKURyZPPmX4fk2ZxTEQbBJ+ddk+DgyzThcCQKYcoZdjJTK0va7gPP7AcIIpw7Os IdUjjoBGAdFDtkfXCbS1VlKFTYUwKn9gt9EOxqvr0x2oi0ppy/cvmpzCvVZAV6hv9BcGnav2s uL7H+QTVRLuiOyRycD5z1B1ltRRnMSB6MWlGl8Bvmx47Mw1/HTYNSVSBhI+/+vARnurLh7MuA ogXLOUyuZBMWeeQA2Vnu7LYNgo7VYqgMb2Rycw== Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When building with a 64-bit dma_addr_t, we run into a link error: drivers/dma/stm32-mdma.o: In function `stm32_mdma_prep_dma_memcpy': stm32-mdma.c:(.text+0x16a3): undefined reference to `__umoddi3' Using a 64-bit division here is way too expensive, since the divisor is a known power-of-two value in reality. This moves the modulo operation into stm32_mdma_get_max_width(), where the compiler can optimize out that code, and we can use a 32-bit division to be on the safe side. Fixes: a4ffb13c8946 ("dmaengine: Add STM32 MDMA driver") Signed-off-by: Arnd Bergmann --- drivers/dma/stm32-mdma.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/dma/stm32-mdma.c b/drivers/dma/stm32-mdma.c index 0db59a7e80e0..55151c2c9fae 100644 --- a/drivers/dma/stm32-mdma.c +++ b/drivers/dma/stm32-mdma.c @@ -387,7 +387,9 @@ static int stm32_mdma_get_width(struct stm32_mdma_chan *chan, } } -static enum dma_slave_buswidth stm32_mdma_get_max_width(u32 buf_len, u32 tlen) +static enum dma_slave_buswidth stm32_mdma_get_max_width(u32 buf_len, + u32 addr, + u32 tlen) { enum dma_slave_buswidth max_width = DMA_SLAVE_BUSWIDTH_8_BYTES; @@ -398,6 +400,9 @@ static enum dma_slave_buswidth stm32_mdma_get_max_width(u32 buf_len, u32 tlen) break; } + if (addr % max_width) + max_width = DMA_SLAVE_BUSWIDTH_1_BYTE; + return max_width; } @@ -567,7 +572,7 @@ static int stm32_mdma_set_xfer_param(struct stm32_mdma_chan *chan, ctcr |= STM32_MDMA_CTCR_DBURST((ilog2(dst_best_burst))); /* Set memory data size */ - src_addr_width = stm32_mdma_get_max_width(buf_len, tlen); + src_addr_width = stm32_mdma_get_max_width(buf_len, 0, tlen); chan->mem_width = src_addr_width; src_bus_width = stm32_mdma_get_width(chan, src_addr_width); if (src_bus_width < 0) @@ -611,7 +616,7 @@ static int stm32_mdma_set_xfer_param(struct stm32_mdma_chan *chan, ctcr |= STM32_MDMA_CTCR_SBURST((ilog2(src_best_burst))); /* Set memory data size */ - dst_addr_width = stm32_mdma_get_max_width(buf_len, tlen); + dst_addr_width = stm32_mdma_get_max_width(buf_len, 0, tlen); chan->mem_width = dst_addr_width; dst_bus_width = stm32_mdma_get_width(chan, dst_addr_width); if (dst_bus_width < 0) @@ -956,9 +961,7 @@ stm32_mdma_prep_dma_memcpy(struct dma_chan *c, dma_addr_t dest, dma_addr_t src, ctcr |= STM32_MDMA_CTCR_TLEN((tlen - 1)); /* Set source best burst size */ - max_width = stm32_mdma_get_max_width(len, tlen); - if (src % max_width) - max_width = DMA_SLAVE_BUSWIDTH_1_BYTE; + max_width = stm32_mdma_get_max_width(len, src, tlen); src_bus_width = stm32_mdma_get_width(chan, max_width); max_burst = tlen / max_width; @@ -971,9 +974,7 @@ stm32_mdma_prep_dma_memcpy(struct dma_chan *c, dma_addr_t dest, dma_addr_t src, STM32_MDMA_CTCR_SINCOS(src_bus_width); /* Set destination best burst size */ - max_width = stm32_mdma_get_max_width(len, tlen); - if (dest % max_width) - max_width = DMA_SLAVE_BUSWIDTH_1_BYTE; + max_width = stm32_mdma_get_max_width(len, dest, tlen); dst_bus_width = stm32_mdma_get_width(chan, max_width); max_burst = tlen / max_width; @@ -1014,9 +1015,7 @@ stm32_mdma_prep_dma_memcpy(struct dma_chan *c, dma_addr_t dest, dma_addr_t src, STM32_MDMA_MAX_BLOCK_LEN); /* Set source best burst size */ - max_width = stm32_mdma_get_max_width(len, tlen); - if (src % max_width) - max_width = DMA_SLAVE_BUSWIDTH_1_BYTE; + max_width = stm32_mdma_get_max_width(len, src, tlen); src_bus_width = stm32_mdma_get_width(chan, max_width); max_burst = tlen / max_width; @@ -1030,9 +1029,7 @@ stm32_mdma_prep_dma_memcpy(struct dma_chan *c, dma_addr_t dest, dma_addr_t src, STM32_MDMA_CTCR_SINCOS(src_bus_width); /* Set destination best burst size */ - max_width = stm32_mdma_get_max_width(len, tlen); - if (dest % max_width) - max_width = DMA_SLAVE_BUSWIDTH_1_BYTE; + max_width = stm32_mdma_get_max_width(len, dest, tlen); dst_bus_width = stm32_mdma_get_width(chan, max_width); max_burst = tlen / max_width;