From: Marc Kleine-Budde <mkl@pengutronix.de>
To: Shenwei Wang <shenwei.wang@nxp.com>
Cc: Russell King <linux@armlinux.org.uk>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Neil Armstrong <neil.armstrong@linaro.org>,
Kevin Hilman <khilman@baylibre.com>,
Vinod Koul <vkoul@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Jose Abreu <joabreu@synopsys.com>,
imx@lists.linux.dev, Simon Horman <simon.horman@corigine.com>,
Frank Li <frank.li@nxp.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>,
Giuseppe Cavallaro <peppe.cavallaro@st.com>,
Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>,
Fabio Estevam <festevam@gmail.com>,
linux-stm32@st-md-mailman.stormreply.com,
Jerome Brunet <jbrunet@baylibre.com>,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
Wong Vee Khee <veekhee@apple.com>,
NXP Linux Team <linux-imx@nxp.com>,
Andrew Halaney <ahalaney@redhat.com>,
Bhupesh Sharma <bhupesh.sharma@linaro.org>,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
Revanth Kumar Uppala <ruppala@nvidia.com>,
Jochen Henneberg <jh@henneberg-systemdesign.com>,
linux-amlogic@lists.infradead.org,
linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Pengutronix Kernel Team <kernel@pengutronix.de>
Subject: Re: [PATCH v3 net 2/2] net: stmmac: dwmac-imx: pause the TXC clock in fixed-link
Date: Tue, 1 Aug 2023 11:01:04 +0200 [thread overview]
Message-ID: <20230801-casket-sterling-db0e49f154cf-mkl@pengutronix.de> (raw)
In-Reply-To: <20230731161929.2341584-3-shenwei.wang@nxp.com>
[-- Attachment #1.1: Type: text/plain, Size: 3511 bytes --]
On 31.07.2023 11:19:29, Shenwei Wang wrote:
> When using a fixed-link setup, certain devices like the SJA1105 require a
> small pause in the TXC clock line to enable their internal tunable
> delay line (TDL).
>
> To satisfy this requirement, this patch temporarily disables the TX clock,
> and restarts it after a required period. This provides the required
> silent interval on the clock line for SJA1105 to complete the frequency
> transition and enable the internal TDLs.
>
> So far we have only enabled this feature on the i.MX93 platform.
>
> Signed-off-by: Shenwei Wang <shenwei.wang@nxp.com>
> Reviewed-by: Frank Li <frank.li@nxp.com>
> ---
> .../net/ethernet/stmicro/stmmac/dwmac-imx.c | 42 +++++++++++++++++++
> 1 file changed, 42 insertions(+)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
> index 53ee5a42c071..2e4173d099f3 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c
> @@ -32,6 +32,7 @@
> #define GPR_ENET_QOS_RGMII_EN (0x1 << 21)
>
> #define MX93_GPR_ENET_QOS_INTF_MODE_MASK GENMASK(3, 0)
> +#define MX93_GPR_ENET_QOS_INTF_MASK GENMASK(3, 1)
> #define MX93_GPR_ENET_QOS_INTF_SEL_MII (0x0 << 1)
> #define MX93_GPR_ENET_QOS_INTF_SEL_RMII (0x4 << 1)
> #define MX93_GPR_ENET_QOS_INTF_SEL_RGMII (0x1 << 1)
> @@ -40,6 +41,7 @@
> #define DMA_BUS_MODE 0x00001000
> #define DMA_BUS_MODE_SFT_RESET (0x1 << 0)
> #define RMII_RESET_SPEED (0x3 << 14)
> +#define CTRL_SPEED_MASK GENMASK(15, 14)
>
> struct imx_dwmac_ops {
> u32 addr_width;
> @@ -56,6 +58,7 @@ struct imx_priv_data {
> struct regmap *intf_regmap;
> u32 intf_reg_off;
> bool rmii_refclk_ext;
> + void __iomem *base_addr;
>
> const struct imx_dwmac_ops *ops;
> struct plat_stmmacenet_data *plat_dat;
> @@ -212,6 +215,42 @@ static void imx_dwmac_fix_speed(void *priv, uint speed, uint mode)
> dev_err(dwmac->dev, "failed to set tx rate %lu\n", rate);
> }
>
> +static void imx_dwmac_fix_speed_mx93(void *priv, uint speed, uint mode)
> +{
> + struct imx_priv_data *dwmac = priv;
> + int ctrl, old_ctrl, iface;
regmap_read() wants a pointer to an "unsigned int".
> +
> + imx_dwmac_fix_speed(priv, speed, mode);
> +
> + if (!dwmac || mode != MLO_AN_FIXED)
> + return;
> +
> + if (regmap_read(dwmac->intf_regmap, dwmac->intf_reg_off, &iface))
> + return;
> +
> + iface &= MX93_GPR_ENET_QOS_INTF_MASK;
> + if (iface != MX93_GPR_ENET_QOS_INTF_SEL_RGMII)
> + return;
> +
> + old_ctrl = readl(dwmac->base_addr + MAC_CTRL_REG);
> + ctrl = old_ctrl & ~CTRL_SPEED_MASK;
> + regmap_update_bits(dwmac->intf_regmap, dwmac->intf_reg_off,
> + MX93_GPR_ENET_QOS_INTF_MODE_MASK, 0);
> + writel(ctrl, dwmac->base_addr + MAC_CTRL_REG);
> +
> + /* Ensure the settings for CTRL are applied and avoid CPU/Compiler
> + * reordering.
> + */
> + wmb();
> +
> + usleep_range(10, 20);
> + iface |= MX93_GPR_ENET_QOS_CLK_GEN_EN;
> + regmap_update_bits(dwmac->intf_regmap, dwmac->intf_reg_off,
> + MX93_GPR_ENET_QOS_INTF_MODE_MASK, iface);
> +
> + writel(old_ctrl, dwmac->base_addr + MAC_CTRL_REG);
> +}
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung Nürnberg | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-08-01 9:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-31 16:19 [PATCH v3 net 0/2] update stmmac fix_mac_speed Shenwei Wang
2023-07-31 16:19 ` [PATCH v3 net 1/2] net: stmmac: add new mode parameter for fix_mac_speed Shenwei Wang
2023-08-01 6:37 ` Marc Kleine-Budde
2023-08-01 18:43 ` [EXT] " Shenwei Wang
2023-08-01 19:58 ` Jakub Kicinski
2023-08-02 19:33 ` Shenwei Wang
2023-07-31 16:19 ` [PATCH v3 net 2/2] net: stmmac: dwmac-imx: pause the TXC clock in fixed-link Shenwei Wang
2023-08-01 9:01 ` Marc Kleine-Budde [this message]
2023-08-01 12:47 ` Johannes Zink
2023-08-01 12:56 ` Russell King (Oracle)
2023-08-01 17:06 ` [EXT] " Shenwei Wang
2023-08-01 17:23 ` Andrew Halaney
2023-08-01 17:24 ` Russell King (Oracle)
2023-08-01 17:10 ` Shenwei Wang
2023-08-02 6:25 ` Johannes Zink
2023-08-02 14:27 ` Shenwei Wang
2023-08-02 14:40 ` Johannes Zink
2023-08-02 16:00 ` Shenwei Wang
2023-08-03 6:36 ` Johannes Zink
2023-08-03 13:08 ` Shenwei Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230801-casket-sterling-db0e49f154cf-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=ahalaney@redhat.com \
--cc=alexandre.torgue@foss.st.com \
--cc=bartosz.golaszewski@linaro.org \
--cc=bhupesh.sharma@linaro.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=festevam@gmail.com \
--cc=frank.li@nxp.com \
--cc=imx@lists.linux.dev \
--cc=jbrunet@baylibre.com \
--cc=jernej.skrabec@gmail.com \
--cc=jh@henneberg-systemdesign.com \
--cc=joabreu@synopsys.com \
--cc=kernel@pengutronix.de \
--cc=khilman@baylibre.com \
--cc=kuba@kernel.org \
--cc=linux-amlogic@lists.infradead.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux@armlinux.org.uk \
--cc=martin.blumenstingl@googlemail.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=neil.armstrong@linaro.org \
--cc=netdev@vger.kernel.org \
--cc=nobuhiro1.iwamatsu@toshiba.co.jp \
--cc=pabeni@redhat.com \
--cc=peppe.cavallaro@st.com \
--cc=ruppala@nvidia.com \
--cc=s.hauer@pengutronix.de \
--cc=samuel@sholland.org \
--cc=shawnguo@kernel.org \
--cc=shenwei.wang@nxp.com \
--cc=simon.horman@corigine.com \
--cc=veekhee@apple.com \
--cc=vkoul@kernel.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).