From: Jose Abreu <Jose.Abreu@synopsys.com> To: netdev@vger.kernel.org Cc: Joao Pinto <Joao.Pinto@synopsys.com>, Jose Abreu <Jose.Abreu@synopsys.com>, Giuseppe Cavallaro <peppe.cavallaro@st.com>, Alexandre Torgue <alexandre.torgue@st.com>, Jose Abreu <Jose.Abreu@synopsys.com>, "David S. Miller" <davem@davemloft.net>, Maxime Coquelin <mcoquelin.stm32@gmail.com>, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net 10/11] net: stmmac: Fix TSO descriptor with Enhanced Addressing Date: Wed, 6 Nov 2019 16:03:04 +0100 [thread overview] Message-ID: <c9c9e9d025b2164632b24ce560ac52981f77d57e.1573052379.git.Jose.Abreu@synopsys.com> (raw) In-Reply-To: <cover.1573052378.git.Jose.Abreu@synopsys.com> In-Reply-To: <cover.1573052378.git.Jose.Abreu@synopsys.com> When using addressing > 32 bits the TSO first descriptor only has the header so we can't set the payload field for this descriptor. Let's reset the variable so that buffer 2 value is zero. Fixes: a993db88d17d ("net: stmmac: Enable support for > 32 Bits addressing in XGMAC") Signed-off-by: Jose Abreu <Jose.Abreu@synopsys.com> --- Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com> Cc: Alexandre Torgue <alexandre.torgue@st.com> Cc: Jose Abreu <joabreu@synopsys.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: netdev@vger.kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 1ab1eea1556a..b0a16d7c6e3d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2996,6 +2996,7 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) stmmac_set_desc_addr(priv, first, des); tmp_pay_len = pay_len; des += proto_hdr_len; + pay_len = 0; } stmmac_tso_allocator(priv, des, tmp_pay_len, (nfrags == 0), queue); -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Jose Abreu <Jose.Abreu@synopsys.com> To: netdev@vger.kernel.org Cc: Jose Abreu <Jose.Abreu@synopsys.com>, Joao Pinto <Joao.Pinto@synopsys.com>, Alexandre Torgue <alexandre.torgue@st.com>, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, Maxime Coquelin <mcoquelin.stm32@gmail.com>, Giuseppe Cavallaro <peppe.cavallaro@st.com>, "David S. Miller" <davem@davemloft.net>, linux-arm-kernel@lists.infradead.org Subject: [PATCH net 10/11] net: stmmac: Fix TSO descriptor with Enhanced Addressing Date: Wed, 6 Nov 2019 16:03:04 +0100 [thread overview] Message-ID: <c9c9e9d025b2164632b24ce560ac52981f77d57e.1573052379.git.Jose.Abreu@synopsys.com> (raw) In-Reply-To: <cover.1573052378.git.Jose.Abreu@synopsys.com> In-Reply-To: <cover.1573052378.git.Jose.Abreu@synopsys.com> When using addressing > 32 bits the TSO first descriptor only has the header so we can't set the payload field for this descriptor. Let's reset the variable so that buffer 2 value is zero. Fixes: a993db88d17d ("net: stmmac: Enable support for > 32 Bits addressing in XGMAC") Signed-off-by: Jose Abreu <Jose.Abreu@synopsys.com> --- Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com> Cc: Alexandre Torgue <alexandre.torgue@st.com> Cc: Jose Abreu <joabreu@synopsys.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com> Cc: netdev@vger.kernel.org Cc: linux-stm32@st-md-mailman.stormreply.com Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 1ab1eea1556a..b0a16d7c6e3d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -2996,6 +2996,7 @@ static netdev_tx_t stmmac_tso_xmit(struct sk_buff *skb, struct net_device *dev) stmmac_set_desc_addr(priv, first, des); tmp_pay_len = pay_len; des += proto_hdr_len; + pay_len = 0; } stmmac_tso_allocator(priv, des, tmp_pay_len, (nfrags == 0), queue); -- 2.7.4 _______________________________________________ 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:[~2019-11-06 15:04 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-06 15:02 [PATCH net 00/11] net: stmmac: Fixes for -net Jose Abreu 2019-11-06 15:02 ` Jose Abreu 2019-11-06 15:02 ` [PATCH net 01/11] net: stmmac: gmac4: bitrev32 returns u32 Jose Abreu 2019-11-06 15:02 ` Jose Abreu 2019-11-06 15:02 ` [PATCH net 02/11] net: stmmac: xgmac: " Jose Abreu 2019-11-06 15:02 ` Jose Abreu 2019-11-06 15:02 ` [PATCH net 03/11] net: stmmac: selftests: Prevent false positives in filter tests Jose Abreu 2019-11-06 15:02 ` Jose Abreu 2019-11-06 15:02 ` [PATCH net 04/11] net: stmmac: xgmac: Only get SPH header len if available Jose Abreu 2019-11-06 15:02 ` Jose Abreu 2019-11-06 15:02 ` [PATCH net 05/11] net: stmmac: xgmac: Fix TSA selection Jose Abreu 2019-11-06 15:02 ` Jose Abreu 2019-11-06 15:03 ` [PATCH net 06/11] net: stmmac: xgmac: Fix AV Feature detection Jose Abreu 2019-11-06 15:03 ` Jose Abreu 2019-11-06 15:03 ` [PATCH net 07/11] net: stmmac: xgmac: Disable Flow Control when 1 or more queues are in AV Jose Abreu 2019-11-06 15:03 ` Jose Abreu 2019-11-06 15:03 ` [PATCH net 08/11] net: stmmac: xgmac: Disable MMC interrupts by default Jose Abreu 2019-11-06 15:03 ` Jose Abreu 2019-11-06 15:03 ` [PATCH net 09/11] net: stmmac: Fix the packet count in stmmac_rx() Jose Abreu 2019-11-06 15:03 ` Jose Abreu 2019-11-06 15:03 ` Jose Abreu [this message] 2019-11-06 15:03 ` [PATCH net 10/11] net: stmmac: Fix TSO descriptor with Enhanced Addressing Jose Abreu 2019-11-06 15:03 ` [PATCH net 11/11] net: stmmac: Fix the TX IOC in xmit path Jose Abreu 2019-11-06 15:03 ` Jose Abreu 2019-11-07 5:23 ` [PATCH net 00/11] net: stmmac: Fixes for -net David Miller 2019-11-07 5:23 ` David Miller
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=c9c9e9d025b2164632b24ce560ac52981f77d57e.1573052379.git.Jose.Abreu@synopsys.com \ --to=jose.abreu@synopsys.com \ --cc=Joao.Pinto@synopsys.com \ --cc=alexandre.torgue@st.com \ --cc=davem@davemloft.net \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-stm32@st-md-mailman.stormreply.com \ --cc=mcoquelin.stm32@gmail.com \ --cc=netdev@vger.kernel.org \ --cc=peppe.cavallaro@st.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.