net: ti: icssg-prueth: Enable HSR Tx duplication, Tx Tag and Rx Tag offload

The HSR stack allows to offload its Tx packet duplication functionality to
the hardware. Enable this offloading feature for ICSSG driver. Add support
to offload HSR Tx Tag Insertion and Rx Tag Removal and duplicate discard.

hsr tag insertion offload and hsr dup offload are tightly coupled in
firmware implementation. Both these features need to be enabled / disabled
together.

Duplicate discard is done as part of RX tag removal and it is
done by the firmware. When driver sends the r30 command
ICSSG_EMAC_HSR_RX_OFFLOAD_ENABLE, firmware does RX tag removal as well as
duplicate discard.

Signed-off-by: Ravi Gunasekaran <r-gunasekaran@ti.com>
Signed-off-by: MD Danish Anwar <danishanwar@ti.com>
Reviewed-by: Roger Quadros <rogerq@kernel.org>
Link: https://patch.msgid.link/20240911081603.2521729-5-danishanwar@ti.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/ti/icssg/icssg_common.c b/drivers/net/ethernet/ti/icssg/icssg_common.c
index b9d8a93d16805d7c405504ab2326e396e0bf322e..fdebeb2f84e00c1fa47b78a01ec254fdfac98029 100644 (file)
--- a/drivers/net/ethernet/ti/icssg/icssg_common.c
+++ b/drivers/net/ethernet/ti/icssg/icssg_common.c
@@ -660,14 +660,15 @@ enum netdev_tx icssg_ndo_start_xmit(struct sk_buff *skb, struct net_device *ndev
 {
        struct cppi5_host_desc_t *first_desc, *next_desc, *cur_desc;
        struct prueth_emac *emac = netdev_priv(ndev);
+       struct prueth *prueth = emac->prueth;
        struct netdev_queue *netif_txq;
        struct prueth_tx_chn *tx_chn;
        dma_addr_t desc_dma, buf_dma;
+       u32 pkt_len, dst_tag_id;
        int i, ret = 0, q_idx;
        bool in_tx_ts = 0;
        int tx_ts_cookie;
        void **swdata;
-       u32 pkt_len;
        u32 *epib;
 
        pkt_len = skb_headlen(skb);
@@ -712,9 +713,20 @@ enum netdev_tx icssg_ndo_start_xmit(struct sk_buff *skb, struct net_device *ndev
 
        /* set dst tag to indicate internal qid at the firmware which is at
         * bit8..bit15. bit0..bit7 indicates port num for directed
-        * packets in case of switch mode operation
+        * packets in case of switch mode operation and port num 0
+        * for undirected packets in case of HSR offload mode
         */
-       cppi5_desc_set_tags_ids(&first_desc->hdr, 0, (emac->port_id | (q_idx << 8)));
+       dst_tag_id = emac->port_id | (q_idx << 8);
+
+       if (prueth->is_hsr_offload_mode &&
+           (ndev->features & NETIF_F_HW_HSR_DUP))
+               dst_tag_id = PRUETH_UNDIRECTED_PKT_DST_TAG;
+
+       if (prueth->is_hsr_offload_mode &&
+           (ndev->features & NETIF_F_HW_HSR_TAG_INS))
+               epib[1] |= PRUETH_UNDIRECTED_PKT_TAG_INS;
+
+       cppi5_desc_set_tags_ids(&first_desc->hdr, 0, dst_tag_id);
        k3_udma_glue_tx_dma_to_cppi5_addr(tx_chn->tx_chn, &buf_dma);
        cppi5_hdesc_attach_buf(first_desc, buf_dma, pkt_len, buf_dma, pkt_len);
        swdata = cppi5_hdesc_get_swdata(first_desc);

diff --git a/drivers/net/ethernet/ti/icssg/icssg_config.c b/drivers/net/ethernet/ti/icssg/icssg_config.c
index 7b2e6c192ff3d3aa7b07840b7bf0c4b56e9f2b26..72ace151d8e9c941b460128a07b0386e8011f636 100644 (file)
--- a/drivers/net/ethernet/ti/icssg/icssg_config.c
+++ b/drivers/net/ethernet/ti/icssg/icssg_config.c
@@ -531,7 +531,9 @@ static const struct icssg_r30_cmd emac_r32_bitmask[] = {
        {{EMAC_NONE,  0xffff4000, EMAC_NONE, EMAC_NONE}},       /* Preemption on Tx ENABLE*/
        {{EMAC_NONE,  0xbfff0000, EMAC_NONE, EMAC_NONE}},       /* Preemption on Tx DISABLE*/
        {{0xffff0010,  EMAC_NONE, 0xffff0010, EMAC_NONE}},      /* VLAN AWARE*/
-       {{0xffef0000,  EMAC_NONE, 0xffef0000, EMAC_NONE}}       /* VLAN UNWARE*/
+       {{0xffef0000,  EMAC_NONE, 0xffef0000, EMAC_NONE}},      /* VLAN UNWARE*/
+       {{0xffff2000, EMAC_NONE, EMAC_NONE, EMAC_NONE}},        /* HSR_RX_OFFLOAD_ENABLE */
+       {{0xdfff0000, EMAC_NONE, EMAC_NONE, EMAC_NONE}}         /* HSR_RX_OFFLOAD_DISABLE */
 };
 
 int icssg_set_port_state(struct prueth_emac *emac,

diff --git a/drivers/net/ethernet/ti/icssg/icssg_config.h b/drivers/net/ethernet/ti/icssg/icssg_config.h
index 1ac60283923bd3db0d459a0e06a8c997e2716078..92c2deaa306835ac933f8a9033527c8284f9e0da 100644 (file)
--- a/drivers/net/ethernet/ti/icssg/icssg_config.h
+++ b/drivers/net/ethernet/ti/icssg/icssg_config.h
@@ -80,6 +80,8 @@ enum icssg_port_state_cmd {
        ICSSG_EMAC_PORT_PREMPT_TX_DISABLE,
        ICSSG_EMAC_PORT_VLAN_AWARE_ENABLE,
        ICSSG_EMAC_PORT_VLAN_AWARE_DISABLE,
+       ICSSG_EMAC_HSR_RX_OFFLOAD_ENABLE,
+       ICSSG_EMAC_HSR_RX_OFFLOAD_DISABLE,
        ICSSG_EMAC_PORT_MAX_COMMANDS
 };
 

diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
index b38a4a6072c45cefd3798d07526a1f3a0f468725..d128764982ae42cadb8ca8d968e0877b5cef42d8 100644 (file)
--- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c
+++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c
@@ -41,7 +41,10 @@
 #define DEFAULT_PORT_MASK      1
 #define DEFAULT_UNTAG_MASK     1
 
-#define NETIF_PRUETH_HSR_OFFLOAD_FEATURES      NETIF_F_HW_HSR_FWD
+#define NETIF_PRUETH_HSR_OFFLOAD_FEATURES      (NETIF_F_HW_HSR_FWD | \
+                                                NETIF_F_HW_HSR_DUP | \
+                                                NETIF_F_HW_HSR_TAG_INS | \
+                                                NETIF_F_HW_HSR_TAG_RM)
 
 /* CTRLMMR_ICSSG_RGMII_CTRL register bits */
 #define ICSSG_CTRL_RGMII_ID_MODE                BIT(24)
@@ -744,6 +747,29 @@ static void emac_ndo_set_rx_mode(struct net_device *ndev)
        queue_work(emac->cmd_wq, &emac->rx_mode_work);
 }
 
+static netdev_features_t emac_ndo_fix_features(struct net_device *ndev,
+                                              netdev_features_t features)
+{
+       /* hsr tag insertion offload and hsr dup offload are tightly coupled in
+        * firmware implementation. Both these features need to be enabled /
+        * disabled together.
+        */
+       if (!(ndev->features & (NETIF_F_HW_HSR_DUP | NETIF_F_HW_HSR_TAG_INS)))
+               if ((features & NETIF_F_HW_HSR_DUP) ||
+                   (features & NETIF_F_HW_HSR_TAG_INS))
+                       features |= NETIF_F_HW_HSR_DUP |
+                                   NETIF_F_HW_HSR_TAG_INS;
+
+       if ((ndev->features & NETIF_F_HW_HSR_DUP) ||
+           (ndev->features & NETIF_F_HW_HSR_TAG_INS))
+               if (!(features & NETIF_F_HW_HSR_DUP) ||
+                   !(features & NETIF_F_HW_HSR_TAG_INS))
+                       features &= ~(NETIF_F_HW_HSR_DUP |
+                                     NETIF_F_HW_HSR_TAG_INS);
+
+       return features;
+}
+
 static const struct net_device_ops emac_netdev_ops = {
        .ndo_open = emac_ndo_open,
        .ndo_stop = emac_ndo_stop,
@@ -755,6 +781,7 @@ static const struct net_device_ops emac_netdev_ops = {
        .ndo_eth_ioctl = icssg_ndo_ioctl,
        .ndo_get_stats64 = icssg_ndo_get_stats64,
        .ndo_get_phys_port_name = icssg_ndo_get_phys_port_name,
+       .ndo_fix_features = emac_ndo_fix_features,
 };
 
 static int prueth_netdev_init(struct prueth *prueth,
@@ -981,6 +1008,13 @@ static void icssg_change_mode(struct prueth *prueth)
 
        for (mac = PRUETH_MAC0; mac < PRUETH_NUM_MACS; mac++) {
                emac = prueth->emac[mac];
+               if (prueth->is_hsr_offload_mode) {
+                       if (emac->ndev->features & NETIF_F_HW_HSR_TAG_RM)
+                               icssg_set_port_state(emac, ICSSG_EMAC_HSR_RX_OFFLOAD_ENABLE);
+                       else
+                               icssg_set_port_state(emac, ICSSG_EMAC_HSR_RX_OFFLOAD_DISABLE);
+               }
+
                if (netif_running(emac->ndev)) {
                        icssg_fdb_add_del(emac, eth_stp_addr, prueth->default_vlan,
                                          ICSSG_FDB_ENTRY_P0_MEMBERSHIP |

diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.h b/drivers/net/ethernet/ti/icssg/icssg_prueth.h
index a4b025fae797f05e5922ce47e17f4530d59425fc..bba6da2e6bd8f9dd4dedc19e6f5c6bca6564e8c3 100644 (file)
--- a/drivers/net/ethernet/ti/icssg/icssg_prueth.h
+++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.h
@@ -59,6 +59,9 @@
 
 #define IEP_DEFAULT_CYCLE_TIME_NS      1000000 /* 1 ms */
 
+#define PRUETH_UNDIRECTED_PKT_DST_TAG  0
+#define PRUETH_UNDIRECTED_PKT_TAG_INS  BIT(30)
+
 /* Firmware status codes */
 #define ICSS_HS_FW_READY 0x55555555
 #define ICSS_HS_FW_DEAD 0xDEAD0000     /* lower 16 bits contain error code */