From patchwork Fri Nov 16 00:39:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10685345 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BA91117EE for ; Fri, 16 Nov 2018 00:39:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC2602D3EC for ; Fri, 16 Nov 2018 00:39:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A01872D3EA; Fri, 16 Nov 2018 00:39:48 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 3CAD32D3EA for ; Fri, 16 Nov 2018 00:39:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389094AbeKPKt6 (ORCPT ); Fri, 16 Nov 2018 05:49:58 -0500 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:40856 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726360AbeKPKt6 (ORCPT ); Fri, 16 Nov 2018 05:49:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=Jbd1w4nJrJtDKS8rjSnZehJ/q7JW1gmsJY2MK7so928=; b=JzNoNOBkJUWw wyU5bb9rk69+M5XqNW07LoVKxs0mDeF0zvwzOpgv+bVHvbEd/qJz8Hergv0OQaM8J8c7ON9ykae+q wHze0Y1oI2jfVvOJAwHKK7FXrzvZu9VdHzkh7/fAWNYGMDCzjwbBzQ8EVDfN8K5mPXrqNDKe+ZrKL CyivQ=; Received: from [64.114.255.97] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gNSAg-0006i7-QK; Fri, 16 Nov 2018 00:39:42 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id 2BAB6440079; Fri, 16 Nov 2018 00:39:38 +0000 (GMT) From: Mark Brown To: Mark Brown Cc: Tony Lindgren , Tony Lindgren , Tony Lindgren , Lubomir Rintel , linux-spi@vger.kernel.org, Pavel Machek , Geert Uytterhoeven , linux-spi@vger.kernel.org Subject: Applied "spi: Fix core transfer waits after slave support" to the spi tree In-Reply-To: <20181116001435.20465-1-broonie@kernel.org> Message-Id: <20181116003938.2BAB6440079@finisterre.ee.mobilebroadband> Date: Fri, 16 Nov 2018 00:39:38 +0000 (GMT) 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 The patch spi: Fix core transfer waits after slave support has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From d57e79601bc587f140a9bbb102493ad86f648ae0 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 15 Nov 2018 16:08:32 -0800 Subject: [PATCH] spi: Fix core transfer waits after slave support The refactoring done as part of adding the core support for handling waiting for slave transfer dropped a conditional which meant that we started waiting for completion of all transfers, not just those that the controller asked for. This caused hangs and massive delays on platforms that don't need the core delay. Re-add the delay to fix this. Fixes: 810923f3bf06c11 (spi: Deal with slaves that return from transfer_one() unfinished) Reported-by: Tony Lindgren Tested-by: Tony Lindgren Signed-off-by: Mark Brown --- drivers/spi/spi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 498d3b9bf3ae..430ad637c643 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1114,9 +1114,11 @@ static int spi_transfer_one_message(struct spi_controller *ctlr, goto out; } - ret = spi_transfer_wait(ctlr, msg, xfer); - if (ret < 0) - msg->status = ret; + if (ret > 0) { + ret = spi_transfer_wait(ctlr, msg, xfer); + if (ret < 0) + msg->status = ret; + } } else { if (xfer->len) dev_err(&msg->spi->dev,