Skip to contentSkip to conversation

net/mlx5e: Cleanup unused defines

PATCH Applied Gal Pressman 2 participants 4 messages Nov 8, 2018 – Nov 9, 2018

Subsystems (4)
Networking Network drivers Mellanox mlx5 core Mellanox MLX5 IB driver
lore
Share & tools
lore

Gal Pressman

author
#0 lore raw

PATCH 1/2 net/mlx5e: Cleanup unused defines

Remove couple of defines that are no longer used.

Signed-off-by Gal Pressman <[email protected]>
---
 drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 ---
 1 file changed, 3 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en.h +0 -3
index d7fbd5b6ac95..c49c87615686 100644
@@ -147,9 +147,6 @@ struct page_pool;
 	       MLX5_UMR_MTT_ALIGNMENT))
 #define MLX5E_UMR_WQEBBS \
 	(DIV_ROUND_UP(MLX5E_UMR_WQE_INLINE_SZ, MLX5_SEND_WQE_BB))
-#define MLX5E_ICOSQ_MAX_WQEBBS MLX5E_UMR_WQEBBS
-
-#define MLX5E_NUM_MAIN_GROUPS 9
 
 #define MLX5E_MSG_LEVEL			NETIF_MSG_LINK
Signature · 1 line
2.14.4
author
#1 lore raw

PATCH 2/2 net/mlx5: Fix offsets of ifc reserved fields

Fix wrong offsets of reserved fields in ifc file.
Issues found using pahole.

Signed-off-by Gal Pressman <[email protected]>
---
 include/linux/mlx5/mlx5_ifc.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
include/linux/mlx5/mlx5_ifc.h +5 -5
index dbff9ff28f2c..79b77fc62271 100644
@@ -349,7 +349,7 @@ struct mlx5_ifc_flow_table_prop_layout_bits {
 	u8	   reformat_l3_tunnel_to_l2[0x1];
 	u8	   reformat_l2_to_l3_tunnel[0x1];
 	u8	   reformat_and_modify_action[0x1];
-	u8         reserved_at_14[0xb];
+	u8         reserved_at_15[0xb];
 	u8         reserved_at_20[0x2];
 	u8         log_max_ft_size[0x6];
 	u8         log_max_modify_header_context[0x8];

@@ -586,7 +586,7 @@ struct mlx5_ifc_flow_table_eswitch_cap_bits {
 	u8      fdb_multi_path_to_table[0x1];
 	u8      reserved_at_1d[0x1];
 	u8      multi_fdb_encap[0x1];
-	u8      reserved_at_1e[0x1e1];
+	u8      reserved_at_1f[0x1e1];
 
 	struct mlx5_ifc_flow_table_prop_layout_bits flow_table_properties_nic_esw_fdb;
 

@@ -829,7 +829,7 @@ struct mlx5_ifc_vector_calc_cap_bits {
 	struct mlx5_ifc_calc_op calc2;
 	struct mlx5_ifc_calc_op calc3;
 
-	u8         reserved_at_e0[0x720];
+	u8         reserved_at_c0[0x720];
 };
 
 enum {

@@ -5566,7 +5566,7 @@ struct mlx5_ifc_modify_nic_vport_context_out_bits {
 struct mlx5_ifc_modify_nic_vport_field_select_bits {
 	u8         reserved_at_0[0x12];
 	u8	   affiliation[0x1];
-	u8	   reserved_at_e[0x1];
+	u8	   reserved_at_13[0x1];
 	u8         disable_uc_local_lb[0x1];
 	u8         disable_mc_local_lb[0x1];
 	u8         node_guid[0x1];

@@ -9024,7 +9024,7 @@ struct mlx5_ifc_dcbx_param_bits {
 	u8         dcbx_cee_cap[0x1];
 	u8         dcbx_ieee_cap[0x1];
 	u8         dcbx_standby_cap[0x1];
-	u8         reserved_at_0[0x5];
+	u8         reserved_at_3[0x5];
 	u8         port_number[0x8];
 	u8         reserved_at_10[0xa];
 	u8         max_application_table_size[6];
Signature · 1 line
2.14.4
Applied
#2 lore raw

Re: [PATCH net-next 2/2] net/mlx5: Fix offsets of ifc reserved fields

Quoted 5 lines · Gal Pressman

Fix wrong offsets of reserved fields in ifc file.
Issues found using pahole.

Signed-off-by Gal Pressman <[email protected]>

---

Applied to mlx5-next branch will be sent later in a pull request to the netdev maintainer.

Thanks,
Saeed.