From: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
To: davem@davemloft.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: kuba@kernel.org, qiangqing.zhang@nxp.com, peppe.cavallaro@st.com,
alexandre.torgue@foss.st.com, joabreu@synopsys.com,
yannick.vignon@nxp.com, boon.leong.ong@intel.com,
Jose.Abreu@synopsys.com, mst@redhat.com, Joao.Pinto@synopsys.com,
mingkai.hu@nxp.com, leoyang.li@nxp.com, xiaoliang.yang_1@nxp.com
Subject: [PATCH net-next 2/2] net: stmmac: make stmmac-tx-timeout configurable in Kconfig
Date: Wed, 1 Dec 2021 09:47:05 +0800 [thread overview]
Message-ID: <20211201014705.6975-3-xiaoliang.yang_1@nxp.com> (raw)
In-Reply-To: <20211201014705.6975-1-xiaoliang.yang_1@nxp.com>
stmmac_tx_timeout() function is called when a queue transmission
timeout. When Strict Priority is used as scheduling algorithms, the
lower priority queue may be blocked by a higher prority queue, which
will lead to tx timeout. We don't want to enable the tx watchdog timeout
in this case. Therefore, this patch make stmmac-tx-timeout configurable.
This patch set the CONFIG_STMMAC_TX_TIMEOUT by default when STMMAC_ETH
is selected. If anyone want to disable the tx watchdog timeout of
stmmac, he can unset the CONFIG_STMMAC_TX_TIMEOUT in menuconfig.
Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@nxp.com>
---
drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 ++++++++++++
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++++
2 files changed, 16 insertions(+)
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
index 929cfc22cd0c..856c7d056b61 100644
--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
+++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
@@ -271,4 +271,16 @@ config STMMAC_PCI
If you have a controller with this interface, say Y or M here.
If unsure, say N.
+
+config STMMAC_TX_TIMEOUT
+ bool "STMMAC TX timeout support"
+ default STMMAC_ETH
+ depends on STMMAC_ETH
+ help
+ Support for TX timeout enable on stmmac.
+
+ This selects the TX watchdog timeout support for stmmac driver. The
+ feature is enabled by default when STMMAC_ETH is selected. If you
+ want to disable the TX watchdog timeout feature, say N here.
+
endif
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 89a6c35e2546..0a712b5d0715 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -5421,6 +5421,7 @@ static int stmmac_napi_poll_rxtx(struct napi_struct *napi, int budget)
return min(rxtx_done, budget - 1);
}
+#ifdef CONFIG_STMMAC_TX_TIMEOUT
/**
* stmmac_tx_timeout
* @dev : Pointer to net device structure
@@ -5436,6 +5437,7 @@ static void stmmac_tx_timeout(struct net_device *dev, unsigned int txqueue)
stmmac_global_err(priv);
}
+#endif
/**
* stmmac_set_rx_mode - entry point for multicast addressing
@@ -6632,7 +6634,9 @@ static const struct net_device_ops stmmac_netdev_ops = {
.ndo_fix_features = stmmac_fix_features,
.ndo_set_features = stmmac_set_features,
.ndo_set_rx_mode = stmmac_set_rx_mode,
+#ifdef CONFIG_STMMAC_TX_TIMEOUT
.ndo_tx_timeout = stmmac_tx_timeout,
+#endif
.ndo_eth_ioctl = stmmac_ioctl,
.ndo_setup_tc = stmmac_setup_tc,
.ndo_select_queue = stmmac_select_queue,
--
2.17.1
next prev parent reply other threads:[~2021-12-01 1:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-01 1:47 [PATCH net-next 0/2] multiple queues support on imx8mp-evk Xiaoliang Yang
2021-12-01 1:47 ` [PATCH net-next 1/2] arm64: dts: imx8mp-evk: configure multiple queues on eqos Xiaoliang Yang
2021-12-01 1:43 ` Joakim Zhang
2021-12-01 2:45 ` Jakub Kicinski
2021-12-01 1:47 ` Xiaoliang Yang [this message]
2021-12-02 10:13 ` [PATCH net-next 2/2] net: stmmac: make stmmac-tx-timeout configurable in Kconfig Heiner Kallweit
2021-12-02 10:28 ` [EXT] " Xiaoliang Yang
2021-12-02 10:45 ` Heiner Kallweit
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=20211201014705.6975-3-xiaoliang.yang_1@nxp.com \
--to=xiaoliang.yang_1@nxp.com \
--cc=Joao.Pinto@synopsys.com \
--cc=Jose.Abreu@synopsys.com \
--cc=alexandre.torgue@foss.st.com \
--cc=boon.leong.ong@intel.com \
--cc=davem@davemloft.net \
--cc=joabreu@synopsys.com \
--cc=kuba@kernel.org \
--cc=leoyang.li@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingkai.hu@nxp.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
--cc=qiangqing.zhang@nxp.com \
--cc=yannick.vignon@nxp.com \
/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).