From patchwork Mon Nov 21 05:54:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sanchayan X-Patchwork-Id: 9438775 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 3D96B600BA for ; Mon, 21 Nov 2016 06:03:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C94E28984 for ; Mon, 21 Nov 2016 06:03:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2048F2898B; Mon, 21 Nov 2016 06:03:14 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham 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 504BA28984 for ; Mon, 21 Nov 2016 06:03:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751758AbcKUGDM (ORCPT ); Mon, 21 Nov 2016 01:03:12 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:33888 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751214AbcKUGDL (ORCPT ); Mon, 21 Nov 2016 01:03:11 -0500 Received: by mail-pg0-f65.google.com with SMTP id e9so27186499pgc.1; Sun, 20 Nov 2016 22:03:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=mh0ZJcnWFtL2r5nylH1KP3RJTNHNZ+1/E1yzVZGVYy8=; b=qq/Bit0PrNR3DC5DKptTj5r8nSjwg3/jXk6K6EEaKIjPU+6H4Fs34Gtbl0qvAFwqQz MSgB8hucn0W9nEM8zdS3Kli/NUBAnSz6gBzzNvrVYYWIdpenZpcOlKy3KRBf6vaVg07c 3IfOwCvCTqDw/YxhbWDwXo1WSSa0hkheaAy6bZau1GgaVoRJ4znq6h3bDP6pJoUrG9Ce VbsSnwO2823Z0CFCi7iL+VILVJ/vbak2cegYKaD2eZoDcsZwHA6Ak/C5eSAiSN+YLMhC MO2lTf0xzeexMJIFef+3msJlI9tWE4OtYFaB/yFD1dg27nLW9g4yiSai0EZpVmuJUXGu Q4qw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=mh0ZJcnWFtL2r5nylH1KP3RJTNHNZ+1/E1yzVZGVYy8=; b=AT3uOTQCgLXG5iHeotmJ+pS6pI6921U2KWqJxNu6fO8/E+ScVYW5r2e+k0Y63yBX2C cHKP/N33MpmJi8kBlX1wotIFNTYSW8c4Q/KyUmqveNgxT/rGMARghz7ZmNpPe8H/7wb+ /y6GOb+POQmOXugSPRISjAKVY0AumvZc3NlRMGMC9pS35Z4t8pYfytu/dY1KgdkAXnQI JBspiRaHWd6vw21TyicW3g+njEPE2ibz8j/tJ+EB2jmsbxA+V9BAXs6AD4oT3jQlbqdB oqWhIAWVTkOoDLOEFtTkM/N8t7zUxc5DV1yN4s+X9bodBq4clYqz1TrgPFgZGeBgwUNc KQrg== X-Gm-Message-State: AKaTC03V6wip1roJa4zdVnpNe643PZH5e5Tl+R069y0esrTSkhfVwd6rtVYo90oPVJfDAw== X-Received: by 10.99.116.92 with SMTP id e28mr28178203pgn.162.1479708190627; Sun, 20 Nov 2016 22:03:10 -0800 (PST) Received: from localhost ([115.115.243.34]) by smtp.gmail.com with ESMTPSA id b80sm34036470pfe.52.2016.11.20.22.03.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 20 Nov 2016 22:03:10 -0800 (PST) From: Sanchayan Maity To: broonie@kernel.org Cc: stefan@agner.ch, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, Sanchayan Maity Subject: [PATCH v2 1/4] spi: spi-fsl-dspi: Fix SPI transfer issue when using multiple SPI_IOC_MESSAGE Date: Mon, 21 Nov 2016 11:24:01 +0530 Message-Id: X-Mailer: git-send-email 2.10.2 In-Reply-To: References: In-Reply-To: References: Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Current DMA implementation had a bug where the DMA transfer would exit the loop in dspi_transfer_one_message after the completion of a single transfer. This results in a multi message transfer submitted with SPI_IOC_MESSAGE to terminate incorrectly without an error. Signed-off-by: Sanchayan Maity Reviewed-by: Stefan Agner --- drivers/spi/spi-fsl-dspi.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index bc64700..b1ee1f5 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -714,7 +714,7 @@ static int dspi_transfer_one_message(struct spi_master *master, SPI_RSER_TFFFE | SPI_RSER_TFFFD | SPI_RSER_RFDFE | SPI_RSER_RFDFD); status = dspi_dma_xfer(dspi); - goto out; + break; default: dev_err(&dspi->pdev->dev, "unsupported trans_mode %u\n", trans_mode); @@ -722,9 +722,13 @@ static int dspi_transfer_one_message(struct spi_master *master, goto out; } - if (wait_event_interruptible(dspi->waitq, dspi->waitflags)) - dev_err(&dspi->pdev->dev, "wait transfer complete fail!\n"); - dspi->waitflags = 0; + if (trans_mode != DSPI_DMA_MODE) { + if (wait_event_interruptible(dspi->waitq, + dspi->waitflags)) + dev_err(&dspi->pdev->dev, + "wait transfer complete fail!\n"); + dspi->waitflags = 0; + } if (transfer->delay_usecs) udelay(transfer->delay_usecs);