Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d937552 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlxsw-Misc-updates' 



Ido Schimmel says:

====================
mlxsw: Misc updates

This patchset contains miscellaneous patches we gathered in our queue.
Some of them are dependencies of larger patchsets that I will submit
later this cycle.

Patches #1-#3 perform small non-functional changes in mlxsw.

Patch #4 adds more extended ack messages in mlxsw.

Patch #5 adds devlink parameters documentation for mlxsw. To be extended
with more parameters this cycle.

Patches #6-#7 perform small changes in forwarding selftests
infrastructure.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 889865cf 3cab0de9

Documentation/networking/devlink-params-mlxsw.txt

0 → 100644
+2 −0
Original line number Diff line number Diff line 
fw_load_policy		[DEVICE, GENERIC]

			Configuration mode: driverinit

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+1 −2
Original line number Diff line number Diff line
@@ -721,8 +721,7 @@ struct mlxsw_sp_acl_tcam_ops { 
			  void *region_priv, void *chunk_priv,

			  void *entry_priv);

	int (*entry_action_replace)(struct mlxsw_sp *mlxsw_sp,

				    void *region_priv, void *chunk_priv,

				    void *entry_priv,

				    void *region_priv, void *entry_priv,

				    struct mlxsw_sp_acl_rule_info *rulei);

	int (*entry_activity_get)(struct mlxsw_sp *mlxsw_sp,

				  void *region_priv, void *entry_priv,

drivers/net/ethernet/mellanox/mlxsw/spectrum1_acl_tcam.c

+1 −2
Original line number Diff line number Diff line
@@ -194,8 +194,7 @@ static void mlxsw_sp1_acl_tcam_entry_del(struct mlxsw_sp *mlxsw_sp, 


static int

mlxsw_sp1_acl_tcam_entry_action_replace(struct mlxsw_sp *mlxsw_sp,

					void *region_priv, void *chunk_priv,

					void *entry_priv,

					void *region_priv, void *entry_priv,

					struct mlxsw_sp_acl_rule_info *rulei)

{

	return -EOPNOTSUPP;

drivers/net/ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c

+1 −4
Original line number Diff line number Diff line
@@ -212,18 +212,15 @@ static void mlxsw_sp2_acl_tcam_entry_del(struct mlxsw_sp *mlxsw_sp, 


static int

mlxsw_sp2_acl_tcam_entry_action_replace(struct mlxsw_sp *mlxsw_sp,

					void *region_priv, void *chunk_priv,

					void *entry_priv,

					void *region_priv, void *entry_priv,

					struct mlxsw_sp_acl_rule_info *rulei)

{

	struct mlxsw_sp2_acl_tcam_region *region = region_priv;

	struct mlxsw_sp2_acl_tcam_chunk *chunk = chunk_priv;

	struct mlxsw_sp2_acl_tcam_entry *entry = entry_priv;



	entry->act_block = rulei->act_block;

	return mlxsw_sp_acl_atcam_entry_action_replace(mlxsw_sp,

						       &region->aregion,

						       &chunk->achunk,

						       &entry->aentry, rulei);

}

drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c

+3 −4
Original line number Diff line number Diff line
@@ -742,8 +742,7 @@ int mlxsw_sp_acl_rule_action_replace(struct mlxsw_sp *mlxsw_sp, 
	rulei = mlxsw_sp_acl_rule_rulei(rule);

	rulei->act_block = afa_block;



	return ops->rule_action_replace(mlxsw_sp, ruleset->priv, rule->priv,

					rule->rulei);

	return ops->rule_action_replace(mlxsw_sp, rule->priv, rule->rulei);

}



struct mlxsw_sp_acl_rule *
@@ -806,7 +805,7 @@ static void mlxsw_sp_acl_rule_activity_work_schedule(struct mlxsw_sp_acl *acl) 
			       msecs_to_jiffies(interval));

}



static void mlxsw_sp_acl_rul_activity_update_work(struct work_struct *work)

static void mlxsw_sp_acl_rule_activity_update_work(struct work_struct *work)

{

	struct mlxsw_sp_acl *acl = container_of(work, struct mlxsw_sp_acl,

						rule_activity_update.dw.work);
@@ -885,7 +884,7 @@ int mlxsw_sp_acl_init(struct mlxsw_sp *mlxsw_sp) 


	/* Create the delayed work for the rule activity_update */

	INIT_DELAYED_WORK(&acl->rule_activity_update.dw,

			  mlxsw_sp_acl_rul_activity_update_work);

			  mlxsw_sp_acl_rule_activity_update_work);

	acl->rule_activity_update.interval = MLXSW_SP_ACL_RULE_ACTIVITY_UPDATE_PERIOD_MS;

	mlxsw_core_schedule_dw(&acl->rule_activity_update.dw, 0);

	return 0;