Commit d7953da4 authored by Steen Hegelund's avatar Steen Hegelund Committed by Paolo Abeni
Browse files

net: microchip: sparx5: Clear rule counter even if lookup is disabled 



The rule counter must be cleared when creating a new rule, even if the VCAP
lookup is currently disabled.

This ensures that rules located in VCAPs that use external counters (such
as Sparx5 IS2 and ES0) will have their counter reset even if the VCAP
lookup is not enabled at the moment.

Signed-off-by: default avatarSteen Hegelund <steen.hegelund@microchip.com>
Fixes: 95fa7414 ("net: microchip: sparx5: Reset VCAP counter for new rules")
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 65b66250

drivers/net/ethernet/microchip/vcap/vcap_api.c

+5 −2
Original line number Diff line number Diff line
@@ -2246,6 +2246,11 @@ int vcap_add_rule(struct vcap_rule *rule) 
	if (move.count > 0)

		vcap_move_rules(ri, &move);



	/* Set the counter to zero */

	ret = vcap_write_counter(ri, &ctr);

	if (ret)

		goto out;



	if (ri->state == VCAP_RS_DISABLED) {

		/* Erase the rule area */

		ri->vctrl->ops->init(ri->ndev, ri->admin, ri->addr, ri->size);
@@ -2264,8 +2269,6 @@ int vcap_add_rule(struct vcap_rule *rule) 
		pr_err("%s:%d: rule write error: %d\n", __func__, __LINE__, ret);

		goto out;

	}

	/* Set the counter to zero */

	ret = vcap_write_counter(ri, &ctr);

out:

	mutex_unlock(&ri->admin->lock);

	return ret;

drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c

+2 −2
Original line number Diff line number Diff line
@@ -1337,8 +1337,8 @@ static void vcap_api_encode_rule_test(struct kunit *test) 
	u32 port_mask_rng_mask = 0x0f;

	u32 igr_port_mask_value = 0xffabcd01;

	u32 igr_port_mask_mask = ~0;

	/* counter is written as the last operation */

	u32 expwriteaddr[] = {792, 793, 794, 795, 796, 797, 792};

	/* counter is written as the first operation */

	u32 expwriteaddr[] = {792, 792, 793, 794, 795, 796, 797};

	int idx;



	vcap_test_api_init(&is2_admin);