Commit d2760abd authored by Saeed Mahameed's avatar Saeed Mahameed Committed by Jakub Kicinski
Browse files

net/mlx5e: SHAMPO: Improve hw gro capability checking 



Add missing HW capabilities, declare the feature in
netdev->vlan_features, similar to other features in mlx5e_build_nic_netdev.
No functional change here as all by default disabled features are
explicitly disabled at the bottom of the function.

Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Reviewed-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarMark Bloch <mbloch@nvidia.com>
Link: https://patch.msgid.link/20250616141441.1243044-7-mbloch@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 16142def

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+7 −6
Original line number Diff line number Diff line
@@ -78,7 +78,8 @@ 


static bool mlx5e_hw_gro_supported(struct mlx5_core_dev *mdev)

{

	if (!MLX5_CAP_GEN(mdev, shampo))

	if (!MLX5_CAP_GEN(mdev, shampo) ||

	    !MLX5_CAP_SHAMPO(mdev, shampo_header_split_data_merge))

		return false;



	/* Our HW-GRO implementation relies on "KSM Mkey" for
@@ -5499,17 +5500,17 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 
						   MLX5E_MPWRQ_UMR_MODE_ALIGNED))

		netdev->vlan_features    |= NETIF_F_LRO;



	if (mlx5e_hw_gro_supported(mdev) &&

	    mlx5e_check_fragmented_striding_rq_cap(mdev, PAGE_SHIFT,

						   MLX5E_MPWRQ_UMR_MODE_ALIGNED))

		netdev->vlan_features |= NETIF_F_GRO_HW;



	netdev->hw_features       = netdev->vlan_features;

	netdev->hw_features      |= NETIF_F_HW_VLAN_CTAG_TX;

	netdev->hw_features      |= NETIF_F_HW_VLAN_CTAG_RX;

	netdev->hw_features      |= NETIF_F_HW_VLAN_CTAG_FILTER;

	netdev->hw_features      |= NETIF_F_HW_VLAN_STAG_TX;



	if (mlx5e_hw_gro_supported(mdev) &&

	    mlx5e_check_fragmented_striding_rq_cap(mdev, PAGE_SHIFT,

						   MLX5E_MPWRQ_UMR_MODE_ALIGNED))

		netdev->hw_features    |= NETIF_F_GRO_HW;



	if (mlx5e_tunnel_any_tx_proto_supported(mdev)) {

		netdev->hw_enc_features |= NETIF_F_HW_CSUM;

		netdev->hw_enc_features |= NETIF_F_TSO;