diff mbox series

[net] mlxsw: spectrum_router: Remove batch neighbour deletion causing FW bug

Message ID 20171217161643.2725-1-jiri@resnulli.us
State Accepted, archived
Delegated to: David Miller
Headers show
Series [net] mlxsw: spectrum_router: Remove batch neighbour deletion causing FW bug | expand

Commit Message

Jiri Pirko Dec. 17, 2017, 4:16 p.m. UTC 
From: Petr Machata <petrm@mellanox.com>

This reverts commit 63dd00fa3e524c27cc0509190084ab147ecc8ae2.

RAUHT DELETE_ALL seems to trigger a bug in FW. That manifests by later
calls to RAUHT ADD of an IPv6 neighbor to fail with "bad parameter"
error code.

Signed-off-by: Petr Machata <petrm@mellanox.com>
Fixes: 63dd00fa3e52 ("mlxsw: spectrum_router: Add batch neighbour deletion")
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
 drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

Comments

David Miller Dec. 19, 2017, 4:08 p.m. UTC | #1 
From: Jiri Pirko <jiri@resnulli.us>
Date: Sun, 17 Dec 2017 17:16:43 +0100

> From: Petr Machata <petrm@mellanox.com>
> 
> This reverts commit 63dd00fa3e524c27cc0509190084ab147ecc8ae2.
> 
> RAUHT DELETE_ALL seems to trigger a bug in FW. That manifests by later
> calls to RAUHT ADD of an IPv6 neighbor to fail with "bad parameter"
> error code.
> 
> Signed-off-by: Petr Machata <petrm@mellanox.com>
> Fixes: 63dd00fa3e52 ("mlxsw: spectrum_router: Add batch neighbour deletion")
> Reviewed-by: Ido Schimmel <idosch@mellanox.com>
> Signed-off-by: Jiri Pirko <jiri@mellanox.com>

Applied.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
index 72ef4f8..be657b8 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
@@ -2436,25 +2436,16 @@  static void mlxsw_sp_neigh_fini(struct mlxsw_sp *mlxsw_sp)
 	rhashtable_destroy(&mlxsw_sp->router->neigh_ht);
 }
 
-static int mlxsw_sp_neigh_rif_flush(struct mlxsw_sp *mlxsw_sp,
-				    const struct mlxsw_sp_rif *rif)
-{
-	char rauht_pl[MLXSW_REG_RAUHT_LEN];
-
-	mlxsw_reg_rauht_pack(rauht_pl, MLXSW_REG_RAUHT_OP_WRITE_DELETE_ALL,
-			     rif->rif_index, rif->addr);
-	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(rauht), rauht_pl);
-}
-
 static void mlxsw_sp_neigh_rif_gone_sync(struct mlxsw_sp *mlxsw_sp,
 					 struct mlxsw_sp_rif *rif)
 {
 	struct mlxsw_sp_neigh_entry *neigh_entry, *tmp;
 
-	mlxsw_sp_neigh_rif_flush(mlxsw_sp, rif);
 	list_for_each_entry_safe(neigh_entry, tmp, &rif->neigh_list,
-				 rif_list_node)
+				 rif_list_node) {
+		mlxsw_sp_neigh_entry_update(mlxsw_sp, neigh_entry, false);
 		mlxsw_sp_neigh_entry_destroy(mlxsw_sp, neigh_entry);
+	}
 }
 
 enum mlxsw_sp_nexthop_type {