From patchwork Thu Mar 29 18:59:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Suloev X-Patchwork-Id: 10316059 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 DA9FA60353 for ; Thu, 29 Mar 2018 18:59:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9DEE28409 for ; Thu, 29 Mar 2018 18:59:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD45E2A16D; Thu, 29 Mar 2018 18:59:40 +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_SIGNED, 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 3E20928409 for ; Thu, 29 Mar 2018 18:59:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751164AbeC2S7j (ORCPT ); Thu, 29 Mar 2018 14:59:39 -0400 Received: from fallback7.mail.ru ([94.100.181.128]:50154 "EHLO fallback.mail.ru" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751096AbeC2S7i (ORCPT ); Thu, 29 Mar 2018 14:59:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=orpaltech.com; s=mailru; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=rYgrFchEeott97N1b2w/sRT0dJKPvG0d5l3HmUZDmp0=; b=eM/JzneeN7wlc7CSpA6abQR4XEKHtJ1fV08N0fv50CkrxSrYy/a8FTG75dnOkK6o7xX8tN2CkikxUted/MR0FvrfLCkgNZer0fcF5176GGvT+ubaMsrNksgvMbmf3Kmap1aSblGU1BpZHislxXUSpKt79zeIG0x7mTQwyLzIsYE=; Received: from [10.161.25.37] (port=43896 helo=smtp60.i.mail.ru) by fallback7.mail.ru with esmtp (envelope-from ) id 1f1clq-0000j7-Eq; Thu, 29 Mar 2018 21:59:34 +0300 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=orpaltech.com; s=mailru; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=rYgrFchEeott97N1b2w/sRT0dJKPvG0d5l3HmUZDmp0=; b=eM/JzneeN7wlc7CSpA6abQR4XEKHtJ1fV08N0fv50CkrxSrYy/a8FTG75dnOkK6o7xX8tN2CkikxUted/MR0FvrfLCkgNZer0fcF5176GGvT+ubaMsrNksgvMbmf3Kmap1aSblGU1BpZHislxXUSpKt79zeIG0x7mTQwyLzIsYE=; Received: by smtp60.i.mail.ru with esmtpa (envelope-from ) id 1f1clZ-0005P6-Dc; Thu, 29 Mar 2018 21:59:18 +0300 From: Sergey Suloev To: Mark Brown , Maxime Ripard , Chen-Yu Tsai Cc: linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sergey Suloev Subject: [PATCH 1/6] spi: core: handle timeout error from transfer_one() Date: Thu, 29 Mar 2018 21:59:02 +0300 Message-Id: <20180329185907.27281-2-ssuloev@orpaltech.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180329185907.27281-1-ssuloev@orpaltech.com> References: <20180329185907.27281-1-ssuloev@orpaltech.com> X-7FA49CB5: 0D63561A33F958A580B087001892C764A67B693F76D0AEE7805F6469B87D5BC0725E5C173C3A84C37C6C241D99759064AE0A0621C6B81FEB3946EFC6A664F553C4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0F05F538519369F3743B503F486389A921A5CC5B56E945C8DA X-Mailru-Sender: C5364AD02485212F3ACDC11E67D84917DA9421E42869FF8C6A3CB6A274E9D547069BFC61DABEEB110841D3AAAB1726C63DDE9B364B0DF289264D2CD8C2503E8C22A194DADEED8EEDCA01A23BA9CD1BE7ED14614B50AE0675 X-Mras: OK X-Mras: OK 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 As long as sun4i/sun6i SPI drivers have overriden the default "wait for completion" procedure then we need to properly handle -ETIMEDOUT error from transfer_one(). Signed-off-by: Sergey Suloev --- drivers/spi/spi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index b33a727..2dcd4f6 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1028,7 +1028,7 @@ static int spi_transfer_one_message(struct spi_controller *ctlr, reinit_completion(&ctlr->xfer_completion); ret = ctlr->transfer_one(ctlr, msg->spi, xfer); - if (ret < 0) { + if (ret < 0 && ret != -ETIMEDOUT) { SPI_STATISTICS_INCREMENT_FIELD(statm, errors); SPI_STATISTICS_INCREMENT_FIELD(stats, @@ -1051,7 +1051,7 @@ static int spi_transfer_one_message(struct spi_controller *ctlr, msecs_to_jiffies(ms)); } - if (ms == 0) { + if (ms == 0 || ret == -ETIMEDOUT) { SPI_STATISTICS_INCREMENT_FIELD(statm, timedout); SPI_STATISTICS_INCREMENT_FIELD(stats, @@ -1059,6 +1059,7 @@ static int spi_transfer_one_message(struct spi_controller *ctlr, dev_err(&msg->spi->dev, "SPI transfer timed out\n"); msg->status = -ETIMEDOUT; + ret = 0; } } else { if (xfer->len)