Commit ff0db43c authored Jan 08, 2019 by Nir Dotan Committed by David S. Miller Jan 08, 2019

mlxsw: spectrum_acl: Add cleanup after C-TCAM update error condition



When writing to C-TCAM, mlxsw driver uses cregion->ops->entry_insert().
In case of C-TCAM HW insertion error, the opposite action should take
place.
Add error handling case in which the C-TCAM region entry is removed, by
calling cregion->ops->entry_remove().

Fixes: a0a777b9 ("mlxsw: spectrum_acl: Start using A-TCAM")
Signed-off-by: Nir Dotan <nird@mellanox.com>
Reviewed-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 11287b69

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

+9 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,15 @@ mlxsw_sp_acl_ctcam_region_entry_insert(struct mlxsw_sp *mlxsw_sp,
		act_set = mlxsw_afa_block_first_set(rulei->act_block);
		mlxsw_reg_ptce2_flex_action_set_memcpy_to(ptce2_pl, act_set);

		return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptce2), ptce2_pl);
		err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ptce2), ptce2_pl);
		if (err)
		goto err_ptce2_write;

		return 0;

		err_ptce2_write:
		cregion->ops->entry_remove(cregion, centry);
		return err;
		}

		static void

Admin message