bnxt_en: Configure UDP tunnel TPA

On the new P7 chips, TPA for tunnel packets can be independently
enabled for each VNIC.  The default TPA configuration should not
include UDP tunnels because the UDP ports for these tunnels are not
known yet.  The chip should not aggregate these UDP tunneled packets
using default UDP ports until the ports are known.

Add a new function bnxt_hwrm_vnic_update_tunl_tpa() to enable VXLAN
and Geneve TPA if the corresponding UDP ports are known.

Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Link: https://lore.kernel.org/r/20231212005122.2401-10-michael.chan@broadcom.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index b9eb3e0c5995af4f630c0910b8c9bcd4369f11d6..3594290e187aca53f0d9e70c372b0a2a6a88eec8 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -5150,6 +5150,8 @@ int bnxt_hwrm_func_drv_unrgtr(struct bnxt *bp)
        return hwrm_req_send(bp, req);
 }
 
+static int bnxt_set_tpa(struct bnxt *bp, bool set_tpa);
+
 static int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, u8 tunnel_type)
 {
        struct hwrm_tunnel_dst_port_free_input *req;
@@ -5192,6 +5194,8 @@ static int bnxt_hwrm_tunnel_dst_port_free(struct bnxt *bp, u8 tunnel_type)
        if (rc)
                netdev_err(bp->dev, "hwrm_tunnel_dst_port_free failed. rc:%d\n",
                           rc);
+       if (bp->flags & BNXT_FLAG_TPA)
+               bnxt_set_tpa(bp, true);
        return rc;
 }
 
@@ -5235,6 +5239,8 @@ static int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, __be16 port,
        default:
                break;
        }
+       if (bp->flags & BNXT_FLAG_TPA)
+               bnxt_set_tpa(bp, true);
 
 err_out:
        hwrm_req_drop(bp, req);
@@ -5427,6 +5433,30 @@ static int bnxt_hwrm_clear_vnic_filter(struct bnxt *bp)
        return rc;
 }
 
+#define BNXT_DFLT_TUNL_TPA_BMAP                                \
+       (VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_GRE |       \
+        VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_IPV4 |      \
+        VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_IPV6)
+
+static void bnxt_hwrm_vnic_update_tunl_tpa(struct bnxt *bp,
+                                          struct hwrm_vnic_tpa_cfg_input *req)
+{
+       u32 tunl_tpa_bmap = BNXT_DFLT_TUNL_TPA_BMAP;
+
+       if (!(bp->fw_cap & BNXT_FW_CAP_VNIC_TUNNEL_TPA))
+               return;
+
+       if (bp->vxlan_port)
+               tunl_tpa_bmap |= VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_VXLAN;
+       if (bp->vxlan_gpe_port)
+               tunl_tpa_bmap |= VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_VXLAN_GPE;
+       if (bp->nge_port)
+               tunl_tpa_bmap |= VNIC_TPA_CFG_REQ_TNL_TPA_EN_BITMAP_GENEVE;
+
+       req->enables |= cpu_to_le32(VNIC_TPA_CFG_REQ_ENABLES_TNL_TPA_EN);
+       req->tnl_tpa_en_bitmap = cpu_to_le32(tunl_tpa_bmap);
+}
+
 static int bnxt_hwrm_vnic_set_tpa(struct bnxt *bp, u16 vnic_id, u32 tpa_flags)
 {
        struct bnxt_vnic_info *vnic = &bp->vnic_info[vnic_id];
@@ -5483,6 +5513,7 @@ static int bnxt_hwrm_vnic_set_tpa(struct bnxt *bp, u16 vnic_id, u32 tpa_flags)
                req->max_aggs = cpu_to_le16(max_aggs);
 
                req->min_agg_len = cpu_to_le32(512);
+               bnxt_hwrm_vnic_update_tunl_tpa(bp, req);
        }
        req->vnic_id = cpu_to_le16(vnic->fw_vnic_id);
 
@@ -5977,6 +6008,8 @@ static int bnxt_hwrm_vnic_qcaps(struct bnxt *bp)
                        else
                                bp->hw_ring_stats_size = BNXT_RING_STATS_SIZE_P7;
                }
+               if (flags & VNIC_QCAPS_RESP_FLAGS_HW_TUNNEL_TPA_CAP)
+                       bp->fw_cap |= BNXT_FW_CAP_VNIC_TUNNEL_TPA;
        }
        hwrm_req_drop(bp, req);
        return rc;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 609f4073f5ff6e88b7f47a5233d49185a571f089..15d33f4a61c2234c134a16f17d510df21dd3bb02 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -2240,6 +2240,7 @@ struct bnxt {
        #define BNXT_FW_CAP_DFLT_VLAN_TPID_PCP          BIT_ULL(34)
        #define BNXT_FW_CAP_PRE_RESV_VNICS              BIT_ULL(35)
        #define BNXT_FW_CAP_BACKING_STORE_V2            BIT_ULL(36)
+       #define BNXT_FW_CAP_VNIC_TUNNEL_TPA             BIT_ULL(37)
 
        u32                     fw_dbg_cap;