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=-8.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 2A805C433FF for ; Tue, 13 Aug 2019 10:04:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E745420842 for ; Tue, 13 Aug 2019 10:04:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JAjeE//C" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728783AbfHMKEH (ORCPT ); Tue, 13 Aug 2019 06:04:07 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:34798 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728410AbfHMKED (ORCPT ); Tue, 13 Aug 2019 06:04:03 -0400 Received: by mail-wr1-f67.google.com with SMTP id 31so107221892wrm.1; Tue, 13 Aug 2019 03:04:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=NrpJWLkooBYZ35YFdH1/4e4aUBOzkA7ku0WANVytEwE=; b=JAjeE//CfBOTD9BMnIBK/rQucawyi8geK/IP9/x+XuHFJ7yfmQPHlKzwjSwfmlg79F r5EPQC4P1p1B7fIGzsHFB02ZV7fB7YM3z1u7LLXsrZ86UHwA/2qSjrf5lEBAttU/9Mbp R5tNLm4XMzp8I7SkYcCxnDX4fX9jzUmJD4OgoF3pAdHLCRnJ2hWbsBspR30Yphg4GUUI mCZTCIW7LYVCHU5p0SFPUOaY8avqJDUA8uNcQPqQqN9Lc4mP0Do9mU9JPhnT+E+ZG+fK wIGHdWH3yqWXdyjGhxTZ3/DswBjTL68zj17pLtIu65SEXI4ZKR4SmNOmgKgsH5607x1M yTUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=NrpJWLkooBYZ35YFdH1/4e4aUBOzkA7ku0WANVytEwE=; b=S2EqAiNExXco9L0VnDv4UZDXlQrb83Ysw7gxH9ophnUMc4ns71HDJS8YR8gRG7EFVt 43vTA+wG5uw0g+/G6QNdPJXXND7fXl2xEIMb9ce4blwNBptE9++eNd6cdJ4f0uktVChF m8g4RRebV6dGpzdPUdSTtxfDaWoFLUAA2e1RnIVuMULpF7oBVqNCB1zI3DJhHlJ/74I8 hYg2oyWgg160SqxA9jImzFkk22io77acXFNeGqL8zn233VQ9lcmaHAkXtN2yAyBPwgbO WPBvpGgsl4hARaJ3cLvlp3kBMxPeb3qhBcV2KPhVDw/t2xU+ZpS9ZmjBcwOPRYo5/G9n G5UA== X-Gm-Message-State: APjAAAU2Fid+rzWYBQNiLQVWaTaqZKUtPemwZJkHXOTX0YJHUbxL5iMZ Qkn30XNXaNWdyNSk17VnK40= X-Google-Smtp-Source: APXvYqx8tpw687Wt4Ej101JfhuyJXYLASFboGULcT+KNGvlTxm/ldU4/HKQYLPMw4TAZ1ex8jctDPQ== X-Received: by 2002:a05:6000:110f:: with SMTP id z15mr32921907wrw.162.1565690640719; Tue, 13 Aug 2019 03:04:00 -0700 (PDT) Received: from localhost (pD9E51890.dip0.t-ipconnect.de. [217.229.24.144]) by smtp.gmail.com with ESMTPSA id j10sm186361832wrd.26.2019.08.13.03.03.58 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 13 Aug 2019 03:03:58 -0700 (PDT) Date: Tue, 13 Aug 2019 12:03:57 +0200 From: Thierry Reding To: Krishna Yarlagadda Cc: gregkh@linuxfoundation.org, robh+dt@kernel.org, mark.rutland@arm.com, jonathanh@nvidia.com, ldewangan@nvidia.com, jslaby@suse.com, linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, Shardar Shariff Md Subject: Re: [PATCH 08/14] serial: tegra: check for FIFO mode enabled status Message-ID: <20190813100357.GM1137@ulmo> References: <1565609303-27000-1-git-send-email-kyarlagadda@nvidia.com> <1565609303-27000-9-git-send-email-kyarlagadda@nvidia.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="C01fF7hLGvN0zd9s" Content-Disposition: inline In-Reply-To: <1565609303-27000-9-git-send-email-kyarlagadda@nvidia.com> User-Agent: Mutt/1.12.1 (2019-06-15) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --C01fF7hLGvN0zd9s Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Aug 12, 2019 at 04:58:17PM +0530, Krishna Yarlagadda wrote: > Chips prior to Tegra186 needed delay of 3 UART clock cycles to avoid > data loss. This issue is fixed in Tegra186 and a new flag is added to > check if fifo mode is enabled. chip data updated to check if this flag > is available for a chip. Tegra186 has new compatible to enable this > flag. >=20 > Signed-off-by: Shardar Shariff Md > Signed-off-by: Krishna Yarlagadda > --- > drivers/tty/serial/serial-tegra.c | 52 +++++++++++++++++++++++++++++++++= +----- > 1 file changed, 46 insertions(+), 6 deletions(-) >=20 > diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/seria= l-tegra.c > index 7ab81bb..e0379d9 100644 > --- a/drivers/tty/serial/serial-tegra.c > +++ b/drivers/tty/serial/serial-tegra.c > @@ -72,6 +72,8 @@ > #define TEGRA_TX_PIO 1 > #define TEGRA_TX_DMA 2 > =20 > +#define TEGRA_UART_FCR_IIR_FIFO_EN 0x40 > + > /** > * tegra_uart_chip_data: SOC specific data. > * > @@ -84,6 +86,7 @@ struct tegra_uart_chip_data { > bool tx_fifo_full_status; > bool allow_txfifo_reset_fifo_mode; > bool support_clk_src_div; > + bool fifo_mode_enable_status; > }; > =20 > struct tegra_uart_port { > @@ -263,6 +266,22 @@ static void tegra_uart_wait_sym_time(struct tegra_ua= rt_port *tup, > tup->current_baud)); > } > =20 > +static int tegra_uart_is_fifo_mode_enabled(struct tegra_uart_port *tup) I think this is a bad name. "is" makes it sound like this will return a boolean value. Also, this doesn't really check whether FIFO mode is enabled, but rather it waits for the FIFO mode to become enabled. Perhaps, then, a better name would be tegra_uart_wait_fifo_mode_enabled() ? > +{ > + unsigned long iir; > + unsigned int tmout =3D 100; > + > + do { > + iir =3D tegra_uart_read(tup, UART_IIR); > + if (iir & TEGRA_UART_FCR_IIR_FIFO_EN) > + return 0; > + udelay(1); > + } while (--tmout); > + dev_err(tup->uport.dev, "FIFO mode not enabled\n"); I'd push this out to callers. That way this function becomes useful in situations where you don't want to output an error. > + > + return -EIO; -ETIMEDOUT? Thierry > +} > + > static void tegra_uart_fifo_reset(struct tegra_uart_port *tup, u8 fcr_bi= ts) > { > unsigned long fcr =3D tup->fcr_shadow; > @@ -282,6 +301,8 @@ static void tegra_uart_fifo_reset(struct tegra_uart_p= ort *tup, u8 fcr_bits) > tegra_uart_write(tup, fcr, UART_FCR); > fcr |=3D UART_FCR_ENABLE_FIFO; > tegra_uart_write(tup, fcr, UART_FCR); > + if (tup->cdata->fifo_mode_enable_status) > + tegra_uart_is_fifo_mode_enabled(tup); > } > =20 > /* Dummy read to ensure the write is posted */ > @@ -918,12 +939,19 @@ static int tegra_uart_hw_init(struct tegra_uart_por= t *tup) > /* Dummy read to ensure the write is posted */ > tegra_uart_read(tup, UART_SCR); > =20 > - /* > - * For all tegra devices (up to t210), there is a hardware issue that > - * requires software to wait for 3 UART clock periods after enabling > - * the TX fifo, otherwise data could be lost. > - */ > - tegra_uart_wait_cycle_time(tup, 3); > + if (tup->cdata->fifo_mode_enable_status) { > + ret =3D tegra_uart_is_fifo_mode_enabled(tup); > + if (ret < 0) > + return ret; > + } else { > + /* > + * For all tegra devices (up to t210), there is a hardware > + * issue that requires software to wait for 3 UART clock > + * periods after enabling the TX fifo, otherwise data could > + * be lost. > + */ > + tegra_uart_wait_cycle_time(tup, 3); > + } > =20 > /* > * Initialize the UART with default configuration > @@ -1294,12 +1322,21 @@ static struct tegra_uart_chip_data tegra20_uart_c= hip_data =3D { > .tx_fifo_full_status =3D false, > .allow_txfifo_reset_fifo_mode =3D true, > .support_clk_src_div =3D false, > + .fifo_mode_enable_status =3D false, > }; > =20 > static struct tegra_uart_chip_data tegra30_uart_chip_data =3D { > .tx_fifo_full_status =3D true, > .allow_txfifo_reset_fifo_mode =3D false, > .support_clk_src_div =3D true, > + .fifo_mode_enable_status =3D false, > +}; > + > +static struct tegra_uart_chip_data tegra186_uart_chip_data =3D { > + .tx_fifo_full_status =3D true, > + .allow_txfifo_reset_fifo_mode =3D false, > + .support_clk_src_div =3D true, > + .fifo_mode_enable_status =3D true, > }; > =20 > static const struct of_device_id tegra_uart_of_match[] =3D { > @@ -1310,6 +1347,9 @@ static const struct of_device_id tegra_uart_of_matc= h[] =3D { > .compatible =3D "nvidia,tegra20-hsuart", > .data =3D &tegra20_uart_chip_data, > }, { > + .compatible =3D "nvidia,tegra186-hsuart", > + .data =3D &tegra186_uart_chip_data, > + }, { > }, > }; > MODULE_DEVICE_TABLE(of, tegra_uart_of_match); > --=20 > 2.7.4 >=20 --C01fF7hLGvN0zd9s Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAl1Siw0ACgkQ3SOs138+ s6EFOg/+LWtRSOg+mVM7nQcU6XMvsQ1U0AFkBAYZR5N2Lpcg+efsieA2UN9qrh8M SI9V6zG+yOxXUbNIH5ENYGbEijqZPuwA8js8W8keXAJ0GJRnYMPVnN6ydEAsTsyf Ywl+wuUrlMqqiGoz8zvYA7oiHVb/7MzzpAguyCZEWPWK7+3PNQp5dhUrKnFocEn0 JjWBhaA8dELf8dCPPVjd683FvjuyJd7gvs2uZ9UYqImLz6gjis9Fo0tlNOgRgwgG wc/0uQ0euAI15HgToxbB55AtDtWvMtxQWbE+GuuhHumauKkB4MFjdn5vJ0gS0YUj Fq6fjBXquLhLdF5A2tC6RT3R0lEJqpSMaD1R+g0lE3D8fsTENG2e1KQb6n4pwZSf SPoQR59+VV1+ZcTdWjTFEqEQtVlt0mCEkdl5Qu/BQLpGk7f/+ZGcwH3wFigqD2RW mG0WB3Wic9fP3351zQLuxWz/V2+PeuneaU6rVa03/9RZocA6eCjvDZdH4vW8Mh8M hthAp/Dc9jTgFG3HCCVqc/lk+bTvKCnk7rd+AInx+4dkxTASfkYR7nFXlAVxHIya UnUp/RnfEHQeBR+gTljNPqIRVvpYLFp8+RotROh+OJRPeTCbOBRNJ8BFbqXfQA9h eI5mgv6QMLtGZSWibNGeMOupIE/2D2acUa0dBsAQ2tMwHB/PsR4= =qha6 -----END PGP SIGNATURE----- --C01fF7hLGvN0zd9s--