From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6CA0C43441 for ; Fri, 16 Nov 2018 00:07:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF17C208A3 for ; Fri, 16 Nov 2018 00:07:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AF17C208A3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=atomide.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727237AbeKPKRQ (ORCPT ); Fri, 16 Nov 2018 05:17:16 -0500 Received: from muru.com ([72.249.23.125]:54214 "EHLO muru.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726352AbeKPKRQ (ORCPT ); Fri, 16 Nov 2018 05:17:16 -0500 Received: from atomide.com (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTPS id B406F8107; Fri, 16 Nov 2018 00:07:12 +0000 (UTC) Date: Thu, 15 Nov 2018 16:07:09 -0800 From: Tony Lindgren To: Mark Brown Cc: Lubomir Rintel , Geert Uytterhoeven , Pavel Machek , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Subject: Re: Regression in next with spi return from transfer_one() Message-ID: <20181116000709.GK53235@atomide.com> References: <20181115211451.GH53235@atomide.com> <20181115221241.GQ2089@sirena.org.uk> <20181115234359.GJ53235@atomide.com> <20181116000154.GS2089@sirena.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181116000154.GS2089@sirena.org.uk> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Mark Brown [181116 00:02]: > On Thu, Nov 15, 2018 at 03:44:00PM -0800, Tony Lindgren wrote: > > > It seems to be caused because of the now missing "if (ret > 0) {" > > line somehow that was there earlier. New code sets ms to 200 it > > seems, then dmesg shows: > > Doh, of course :( Sorry I missed that. > > > The old code is not updating ms and it's set to 1. > > Right, and not waiting either which should be the issue. Does the > following work: And it's recalculating the timeout every time now too :) Yup that fix works and the problem makes sense now: Tested-by: Tony Lindgren > 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,