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

Commit e29237e7 authored by Arkadi Sharshevsky's avatar Arkadi Sharshevsky Committed by David S. Miller
Browse files

mlxsw: spectrum_router: Enable IPv6 router 



Before we add IPv6 constructs like traps and router interfaces, we first
need to enable IPv6 routing in the device.

Signed-off-by: default avatarArkadi Sharshevsky <arkadis@mellanox.com>
Signed-off-by: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7f81ff04

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

+3 −1
Original line number Diff line number Diff line
@@ -3953,10 +3953,12 @@ MLXSW_ITEM32(reg, rgcr, pcp_rw, 0x18, 16, 2); 
 */

MLXSW_ITEM32(reg, rgcr, activity_dis, 0x20, 0, 8);



static inline void mlxsw_reg_rgcr_pack(char *payload, bool ipv4_en)

static inline void mlxsw_reg_rgcr_pack(char *payload, bool ipv4_en,

				       bool ipv6_en)

{

	MLXSW_REG_ZERO(rgcr, payload);

	mlxsw_reg_rgcr_ipv4_en_set(payload, ipv4_en);

	mlxsw_reg_rgcr_ipv6_en_set(payload, ipv6_en);

}



/* RITR - Router Interface Table Register

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

+2 −2
Original line number Diff line number Diff line
@@ -3697,7 +3697,7 @@ static int __mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp) 
		return -EIO;

	max_rifs = MLXSW_CORE_RES_GET(mlxsw_sp->core, MAX_RIFS);



	mlxsw_reg_rgcr_pack(rgcr_pl, true);

	mlxsw_reg_rgcr_pack(rgcr_pl, true, true);

	mlxsw_reg_rgcr_max_router_interfaces_set(rgcr_pl, max_rifs);

	err = mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(rgcr), rgcr_pl);

	if (err)
@@ -3709,7 +3709,7 @@ static void __mlxsw_sp_router_fini(struct mlxsw_sp *mlxsw_sp) 
{

	char rgcr_pl[MLXSW_REG_RGCR_LEN];



	mlxsw_reg_rgcr_pack(rgcr_pl, false);

	mlxsw_reg_rgcr_pack(rgcr_pl, false, false);

	mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(rgcr), rgcr_pl);

}