From patchwork Wed Jun 8 07:32:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomeu Vizoso X-Patchwork-Id: 104874 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp2352810qgf; Wed, 8 Jun 2016 00:33:30 -0700 (PDT) X-Received: by 10.36.29.146 with SMTP id 140mr79642itj.74.1465371209994; Wed, 08 Jun 2016 00:33:29 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t10si4557663pat.178.2016.06.08.00.33.29; Wed, 08 Jun 2016 00:33:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754175AbcFHHdV (ORCPT + 31 others); Wed, 8 Jun 2016 03:33:21 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:34944 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752832AbcFHHdS (ORCPT ); Wed, 8 Jun 2016 03:33:18 -0400 Received: by mail-wm0-f68.google.com with SMTP id k184so636840wme.2; Wed, 08 Jun 2016 00:33:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=85eBWMFoG3mD/zP87hftNHYlCl1/SwU36jcBTcYe9C8=; b=o3vjXqZvysc1Agg/lB12YPXxpmBcH5Cy2JtXM8nFE07DRPyM4f6aY30RYTuC78cBlW 1+wcYF2N+pYvj/BeTjvshYZ84W5cpllOgVvOn1FV8uCdb5eXPo5R0/c/DlrH4g5vX5ua Xkw9T9i7W2tcf4pJO8NnH7KYF+QLpjkfS60kuYj+T55SAyNXILPFAhjstFLa1Tqy7U6N ED8tyVRMF4QMiSYx6inJ45cuuoiQSVcNeguB22J78kwpt3MkDwFkgQrixfeT8tgENLY2 bAq8nlsHZNNfUihW5ggno5v/JuHaWXhlyH0yRv7M4gwAJgVCtEwhNStKDM4oP/sYcDxH 2WyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=85eBWMFoG3mD/zP87hftNHYlCl1/SwU36jcBTcYe9C8=; b=iKR7gsWM168fzJk51wOimmjnQXDcsoW91mA9QPK4ojekmAV5VmWTGquAJY8tPrga41 LancAyWPLyMDeWE+Q5JQZQC3gfBljBDCFuJOQ9HYSfxfP1xIYTUNrjxNk638UJP/VWnt f9ax9L6lqa3sFXhMvZX/EGtL1eBEJC2SLI/VsqgNTs3oMdl9pgWbaVCIw68qnk/q4WwB rnH7s53gL+GEKiC0W+O/c32qM/cRL5fM4QKS2f4RmecsGvsNA3KauqtnJlKHzJpRSLbm bHdBMwk7plkAS/0Z/dEPnCeX+EOIk7VqLTQj0bjEjb2g3bvymEqPFhyLrMte5ZKSLXWq WWiw== X-Gm-Message-State: ALyK8tJfvKM2TR5gBc2oTCJyTVC/LBP1qdbk6P9lNqo7N8kp+BoiDwrIGgRFZ0YikePEBg== X-Received: by 10.194.175.36 with SMTP id bx4mr2919748wjc.35.1465371196839; Wed, 08 Jun 2016 00:33:16 -0700 (PDT) Received: from cizrna.lan ([109.72.12.252]) by smtp.gmail.com with ESMTPSA id a128sm23253606wme.16.2016.06.08.00.33.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Jun 2016 00:33:15 -0700 (PDT) From: Tomeu Vizoso To: linux-kernel@vger.kernel.org Cc: Tomeu Vizoso , Shawn Lin , Heiko Stuebner , Javier Martinez Canillas , Mark Brown , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org Subject: [PATCH] spi: rockchip: Signal unfinished DMA transfers Date: Wed, 8 Jun 2016 09:32:51 +0200 Message-Id: <1465371171-20810-1-git-send-email-tomeu.vizoso@collabora.com> X-Mailer: git-send-email 2.5.5 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When using DMA, the transfer_one callback should return 1 because the transfer hasn't finished yet. A previous commit changed the function to return 0 when the DMA channels were correctly prepared. This manifested in Veyron boards with this message: [ 1.983605] cros-ec-spi spi0.0: EC failed to respond in time Signed-off-by: Tomeu Vizoso Fixes: ea9849113343 ("spi: rockchip: check return value of dmaengine_prep_slave_sg") Cc: Shawn Lin Cc: Heiko Stuebner Cc: Javier Martinez Canillas --- drivers/spi/spi-rockchip.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.5.5 diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index cd89682065b9..1026e180eed7 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -578,7 +578,7 @@ static int rockchip_spi_transfer_one( struct spi_device *spi, struct spi_transfer *xfer) { - int ret = 1; + int ret = 0; struct rockchip_spi *rs = spi_master_get_devdata(master); WARN_ON(readl_relaxed(rs->regs + ROCKCHIP_SPI_SSIENR) && @@ -627,6 +627,8 @@ static int rockchip_spi_transfer_one( spi_enable_chip(rs, 1); ret = rockchip_spi_prepare_dma(rs); } + /* successful DMA prepare means the transfer is in progress */ + ret = ret ? ret : 1; } else { spi_enable_chip(rs, 1); ret = rockchip_spi_pio_transfer(rs);