Commit a82feba6 authored by Amit Cohen's avatar Amit Cohen Committed by David S. Miller
Browse files

mlxsw: Create separate ipip_ops_arr for different ASICs 



Currently, there is support for IP-in-IP only with IPv4 underlay for all
supported Spectrum ASICs.
The next patches will add support for IPv6 underlay only for Spectrum-2
and above.

Add infrastructure for splitting IP-in-IP support between different
ASICs - create separate ipip_ops_arr and add ipips_init function to set the
right ops.

Signed-off-by: default avatarAmit Cohen <amcohen@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 36c2ab89

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

+5 −1
Original line number Diff line number Diff line
@@ -324,7 +324,11 @@ static const struct mlxsw_sp_ipip_ops mlxsw_sp_ipip_gre4_ops = { 
	.ol_netdev_change = mlxsw_sp_ipip_ol_netdev_change_gre4,

};



const struct mlxsw_sp_ipip_ops *mlxsw_sp_ipip_ops_arr[] = {

const struct mlxsw_sp_ipip_ops *mlxsw_sp1_ipip_ops_arr[] = {

	[MLXSW_SP_IPIP_TYPE_GRE4] = &mlxsw_sp_ipip_gre4_ops,

};



const struct mlxsw_sp_ipip_ops *mlxsw_sp2_ipip_ops_arr[] = {

	[MLXSW_SP_IPIP_TYPE_GRE4] = &mlxsw_sp_ipip_gre4_ops,

};

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

+2 −1
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ struct mlxsw_sp_ipip_ops { 
				struct netlink_ext_ack *extack);

};



extern const struct mlxsw_sp_ipip_ops *mlxsw_sp_ipip_ops_arr[];

extern const struct mlxsw_sp_ipip_ops *mlxsw_sp1_ipip_ops_arr[];

extern const struct mlxsw_sp_ipip_ops *mlxsw_sp2_ipip_ops_arr[];



#endif /* _MLXSW_IPIP_H_*/

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

+16 −2
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ struct mlxsw_sp_rif_ops { 


struct mlxsw_sp_router_ops {

	int (*init)(struct mlxsw_sp *mlxsw_sp);

	int (*ipips_init)(struct mlxsw_sp *mlxsw_sp);

};



static struct mlxsw_sp_rif *
@@ -9468,7 +9469,6 @@ static int mlxsw_sp_ipips_init(struct mlxsw_sp *mlxsw_sp) 
{

	int err;



	mlxsw_sp->router->ipip_ops_arr = mlxsw_sp_ipip_ops_arr;

	INIT_LIST_HEAD(&mlxsw_sp->router->ipip_list);



	err = mlxsw_sp_ipip_ecn_encap_init(mlxsw_sp);
@@ -9481,6 +9481,18 @@ static int mlxsw_sp_ipips_init(struct mlxsw_sp *mlxsw_sp) 
	return mlxsw_sp_ipip_config_tigcr(mlxsw_sp);

}



static int mlxsw_sp1_ipips_init(struct mlxsw_sp *mlxsw_sp)

{

	mlxsw_sp->router->ipip_ops_arr = mlxsw_sp1_ipip_ops_arr;

	return mlxsw_sp_ipips_init(mlxsw_sp);

}



static int mlxsw_sp2_ipips_init(struct mlxsw_sp *mlxsw_sp)

{

	mlxsw_sp->router->ipip_ops_arr = mlxsw_sp2_ipip_ops_arr;

	return mlxsw_sp_ipips_init(mlxsw_sp);

}



static void mlxsw_sp_ipips_fini(struct mlxsw_sp *mlxsw_sp)

{

	WARN_ON(!list_empty(&mlxsw_sp->router->ipip_list));
@@ -9895,6 +9907,7 @@ static int mlxsw_sp1_router_init(struct mlxsw_sp *mlxsw_sp) 


const struct mlxsw_sp_router_ops mlxsw_sp1_router_ops = {

	.init = mlxsw_sp1_router_init,

	.ipips_init = mlxsw_sp1_ipips_init,

};



static int mlxsw_sp2_router_init(struct mlxsw_sp *mlxsw_sp)
@@ -9910,6 +9923,7 @@ static int mlxsw_sp2_router_init(struct mlxsw_sp *mlxsw_sp) 


const struct mlxsw_sp_router_ops mlxsw_sp2_router_ops = {

	.init = mlxsw_sp2_router_init,

	.ipips_init = mlxsw_sp2_ipips_init,

};



int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp,
@@ -9955,7 +9969,7 @@ int mlxsw_sp_router_init(struct mlxsw_sp *mlxsw_sp, 
	if (err)

		goto err_rifs_init;



	err = mlxsw_sp_ipips_init(mlxsw_sp);

	err = mlxsw_sp->router_ops->ipips_init(mlxsw_sp);

	if (err)

		goto err_ipips_init;