net: microchip: sparx5: Reset VCAP counter for new rules

When a rule counter is external to the VCAP such as the Sparx5 IS2 counters
are, then this counter must be reset when a new rule is created.

Signed-off-by: Steen Hegelund <steen.hegelund@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api.c b/drivers/net/ethernet/microchip/vcap/vcap_api.c
index b9b6432f4094160d52be7b6dfb9227aa21bdd1f4..8bbbd1b0b55225e0e1563269917e49324cd7d044 100644 (file)
--- a/drivers/net/ethernet/microchip/vcap/vcap_api.c
+++ b/drivers/net/ethernet/microchip/vcap/vcap_api.c
@@ -1808,6 +1808,7 @@ int vcap_add_rule(struct vcap_rule *rule)
 {
        struct vcap_rule_internal *ri = to_intrule(rule);
        struct vcap_rule_move move = {0};
+       struct vcap_counter ctr = {0};
        int ret;
 
        ret = vcap_api_check(ri->vctrl);
@@ -1831,8 +1832,12 @@ int vcap_add_rule(struct vcap_rule *rule)
        }
 
        ret = vcap_write_rule(ri);
-       if (ret)
+       if (ret) {
                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;

diff --git a/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c b/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
index 76a31215ebfbfaea97b68f186cea80ed04705a51..944de5cb9114236f9f0fc74c73f04f80624638d9 100644 (file)
--- a/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
+++ b/drivers/net/ethernet/microchip/vcap/vcap_api_kunit.c
@@ -1343,8 +1343,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 not written yet, so it is not in expwriteaddr */
-       u32 expwriteaddr[] = {792, 793, 794, 795, 796, 797, 0};
+       /* counter is written as the last operation */
+       u32 expwriteaddr[] = {792, 793, 794, 795, 796, 797, 792};
        int idx;
 
        vcap_test_api_init(&is2_admin);