mlxsw: Make PMAOS pack function more generic

idosch · davem330 · commit 8f4ebdb0a274 · 2021-09-15T16:17:16.000+01:00
The PMAOS register has enable bits (e.g., PMAOS.ee) that allow changing
only a subset of the fields, which is exactly what subsequent patches
will need to do. Instead of passing multiple arguments to its pack
function, only pass the module index and let the rest be set by the
different callers.

No functional changes intended.

Signed-off-by: Ido Schimmel &lt;idosch@nvidia.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core_env.c b/drivers/net/ethernet/mellanox/mlxsw/core_env.c
@@ -684,8 +684,10 @@ mlxsw_env_module_oper_state_event_enable(struct mlxsw_core *mlxsw_core,
 	for (i = 0; i < module_count; i++) {
 		char pmaos_pl[MLXSW_REG_PMAOS_LEN];
 
-		mlxsw_reg_pmaos_pack(pmaos_pl, i,
-				     MLXSW_REG_PMAOS_E_GENERATE_EVENT);
+		mlxsw_reg_pmaos_pack(pmaos_pl, i);
+		mlxsw_reg_pmaos_e_set(pmaos_pl,
+				      MLXSW_REG_PMAOS_E_GENERATE_EVENT);
+		mlxsw_reg_pmaos_ee_set(pmaos_pl, true);
 		err = mlxsw_reg_write(mlxsw_core, MLXSW_REG(pmaos), pmaos_pl);
 		if (err)
 			return err;
diff --git a/drivers/net/ethernet/mellanox/mlxsw/reg.h b/drivers/net/ethernet/mellanox/mlxsw/reg.h
@@ -5747,13 +5747,10 @@ enum mlxsw_reg_pmaos_e {
  */
 MLXSW_ITEM32(reg, pmaos, e, 0x04, 0, 2);
 
-static inline void mlxsw_reg_pmaos_pack(char *payload, u8 module,
-					enum mlxsw_reg_pmaos_e e)
+static inline void mlxsw_reg_pmaos_pack(char *payload, u8 module)
 {
 	MLXSW_REG_ZERO(pmaos, payload);
 	mlxsw_reg_pmaos_module_set(payload, module);
-	mlxsw_reg_pmaos_e_set(payload, e);
-	mlxsw_reg_pmaos_ee_set(payload, true);
 }
 
 /* PPLR - Port Physical Loopback Register

Original file line number	Diff line number	Diff line change
`@@ -5747,13 +5747,10 @@ enum mlxsw_reg_pmaos_e {`
`5747`	`5747`	`*/`
`5748`	`5748`	`MLXSW_ITEM32(reg, pmaos, e, 0x04, 0, 2);`
`5749`	`5749`
`5750`		`-static inline void mlxsw_reg_pmaos_pack(char *payload, u8 module,`
`5751`		`- enum mlxsw_reg_pmaos_e e)`
	`5750`	`+static inline void mlxsw_reg_pmaos_pack(char *payload, u8 module)`
`5752`	`5751`	`{`
`5753`	`5752`	`MLXSW_REG_ZERO(pmaos, payload);`
`5754`	`5753`	`mlxsw_reg_pmaos_module_set(payload, module);`
`5755`		`- mlxsw_reg_pmaos_e_set(payload, e);`
`5756`		`- mlxsw_reg_pmaos_ee_set(payload, true);`
`5757`	`5754`	`}`
`5758`	`5755`
`5759`	`5756`	`/* PPLR - Port Physical Loopback Register`