Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp230183ybg; Thu, 17 Oct 2019 22:01:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqzyhnVVjqfaY2AmhU9ldNkixO7DgJznkYMp+Y3FyWtKX58/5B1fr19rqXiTy1iuJnSkmXhx X-Received: by 2002:a17:907:426f:: with SMTP id nx23mr7194358ejb.43.1571374896300; Thu, 17 Oct 2019 22:01:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571374896; cv=none; d=google.com; s=arc-20160816; b=SR2jDXOQQmoFqjRJprMLdyc1MfPRz7N2x4DUnfubwp7+av1J/xy4YlkwuYSGs0wc1I FOYIFKDuYIkqPUhqtBAy/5qar9g/67MRehmRkFCFUAFG3vA/HqrNSussLHuyYlAO7e/V fSTRaYiZ6Rm5t1II9sOQnOWnGfNFL8fZXIYcQbP1gZg9X6K6oIyiutxt/ufFIhbcEhIQ KAc6hQzxw70rzzP3941SZWehBFe+Ma/TqQBoU1iulCPInHiU35L0153VenizAxhJ1Y3N DE0B8XUnCR6oOgHHZHxOuL4BQj8mag7owq+2BgNOwfHhLkFSJR/YHT3UkiNjhnzQitZp kb3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uyaOc6B8KgRGklDksc2+kV/rymLk1bciYZJwNISni4w=; b=k+TdGiwmqOSbhaC3pfFSWxmFzEP8X2dd0sAVNDVAbswfR39DthZDslauDJbsJ25mU8 42Ig07uY3B4Bcjipj8/toQqgtDw1p6qXV9zafvfyvN25gOFL5cSHaRX0Xkehwj1aUzpw E0fxwPsmxkZeZh2LfyS3sbMPR8aOzJaQ4EJa4qeoY9EAQ+Bk3FDOLFRPM/a748ZnQfOz uQ3NVmqqA8DMnfzMX7V9LIX0MrS/nDc6k9ArfR1rv+RyKLf0XGFT473aTBRLrWsGgEpg KX0SQXIGcz7QVb9NUewbMzkAhbQWlr9IJZ+KI2La8e+PV6ZSaLXBheDREpgNgqyCxJIy 5xUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JF8MeTix; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t9si2656771ejr.29.2019.10.17.22.01.13; Thu, 17 Oct 2019 22:01:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=JF8MeTix; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390885AbfJPWSR (ORCPT + 99 others); Wed, 16 Oct 2019 18:18:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:44478 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727832AbfJPVya (ORCPT ); Wed, 16 Oct 2019 17:54:30 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8146E20872; Wed, 16 Oct 2019 21:54:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262869; bh=mYrFo0W9gI8djX/nmVkmDQqAzDr5zN+mypISr36JtF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JF8MeTixq16GkEXDmmBuAa4bCNaIG9+M9oGChFnK1hpyr1grGN6eE4ysJciyXohfE HOCBlf21E+CXXRmeuMl+r342TLEZJuH6SL4ne6t5sUnimphIcGIv2WEmXaUdhUhXv8 I7RxwqZeQzxTnA8UQ1Sf7kkiKfLGEA/Uf+xBGifs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sean Nyekjaer , Marc Kleine-Budde Subject: [PATCH 4.9 08/92] can: mcp251x: mcp251x_hw_reset(): allow more time after a reset Date: Wed, 16 Oct 2019 14:49:41 -0700 Message-Id: <20191016214805.498638552@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214759.600329427@linuxfoundation.org> References: <20191016214759.600329427@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marc Kleine-Budde commit d84ea2123f8d27144e3f4d58cd88c9c6ddc799de upstream. Some boards take longer than 5ms to power up after a reset, so allow some retries attempts before giving up. Fixes: ff06d611a31c ("can: mcp251x: Improve mcp251x_hw_reset()") Cc: linux-stable Tested-by: Sean Nyekjaer Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman --- drivers/net/can/spi/mcp251x.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) --- a/drivers/net/can/spi/mcp251x.c +++ b/drivers/net/can/spi/mcp251x.c @@ -627,7 +627,7 @@ static int mcp251x_setup(struct net_devi static int mcp251x_hw_reset(struct spi_device *spi) { struct mcp251x_priv *priv = spi_get_drvdata(spi); - u8 reg; + unsigned long timeout; int ret; /* Wait for oscillator startup timer after power up */ @@ -641,10 +641,19 @@ static int mcp251x_hw_reset(struct spi_d /* Wait for oscillator startup timer after reset */ mdelay(MCP251X_OST_DELAY_MS); - reg = mcp251x_read_reg(spi, CANSTAT); - if ((reg & CANCTRL_REQOP_MASK) != CANCTRL_REQOP_CONF) - return -ENODEV; - + /* Wait for reset to finish */ + timeout = jiffies + HZ; + while ((mcp251x_read_reg(spi, CANSTAT) & CANCTRL_REQOP_MASK) != + CANCTRL_REQOP_CONF) { + usleep_range(MCP251X_OST_DELAY_MS * 1000, + MCP251X_OST_DELAY_MS * 1000 * 2); + + if (time_after(jiffies, timeout)) { + dev_err(&spi->dev, + "MCP251x didn't enter in conf mode after reset\n"); + return -EBUSY; + } + } return 0; }