From patchwork Thu Oct 16 09:26:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: addy ke X-Patchwork-Id: 5089411 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A4119C11AD for ; Thu, 16 Oct 2014 09:26:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DDEB8201B9 for ; Thu, 16 Oct 2014 09:26:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1392C201CE for ; Thu, 16 Oct 2014 09:26:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751262AbaJPJ0Q (ORCPT ); Thu, 16 Oct 2014 05:26:16 -0400 Received: from regular1.263xmail.com ([211.150.99.134]:53912 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751199AbaJPJ0P (ORCPT ); Thu, 16 Oct 2014 05:26:15 -0400 Received: from addy.ke?rock-chips.com (unknown [192.168.167.227]) by regular1.263xmail.com (Postfix) with SMTP id 6EDBD5053; Thu, 16 Oct 2014 17:26:11 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from [172.16.7.74] (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id 7C2A43DE; Thu, 16 Oct 2014 17:26:07 +0800 (CST) X-RL-SENDER: addy.ke@rock-chips.com X-FST-TO: broonie@kernel.org X-SENDER-IP: 127.0.0.1 X-LOGIN-NAME: addy.ke@rock-chips.com X-UNIQUE-TAG: <2364c55f44b2dc9518b7f3908b103143> X-ATTACHMENT-NUM: 0 X-SENDER: kfx@rock-chips.com X-DNS-TYPE: 0 Received: from [172.16.7.74] (unknown [127.0.0.1]) by smtp.263.net (Postfix) whith ESMTP id 182927AD0EV; Thu, 16 Oct 2014 17:26:10 +0800 (CST) Message-ID: <543F8F2A.9040904@rock-chips.com> Date: Thu, 16 Oct 2014 17:26:02 +0800 From: addy ke User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: broonie@kernel.org CC: heiko@sntech.de, dianders@chromium.org, grant.likely@linaro.org, robh+dt@kernel.org, amstan@google.com, sonnyrao@google.com, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, olof@lixom.net, hj@rock-chips.com, kever.yang@rock-chips.com, xjq@rock-chips.com, huangtao@rock-chips.com, zyw@rock-chips.com, yzq@rock-chips.com, zhenfu.fang@rock-chips.com, cf@rock-chips.com, zhangqing@rock-chips.com, hl@rock-chips.com, wei.luo@rock-chips.com Subject: Re: [PATCH 2/2] spi/rockchip: fix bug that cause spi transfer timed out in DMA duplex mode References: <1413372311-4203-1-git-send-email-addy.ke@rock-chips.com> <1413372378-4309-1-git-send-email-addy.ke@rock-chips.com> <20141015130547.GE27755@sirena.org.uk> In-Reply-To: <20141015130547.GE27755@sirena.org.uk> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi, Mark The following changes is nessarry:(if tx complete, spi must be disabled too) Sorry for my mistake, I have not put these changes to this patch. Do I need send patch v2 or a new patch to fix this issure? On 2014/10/15 21:05, Mark Brown wrote: > On Wed, Oct 15, 2014 at 07:26:18PM +0800, Addy Ke wrote: >> In rx mode, dma must be prepared before spi is enabled. >> But in tx and tr mode, spi must be enabled first. > > Applied, thanks. > --- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 153269b..87bc16f 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -418,8 +418,10 @@ static void rockchip_spi_dma_txcb(void *data) spin_lock_irqsave(&rs->lock, flags); rs->state &= ~TXBUSY; - if (!(rs->state & RXBUSY)) + if (!(rs->state & RXBUSY)) { + spi_enable_chip(rs, 0); spi_finalize_current_transfer(rs->master); + } spin_unlock_irqrestore(&rs->lock, flags); }