From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753159AbbHTOnP (ORCPT ); Thu, 20 Aug 2015 10:43:15 -0400 Received: from down.free-electrons.com ([37.187.137.238]:41539 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751675AbbHTOnM (ORCPT ); Thu, 20 Aug 2015 10:43:12 -0400 Date: Thu, 20 Aug 2015 16:43:07 +0200 From: Maxime Ripard To: Michal Suchanek Cc: linux-sunxi@googlegroups.com, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , Mark Brown , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Subject: Re: [PATCH 1/9] spi: sunxi: fix transfer timeout Message-ID: <20150820144307.GT30520@lukather> References: <0e0b52774a48ddb71dc8095b66942451cd31ff7d.1440080122.git.hramrach@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="80Ds8Z/hZmemMosa" Content-Disposition: inline In-Reply-To: <0e0b52774a48ddb71dc8095b66942451cd31ff7d.1440080122.git.hramrach@gmail.com> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --80Ds8Z/hZmemMosa Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Aug 20, 2015 at 02:19:45PM -0000, Michal Suchanek wrote: > The trasfer timeout is fixed at 1000 ms. Reading a 4Mbyte flash over > 1MHz SPI bus takes way longer than that. Calculate the timeout from the > actual time the transfer is supposed to take and multiply by 2 for good > measure. >=20 > Signed-off-by: Michal Suchanek > --- > drivers/spi/spi-sun4i.c | 10 +++++++++- > drivers/spi/spi-sun6i.c | 10 +++++++++- > 2 files changed, 18 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/spi/spi-sun4i.c b/drivers/spi/spi-sun4i.c > index fbb0a4d..48532ec 100644 > --- a/drivers/spi/spi-sun4i.c > +++ b/drivers/spi/spi-sun4i.c > @@ -170,6 +170,7 @@ static int sun4i_spi_transfer_one(struct spi_master *= master, > { > struct sun4i_spi *sspi =3D spi_master_get_devdata(master); > unsigned int mclk_rate, div, timeout; > + unsigned int start, end, tx_time; > unsigned int tx_len =3D 0; > int ret =3D 0; > u32 reg; > @@ -279,9 +280,16 @@ static int sun4i_spi_transfer_one(struct spi_master = *master, > reg =3D sun4i_spi_read(sspi, SUN4I_CTL_REG); > sun4i_spi_write(sspi, SUN4I_CTL_REG, reg | SUN4I_CTL_XCH); > =20 > + tx_time =3D max_t(int, tfr->len * 8 * 2 / (speed / 1000), 100); > + start =3D jiffies; > timeout =3D wait_for_completion_timeout(&sspi->done, > - msecs_to_jiffies(1000)); > + msecs_to_jiffies(tx_time)); > + end =3D jiffies; > if (!timeout) { > + dev_warn(&master->dev, > + "%s: timeout transferring %u bytes@%iHz for %i(%i)ms", > + dev_name(&spi->dev), tfr->len, speed, > + jiffies_to_msecs(end - start), tx_time); Timeout already contains the number of jiffies elapsed (and I'm not sure anyone reading that message would get that the last number is actually the maximum timeout). Maxime --=20 Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com --80Ds8Z/hZmemMosa Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJV1ed7AAoJEBx+YmzsjxAg3kEP/08Y3hEtLtSLH3VQi2ULgXS0 dOLQUCaW6yYQcLXyc1OTDNO9wlC0FfH7hH2/EMX1tIe0FWk9xzy8tUj4kK+jd+7s qP2ojcEfUvmc+xqUAVwbb0KCHbCKEMQKtBdIwKfMPuapGpVB/qpyK1cFm7xQEXKX EQ2Ut1gw3N+mM3DDdof9WjV08GMDLcXym50+o0dTzjTM4UEfnwi6Mo2VXAl/Lb2l 2TMK4Ma3GKJGcRwtK/VHESnBOcShWi/zYPySLIF2lpyIgZvwvfrfk0slGfZ9JFVk xrwgwI6baNd9vZtxio00GvCy7x6fyLCN/DqwXRKzizTYu6pV1Np2KVZtvNLBWUAp I68ZN/318MUCr+UcGPe0vsS6gI60ZsFZf8fImmcQfO4MouDfqAOoJ2Qd3LNCa42b PrvKBaIqia7oFj5CSFr1spHnA93sczeCyQCWDUQr9nkgtyjk7kO9IcwvU67uchTw dVv7RWZY0Eo66QOnaL22j+qoUHef5Ot74lHfNn2uVNiOVGnwRj0f6r7w7vUY1s33 ISfS9OU5uEX383Vyt4xxaqNfM5Skf5wLVyLiSO77ipu+aH9xf8BtMysUbZm7xLgA 9WjcwPVgPg4+pkzXkgnitDuPZJvLubGepH4mZ7f510f7OYVv4WTTl1NgwR3dDNV3 PtLahpcn/pjUNrS6rgju =2lq9 -----END PGP SIGNATURE----- --80Ds8Z/hZmemMosa--