From: Wei Fang <wei.fang@nxp.com>
To: claudiu.manoil@nxp.com, vladimir.oltean@nxp.com,
xiaoning.wang@nxp.com, andrew+netdev@lunn.ch,
davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
imx@lists.linux.dev
Subject: [PATCH net-next 2/5] net: enetc: add Tx checksum offload for i.MX95 ENETC
Date: Thu, 7 Nov 2024 11:38:14 +0800 [thread overview]
Message-ID: <20241107033817.1654163-3-wei.fang@nxp.com> (raw)
In-Reply-To: <20241107033817.1654163-1-wei.fang@nxp.com>
In addition to supporting Rx checksum offload, i.MX95 ENETC also supports
Tx checksum offload. The transmit checksum offload is implemented through
the Tx BD. To support Tx checksum offload, software needs to fill some
auxiliary information in Tx BD, such as IP version, IP header offset and
size, whether L4 is UDP or TCP, etc.
Same as Rx checksum offload, Tx checksum offload capability isn't defined
in register, so tx_csum bit is added to struct enetc_drvdata to indicate
whether the device supports Tx checksum offload.
Signed-off-by: Wei Fang <wei.fang@nxp.com>
---
drivers/net/ethernet/freescale/enetc/enetc.c | 52 ++++++++++++++++---
drivers/net/ethernet/freescale/enetc/enetc.h | 2 +
.../net/ethernet/freescale/enetc/enetc_hw.h | 14 +++--
.../freescale/enetc/enetc_pf_common.c | 3 ++
4 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c
index 3137b6ee62d3..f98d14841838 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -143,6 +143,26 @@ static int enetc_ptp_parse(struct sk_buff *skb, u8 *udp,
return 0;
}
+static bool enetc_tx_csum_offload_check(struct sk_buff *skb)
+{
+ if (ip_hdr(skb)->version == 4)
+ return ip_hdr(skb)->protocol == IPPROTO_TCP ||
+ ip_hdr(skb)->protocol == IPPROTO_UDP;
+ else if (ip_hdr(skb)->version == 6)
+ return ipv6_hdr(skb)->nexthdr == NEXTHDR_TCP ||
+ ipv6_hdr(skb)->nexthdr == NEXTHDR_UDP;
+ else
+ return false;
+}
+
+static bool enetc_skb_is_tcp(struct sk_buff *skb)
+{
+ if (ip_hdr(skb)->version == 4)
+ return ip_hdr(skb)->protocol == IPPROTO_TCP;
+ else
+ return ipv6_hdr(skb)->nexthdr == NEXTHDR_TCP;
+}
+
static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb)
{
bool do_vlan, do_onestep_tstamp = false, do_twostep_tstamp = false;
@@ -160,6 +180,29 @@ static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb)
dma_addr_t dma;
u8 flags = 0;
+ enetc_clear_tx_bd(&temp_bd);
+ if (skb->ip_summed == CHECKSUM_PARTIAL) {
+ /* Can not support TSD and checksum offload at the same time */
+ if (priv->active_offloads & ENETC_F_TXCSUM &&
+ enetc_tx_csum_offload_check(skb) && !tx_ring->tsd_enable) {
+ bool is_ipv6 = ip_hdr(skb)->version == 6;
+ bool is_tcp = enetc_skb_is_tcp(skb);
+
+ temp_bd.l3_start = skb_network_offset(skb);
+ temp_bd.ipcs = is_ipv6 ? 0 : 1;
+ temp_bd.l3_hdr_size = skb_network_header_len(skb) / 4;
+ temp_bd.l3t = is_ipv6 ? 1 : 0;
+ temp_bd.l4t = is_tcp ? ENETC_TXBD_L4T_TCP : ENETC_TXBD_L4T_UDP;
+ flags |= ENETC_TXBD_FLAGS_CSUM_LSO | ENETC_TXBD_FLAGS_L4CS;
+ } else {
+ if (skb_checksum_help(skb)) {
+ dev_err(tx_ring->dev, "skb_checksum_help() error\n");
+
+ return 0;
+ }
+ }
+ }
+
i = tx_ring->next_to_use;
txbd = ENETC_TXBD(*tx_ring, i);
prefetchw(txbd);
@@ -170,7 +213,6 @@ static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb)
temp_bd.addr = cpu_to_le64(dma);
temp_bd.buf_len = cpu_to_le16(len);
- temp_bd.lstatus = 0;
tx_swbd = &tx_ring->tx_swbd[i];
tx_swbd->dma = dma;
@@ -591,7 +633,7 @@ static netdev_tx_t enetc_start_xmit(struct sk_buff *skb,
{
struct enetc_ndev_priv *priv = netdev_priv(ndev);
struct enetc_bdr *tx_ring;
- int count, err;
+ int count;
/* Queue one-step Sync packet if already locked */
if (skb->cb[0] & ENETC_F_TX_ONESTEP_SYNC_TSTAMP) {
@@ -624,11 +666,6 @@ static netdev_tx_t enetc_start_xmit(struct sk_buff *skb,
return NETDEV_TX_BUSY;
}
- if (skb->ip_summed == CHECKSUM_PARTIAL) {
- err = skb_checksum_help(skb);
- if (err)
- goto drop_packet_err;
- }
enetc_lock_mdio();
count = enetc_map_tx_buffs(tx_ring, skb);
enetc_unlock_mdio();
@@ -3287,6 +3324,7 @@ static const struct enetc_drvdata enetc4_pf_data = {
.sysclk_freq = ENETC_CLK_333M,
.pmac_offset = ENETC4_PMAC_OFFSET,
.rx_csum = 1,
+ .tx_csum = 1,
.eth_ops = &enetc4_pf_ethtool_ops,
};
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.h b/drivers/net/ethernet/freescale/enetc/enetc.h
index 5b65f79e05be..ee11ff97e9ed 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc.h
@@ -235,6 +235,7 @@ enum enetc_errata {
struct enetc_drvdata {
u32 pmac_offset; /* Only valid for PSI which supports 802.1Qbu */
u8 rx_csum:1;
+ u8 tx_csum:1;
u64 sysclk_freq;
const struct ethtool_ops *eth_ops;
};
@@ -343,6 +344,7 @@ enum enetc_active_offloads {
ENETC_F_QCI = BIT(10),
ENETC_F_QBU = BIT(11),
ENETC_F_RXCSUM = BIT(12),
+ ENETC_F_TXCSUM = BIT(13),
};
enum enetc_flags_bit {
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_hw.h b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
index 4b8fd1879005..590b1412fadf 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_hw.h
+++ b/drivers/net/ethernet/freescale/enetc/enetc_hw.h
@@ -558,7 +558,12 @@ union enetc_tx_bd {
__le16 frm_len;
union {
struct {
- u8 reserved[3];
+ u8 l3_start:7;
+ u8 ipcs:1;
+ u8 l3_hdr_size:7;
+ u8 l3t:1;
+ u8 resv:5;
+ u8 l4t:3;
u8 flags;
}; /* default layout */
__le32 txstart;
@@ -582,10 +587,10 @@ union enetc_tx_bd {
};
enum enetc_txbd_flags {
- ENETC_TXBD_FLAGS_RES0 = BIT(0), /* reserved */
+ ENETC_TXBD_FLAGS_L4CS = BIT(0), /* For ENETC 4.1 and later */
ENETC_TXBD_FLAGS_TSE = BIT(1),
ENETC_TXBD_FLAGS_W = BIT(2),
- ENETC_TXBD_FLAGS_RES3 = BIT(3), /* reserved */
+ ENETC_TXBD_FLAGS_CSUM_LSO = BIT(3), /* For ENETC 4.1 and later */
ENETC_TXBD_FLAGS_TXSTART = BIT(4),
ENETC_TXBD_FLAGS_EX = BIT(6),
ENETC_TXBD_FLAGS_F = BIT(7)
@@ -594,6 +599,9 @@ enum enetc_txbd_flags {
#define ENETC_TXBD_TXSTART_MASK GENMASK(24, 0)
#define ENETC_TXBD_FLAGS_OFFSET 24
+#define ENETC_TXBD_L4T_UDP BIT(0)
+#define ENETC_TXBD_L4T_TCP BIT(1)
+
static inline __le32 enetc_txbd_set_tx_start(u64 tx_start, u8 flags)
{
u32 temp;
diff --git a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
index 91e79582a541..3a8a5b6d8c26 100644
--- a/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_pf_common.c
@@ -122,6 +122,9 @@ void enetc_pf_netdev_setup(struct enetc_si *si, struct net_device *ndev,
if (si->drvdata->rx_csum)
priv->active_offloads |= ENETC_F_RXCSUM;
+ if (si->drvdata->tx_csum)
+ priv->active_offloads |= ENETC_F_TXCSUM;
+
/* TODO: currently, i.MX95 ENETC driver does not support advanced features */
if (!is_enetc_rev1(si)) {
ndev->hw_features &= ~(NETIF_F_HW_VLAN_CTAG_FILTER | NETIF_F_LOOPBACK);
--
2.34.1
next prev parent reply other threads:[~2024-11-07 3:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-07 3:38 [PATCH net-next 0/5] Add more feautues for ENETC v4 - round 1 Wei Fang
2024-11-07 3:38 ` [PATCH net-next 1/5] net: enetc: add Rx checksum offload for i.MX95 ENETC Wei Fang
2024-11-07 16:21 ` Frank Li
2024-11-07 3:38 ` Wei Fang [this message]
2024-11-07 16:29 ` [PATCH net-next 2/5] net: enetc: add Tx " Frank Li
2024-11-08 1:32 ` Wei Fang
2024-11-07 3:38 ` [PATCH net-next 3/5] net: enetc: update max chained Tx BD number " Wei Fang
2024-11-07 16:31 ` Frank Li
2024-11-07 3:38 ` [PATCH net-next 4/5] net: enetc: add LSO support for i.MX95 ENETC PF Wei Fang
2024-11-07 16:38 ` Frank Li
2024-11-07 3:38 ` [PATCH net-next 5/5] net: enetc: add UDP segmentation offload support Wei Fang
2024-11-07 16:50 ` Frank Li
2024-11-07 9:12 ` [PATCH net-next 0/5] Add more feautues for ENETC v4 - round 1 Hariprasad Kelam
2024-11-07 9:52 ` Wei Fang
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=20241107033817.1654163-3-wei.fang@nxp.com \
--to=wei.fang@nxp.com \
--cc=andrew+netdev@lunn.ch \
--cc=claudiu.manoil@nxp.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=imx@lists.linux.dev \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=vladimir.oltean@nxp.com \
--cc=xiaoning.wang@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