From patchwork Mon Mar 27 04:34:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joy Chakraborty X-Patchwork-Id: 75203 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1271947vqo; Sun, 26 Mar 2023 21:48:55 -0700 (PDT) X-Google-Smtp-Source: AKy350bhBa4nflY3rV2oiNUFfM00Deg5u8/LG0LV5UR8sYDfs89ikOj1y7WBIpDLgHa/PrbaAo0t X-Received: by 2002:a17:906:2813:b0:93d:be9d:1432 with SMTP id r19-20020a170906281300b0093dbe9d1432mr11138552ejc.69.1679892535372; Sun, 26 Mar 2023 21:48:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679892535; cv=none; d=google.com; s=arc-20160816; b=JEFi0Z7dn4uz9hS1ceXRYDE4JTnonqB3y4ibl2dBsuyreArXjk2eFg62KWqQpPhXsG Dg0xqWH6u033YFibXzuiFLuR5mgzNUr+L1ltmqmYXJFq9QSFKpRcRyybm9jmU00oj00S HJzSynKPHc/AQ3nFqRYIe97WcHahYQmOKmum3LHMdnjtZxMmmliPv7Zh24DaOx+m/uxd vRSv2hepi/GDekDPybURkvJNLlJueAfq4WYqKMDJrJbiJ2HwWNc6x+grJTK1JTe+te5Z ilAv1rbaa2PeW1rjPf9vNp/UDBZPTliug2BICeklc/3gCXWmg4F9eM6vPV8eHDZ2Iqtl S0pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=sPVKlHs8rdxB8UK5BU2ADWdalnh8Q9IQfmw/DaMpLMc=; b=a04ko1l+1SSIB+lTHr2rS9DqqYcF1yGfjP6+BxEGfp2x+FmRUSB4oXelWV2giwUSKu vOcqonLFOUClleQA5hwsqJD1sEhkTdfaSJ4dcFm0/061UJm0Z0EE0EenkDLN87lRNdtI cAh0KAuwUtNq3XqVAyQd0CtEYSijNrERf4mjFSaNjl3Qh9dee2XjM6TtukZBVQZPJsAs 8W+9CUcUz/8rO8Rwqc6p1zXkBbfgzisI7JyuXCJq9IlPGDR94PtShPCJH4wNKvks87Oe hSpzhnL0YQNRZUiz8OUH3S+JePoEfBI1qjK4FLBBKjE3Tv9wM0tfqC2rG1zBXW8Ud4Ob mSQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=Hn0rFABF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a6-20020a170906190600b00931f8f04e64si25974569eje.840.2023.03.26.21.48.29; Sun, 26 Mar 2023 21:48:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=Hn0rFABF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232190AbjC0Eel (ORCPT + 99 others); Mon, 27 Mar 2023 00:34:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232186AbjC0Eej (ORCPT ); Mon, 27 Mar 2023 00:34:39 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F5CC4ECB for ; Sun, 26 Mar 2023 21:34:38 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-545e529206eso18391137b3.9 for ; Sun, 26 Mar 2023 21:34:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679891677; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=sPVKlHs8rdxB8UK5BU2ADWdalnh8Q9IQfmw/DaMpLMc=; b=Hn0rFABF3w227/orfbWGzUmPI0QrILbuKF4wmvZ1wwW31KwSk1UudgpTAnvdn8NDVw Bg3SAYFLkqHAyYO6DXbcqvBMQyaKa/gBDRp2MgrS+AVSE0w9/bXEBv299glKl0mh4f+A s1oKfbKa8KBvExwwWcrx/Yl8TEl8FKg4VekK6sSsDOFJlFvS+9dwRTFomCl8Dis17fp8 azxWvEk0dluGeI4guR8j7AwrZunEBHrkTATiAIWn1Wt6qHlM/wxddCsCjfzHjpD6Rrc+ c83vKqcUJz6ij//ltyzYO/+/JJRcCz9fBKpg2BADknUuAugmCTMFjvoVPdpwW/wk5U5o P6dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679891677; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sPVKlHs8rdxB8UK5BU2ADWdalnh8Q9IQfmw/DaMpLMc=; b=V+hJRRCee5e9ub+5OYb0hwcPPILZcwlO5ioI4sus32CLjyLbnkxsFvf402WLpfVDuV m8/p+HtL1oUoN5nkIhAXaT982DYOciEAvalRrx+sSUM5yRsgrCzX1/ZOpNtL7dXFD1nl Y0YvMu0vLQ9acNZgTuWKcN1e98d9m4rEoPW2ZASKQxnh83Z5Rpa1poZrtENlVGY7VQAX ucFQsGA81u0qzRIxsvWVMnuWpTtLJQdQUcmazDoaL45Ipwy0fOdXWWkPWVFA17YgNDd6 8WQyUDRKcHLTkvlMUSUjXzJrBIZA6UPMLarCqDc1l5OXsDxqDVOwTUvNFAyIJgxT9Bwq 3iBA== X-Gm-Message-State: AAQBX9dGv9zE4tSQuodnK951UI2uZmEJ9H7OOZ6TL5ojmIc/7yB7F/jP QGMyi1eDWpdSCnsGnj/xXrx2fBwRwptJNw== X-Received: from joychakr.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:6ea]) (user=joychakr job=sendgmr) by 2002:a05:6902:168d:b0:b26:47f3:6cb with SMTP id bx13-20020a056902168d00b00b2647f306cbmr4767786ybb.4.1679891677537; Sun, 26 Mar 2023 21:34:37 -0700 (PDT) Date: Mon, 27 Mar 2023 04:34:04 +0000 In-Reply-To: <20230327043405.881645-1-joychakr@google.com> Mime-Version: 1.0 References: <20230327043405.881645-1-joychakr@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Message-ID: <20230327043405.881645-2-joychakr@google.com> Subject: [PATCH v4 1/2] spi: dw: Add 32 bpw support to DW DMA Controller From: Joy Chakraborty To: Serge Semin , Mark Brown Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, manugautam@google.com, rohitner@google.com, Joy Chakraborty X-Spam-Status: No, score=-7.7 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761494995376025620?= X-GMAIL-MSGID: =?utf-8?q?1761494995376025620?= Add Support for AxSize = 4 bytes configuration from dw dma driver if n_bytes i.e. number of bytes per write to fifo is 3 or 4. Number of bytes written to fifo per write is depended on the bits/word configuration being used which the DW core driver translates to n_bytes. Signed-off-by: Joy Chakraborty --- drivers/spi/spi-dw-dma.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-dw-dma.c b/drivers/spi/spi-dw-dma.c index ababb910b391..b3a88bb75907 100644 --- a/drivers/spi/spi-dw-dma.c +++ b/drivers/spi/spi-dw-dma.c @@ -208,12 +208,17 @@ static bool dw_spi_can_dma(struct spi_controller *master, static enum dma_slave_buswidth dw_spi_dma_convert_width(u8 n_bytes) { - if (n_bytes == 1) + switch (n_bytes) { + case 1: return DMA_SLAVE_BUSWIDTH_1_BYTE; - else if (n_bytes == 2) + case 2: return DMA_SLAVE_BUSWIDTH_2_BYTES; - - return DMA_SLAVE_BUSWIDTH_UNDEFINED; + case 3: + case 4: + return DMA_SLAVE_BUSWIDTH_4_BYTES; + default: + return DMA_SLAVE_BUSWIDTH_UNDEFINED; + } } static int dw_spi_dma_wait(struct dw_spi *dws, unsigned int len, u32 speed) From patchwork Mon Mar 27 04:34:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joy Chakraborty X-Patchwork-Id: 75202 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1269595vqo; Sun, 26 Mar 2023 21:40:44 -0700 (PDT) X-Google-Smtp-Source: AK7set+0YI4hOqGZ+OT4N7iFjeK466nOfOLE4/UqcPlAkaYL32GY6fIw2/RFgkmNycnLPx7ms5M7 X-Received: by 2002:a05:6a20:8b14:b0:d6:97e8:c3ed with SMTP id l20-20020a056a208b1400b000d697e8c3edmr9972139pzh.14.1679892043847; Sun, 26 Mar 2023 21:40:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679892043; cv=none; d=google.com; s=arc-20160816; b=ZGTAUBYednXusk6qzDXGlCoA3l8aAA0d0iwLTZQNrPAI90z0EzHjtfxkb9g8OvQjBK v16uC87iwW/5xKtiQfH2PndGmRJYY3Sdon8JHA8Fw2Md2bobtuJh/ilephQ9giaPkkBR WaxQRUaig48YvWw9NfxrY1+gD/dWVVeMv94sfAF0elapTSgHvpmC3d0vyPZOpMx5IOtp 7hdakLJJBLrYrs2yuoZcAVyUCG1QhszhuBNuf+mljHfWj4iySpVqZ2U3vfEKDSnwhcqL P5vzWvwZ4GstXJ0V8VHnd34dAoexs+tm6TZ/0wObJAmpWraulBUXP/PaWBaPrJuLcbz6 ayYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=VG/HvUw/PP37KI/XKQFqpADZ9ObCJ4VT1NOEIFfNK/E=; b=c1hsZlznThcBYjHYWcfoX+FvJZh1eOANb+RL3cFpAm8bX8Mp50LfazYMRFq+pOq+Z5 UuJMWNIdF/Ws+WWzKSVf3ggiEXH/FAQizg/8gUMCWuA6zV2zPMwfv0zUYF/w/tGz9n49 VyeuUVlJ39YVewXfid9mBERmG7XAvdctWNIMyFp22wasxjDJBMIrg3J6hyfbqoGBReLT lY3C/ulNx1ybOvxA7mfvOprsm45qjsHuZBtxj6/5E00UwokzE1ACDT63kcrYuvYR8Uqo Sl79VCqtXarpo7jcVEdkRqH35VjqtgGJG8TSZMAiUT7wWCbhcwnP8U91zK4Q95apCsxk 6wAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=pM+LwhD3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f189-20020a6238c6000000b00627dd2b5307si9902083pfa.102.2023.03.26.21.40.30; Sun, 26 Mar 2023 21:40:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=pM+LwhD3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232206AbjC0Eet (ORCPT + 99 others); Mon, 27 Mar 2023 00:34:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232202AbjC0Eeq (ORCPT ); Mon, 27 Mar 2023 00:34:46 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0E3C4EE5 for ; Sun, 26 Mar 2023 21:34:42 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id j11-20020a25230b000000b00b6871c296bdso7511306ybj.5 for ; Sun, 26 Mar 2023 21:34:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679891682; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=VG/HvUw/PP37KI/XKQFqpADZ9ObCJ4VT1NOEIFfNK/E=; b=pM+LwhD3ggqo9bgMbnbO9Yva/UyIsOxTmO21qvA6luLZ6U2cgzwdZFLYFPgSHPVlUQ tsdfgUYVKJE95VuIUqaj8h2J+aj214dZiWkLtqjImSFPcAio5QdK7+D6jrNM8QiZ7AVh c38ix9D/3Vc6ysQ06X5/iwmWDywPlItycIrdBPaFUNNl5HNp7nbV3aYr+bvIeSmYXhh2 qN6m+DKRIbV2489BIVWmJ8Mz4DtpGREiw6qlBpbtDrSzhKhbyigs2sezKJby13iI6GnL HdQCaOD2J4ppt4j4zMlcIf/NsAlz6OdNsrW8bNBbJ73BVKrhA7z7TBJnyG8uQ5p+pfpp CjFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679891682; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VG/HvUw/PP37KI/XKQFqpADZ9ObCJ4VT1NOEIFfNK/E=; b=2dKCe+2Qi4i9uIu/vy7+X5CQUqt33oOF4vd9ePJgnLi+Orhof2ITpIBtUOT4iKh7/d n0WdKVgc0IBe7ayiKk2YPnvX6nk3nsWxwl4eiW48mVJFAxcj8WXHjbe2XNS4XBdl1jrt VLda2LGEggq8znSKtqz8uUW4HesCqrvLRBFKvcZRro/1j5mePy7xbjhWgwIEBSyitbze TVy9wM+mFIJp/Skatff3/ET9uZArXKFMgRROpM//r3xEVc0FUOJrSZgKcgo3r0JR2bQJ iXWwPSjTfZ9kSOBd7xfbLZ9n/8nuOWE8HBKLBN+Bzex6GWHQTbTq4evoCvGFeDUcgFs8 6KKw== X-Gm-Message-State: AAQBX9cEovQbdgp304IBu1tRDEntYBut/ohfESe920y0Gt3YiU2idArI rdzaN60R36KMhDj7+MKG5SpObiDfQ4Eayw== X-Received: from joychakr.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:6ea]) (user=joychakr job=sendgmr) by 2002:a05:6902:168d:b0:b26:47f3:6cb with SMTP id bx13-20020a056902168d00b00b2647f306cbmr4767865ybb.4.1679891681999; Sun, 26 Mar 2023 21:34:41 -0700 (PDT) Date: Mon, 27 Mar 2023 04:34:05 +0000 In-Reply-To: <20230327043405.881645-1-joychakr@google.com> Mime-Version: 1.0 References: <20230327043405.881645-1-joychakr@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Message-ID: <20230327043405.881645-3-joychakr@google.com> Subject: [PATCH v4 2/2] spi: dw: Add dma controller capability checks From: Joy Chakraborty To: Serge Semin , Mark Brown Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, manugautam@google.com, rohitner@google.com, Joy Chakraborty X-Spam-Status: No, score=-7.7 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1761494479990363166?= X-GMAIL-MSGID: =?utf-8?q?1761494479990363166?= Check capabilities of DMA controller during init to make sure it is capable of handling MEM2DEV for tx channel, DEV2MEM for rx channel and store addr_width capabilities to check per transfer to make sure the bits/word requirement can be met for that transfer. Signed-off-by: Joy Chakraborty --- drivers/spi/spi-dw-dma.c | 54 ++++++++++++++++++++++++++++++++-------- drivers/spi/spi-dw.h | 1 + 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/drivers/spi/spi-dw-dma.c b/drivers/spi/spi-dw-dma.c index b3a88bb75907..f47483ec369f 100644 --- a/drivers/spi/spi-dw-dma.c +++ b/drivers/spi/spi-dw-dma.c @@ -23,6 +23,8 @@ #define DW_SPI_TX_BUSY 1 #define DW_SPI_TX_BURST_LEVEL 16 +static enum dma_slave_buswidth dw_spi_dma_convert_width(u8 n_bytes); + static bool dw_spi_dma_chan_filter(struct dma_chan *chan, void *param) { struct dw_dma_slave *s = param; @@ -72,12 +74,15 @@ static void dw_spi_dma_maxburst_init(struct dw_spi *dws) dw_writel(dws, DW_SPI_DMATDLR, dws->txburst); } -static void dw_spi_dma_sg_burst_init(struct dw_spi *dws) +static int dw_spi_dma_caps_init(struct dw_spi *dws) { + int ret; struct dma_slave_caps tx = {0}, rx = {0}; - dma_get_slave_caps(dws->txchan, &tx); - dma_get_slave_caps(dws->rxchan, &rx); + ret = dma_get_slave_caps(dws->txchan, &tx); + ret |= dma_get_slave_caps(dws->rxchan, &rx); + if (ret) + return ret; if (tx.max_sg_burst > 0 && rx.max_sg_burst > 0) dws->dma_sg_burst = min(tx.max_sg_burst, rx.max_sg_burst); @@ -87,6 +92,18 @@ static void dw_spi_dma_sg_burst_init(struct dw_spi *dws) dws->dma_sg_burst = rx.max_sg_burst; else dws->dma_sg_burst = 0; + + /* + * Assuming both channels belong to the same DMA controller hence the + * address width capabilities most likely would be the same. + */ + dws->dma_addr_widths = tx.dst_addr_widths & rx.src_addr_widths; + + if (!(tx.directions & BIT(DMA_MEM_TO_DEV) && + rx.directions & BIT(DMA_DEV_TO_MEM))) + return -ENXIO; + + return 0; } static int dw_spi_dma_init_mfld(struct device *dev, struct dw_spi *dws) @@ -95,6 +112,7 @@ static int dw_spi_dma_init_mfld(struct device *dev, struct dw_spi *dws) struct dw_dma_slave dma_rx = { .src_id = 0 }, *rx = &dma_rx; struct pci_dev *dma_dev; dma_cap_mask_t mask; + int ret = -EBUSY; /* * Get pci device for DMA controller, currently it could only @@ -124,20 +142,24 @@ static int dw_spi_dma_init_mfld(struct device *dev, struct dw_spi *dws) init_completion(&dws->dma_completion); - dw_spi_dma_maxburst_init(dws); + ret = dw_spi_dma_caps_init(dws); + if (ret) + goto free_txchan; - dw_spi_dma_sg_burst_init(dws); + dw_spi_dma_maxburst_init(dws); pci_dev_put(dma_dev); return 0; - +free_txchan: + dma_release_channel(dws->txchan); + dws->txchan = NULL; free_rxchan: dma_release_channel(dws->rxchan); dws->rxchan = NULL; err_exit: pci_dev_put(dma_dev); - return -EBUSY; + return ret; } static int dw_spi_dma_init_generic(struct device *dev, struct dw_spi *dws) @@ -163,12 +185,16 @@ static int dw_spi_dma_init_generic(struct device *dev, struct dw_spi *dws) init_completion(&dws->dma_completion); - dw_spi_dma_maxburst_init(dws); + ret = dw_spi_dma_caps_init(dws); + if (ret) + goto free_txchan; - dw_spi_dma_sg_burst_init(dws); + dw_spi_dma_maxburst_init(dws); return 0; - +free_txchan: + dma_release_channel(dws->txchan); + dws->txchan = NULL; free_rxchan: dma_release_channel(dws->rxchan); dws->rxchan = NULL; @@ -202,8 +228,14 @@ static bool dw_spi_can_dma(struct spi_controller *master, struct spi_device *spi, struct spi_transfer *xfer) { struct dw_spi *dws = spi_controller_get_devdata(master); + enum dma_slave_buswidth dma_bus_width; + + if (xfer->len <= dws->fifo_len) + return false; + + dma_bus_width = dw_spi_dma_convert_width(dws->n_bytes); - return xfer->len > dws->fifo_len; + return dws->dma_addr_widths & BIT(dma_bus_width); } static enum dma_slave_buswidth dw_spi_dma_convert_width(u8 n_bytes) diff --git a/drivers/spi/spi-dw.h b/drivers/spi/spi-dw.h index 9e8eb2b52d5c..3962e6dcf880 100644 --- a/drivers/spi/spi-dw.h +++ b/drivers/spi/spi-dw.h @@ -190,6 +190,7 @@ struct dw_spi { struct dma_chan *rxchan; u32 rxburst; u32 dma_sg_burst; + u32 dma_addr_widths; unsigned long dma_chan_busy; dma_addr_t dma_addr; /* phy address of the Data register */ const struct dw_spi_dma_ops *dma_ops;