Commit d57ff022 authored by Jiri Pirko's avatar Jiri Pirko Committed by Jakub Kicinski
Browse files

mlxsw: spectrum_router: Use RALUE-independent op arg 



Since the write/delete of FIB entry is going to be implemented by XMDR
register for XM implementation, introduce RALUE-independent enum for op
so the enum could be used in both RALUE and XMDR.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 69ba53e7

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

+16 −3
Original line number Diff line number Diff line
@@ -183,12 +183,25 @@ mlxsw_sp_ipip_fib_entry_op_gre4_rtdp(struct mlxsw_sp *mlxsw_sp, 
static int

mlxsw_sp_ipip_fib_entry_op_gre4_ralue(struct mlxsw_sp *mlxsw_sp,

				      u32 dip, u8 prefix_len, u16 ul_vr_id,

				      enum mlxsw_reg_ralue_op op,

				      enum mlxsw_sp_fib_entry_op op,

				      u32 tunnel_index)

{

	char ralue_pl[MLXSW_REG_RALUE_LEN];

	enum mlxsw_reg_ralue_op ralue_op;



	mlxsw_reg_ralue_pack4(ralue_pl, MLXSW_REG_RALXX_PROTOCOL_IPV4, op,

	switch (op) {

	case MLXSW_SP_FIB_ENTRY_OP_WRITE:

		ralue_op = MLXSW_REG_RALUE_OP_WRITE_WRITE;

		break;

	case MLXSW_SP_FIB_ENTRY_OP_DELETE:

		ralue_op = MLXSW_REG_RALUE_OP_WRITE_DELETE;

		break;

	default:

		WARN_ON_ONCE(1);

		return -EINVAL;

	}



	mlxsw_reg_ralue_pack4(ralue_pl, MLXSW_REG_RALXX_PROTOCOL_IPV4, ralue_op,

			      ul_vr_id, prefix_len, dip);

	mlxsw_reg_ralue_act_ip2me_tun_pack(ralue_pl, tunnel_index);

	return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ralue), ralue_pl);
@@ -196,7 +209,7 @@ mlxsw_sp_ipip_fib_entry_op_gre4_ralue(struct mlxsw_sp *mlxsw_sp, 


static int mlxsw_sp_ipip_fib_entry_op_gre4(struct mlxsw_sp *mlxsw_sp,

					struct mlxsw_sp_ipip_entry *ipip_entry,

					enum mlxsw_reg_ralue_op op,

					enum mlxsw_sp_fib_entry_op op,

					u32 tunnel_index)

{

	u16 ul_vr_id = mlxsw_sp_ipip_lb_ul_vr_id(ipip_entry->ol_lb);

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

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct mlxsw_sp_ipip_ops { 


	int (*fib_entry_op)(struct mlxsw_sp *mlxsw_sp,

			    struct mlxsw_sp_ipip_entry *ipip_entry,

			    enum mlxsw_reg_ralue_op op,

			    enum mlxsw_sp_fib_entry_op op,

			    u32 tunnel_index);



	int (*ol_netdev_change)(struct mlxsw_sp *mlxsw_sp,

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

+30 −17
Original line number Diff line number Diff line
@@ -4293,13 +4293,13 @@ mlxsw_sp_fib_entry_hw_flags_clear(struct mlxsw_sp *mlxsw_sp, 
static void

mlxsw_sp_fib_entry_hw_flags_refresh(struct mlxsw_sp *mlxsw_sp,

				    struct mlxsw_sp_fib_entry *fib_entry,

				    enum mlxsw_reg_ralue_op op)

				    enum mlxsw_sp_fib_entry_op op)

{

	switch (op) {

	case MLXSW_REG_RALUE_OP_WRITE_WRITE:

	case MLXSW_SP_FIB_ENTRY_OP_WRITE:

		mlxsw_sp_fib_entry_hw_flags_set(mlxsw_sp, fib_entry);

		break;

	case MLXSW_REG_RALUE_OP_WRITE_DELETE:

	case MLXSW_SP_FIB_ENTRY_OP_DELETE:

		mlxsw_sp_fib_entry_hw_flags_clear(mlxsw_sp, fib_entry);

		break;

	default:
@@ -4310,23 +4310,36 @@ mlxsw_sp_fib_entry_hw_flags_refresh(struct mlxsw_sp *mlxsw_sp, 
static void

mlxsw_sp_fib_entry_ralue_pack(char *ralue_pl,

			      const struct mlxsw_sp_fib_entry *fib_entry,

			      enum mlxsw_reg_ralue_op op)

			      enum mlxsw_sp_fib_entry_op op)

{

	struct mlxsw_sp_fib *fib = fib_entry->fib_node->fib;

	enum mlxsw_reg_ralxx_protocol proto;

	enum mlxsw_reg_ralue_op ralue_op;

	u32 *p_dip;



	proto = (enum mlxsw_reg_ralxx_protocol) fib->proto;



	switch (op) {

	case MLXSW_SP_FIB_ENTRY_OP_WRITE:

		ralue_op = MLXSW_REG_RALUE_OP_WRITE_WRITE;

		break;

	case MLXSW_SP_FIB_ENTRY_OP_DELETE:

		ralue_op = MLXSW_REG_RALUE_OP_WRITE_DELETE;

		break;

	default:

		WARN_ON_ONCE(1);

		return;

	}



	switch (fib->proto) {

	case MLXSW_SP_L3_PROTO_IPV4:

		p_dip = (u32 *) fib_entry->fib_node->key.addr;

		mlxsw_reg_ralue_pack4(ralue_pl, proto, op, fib->vr->id,

		mlxsw_reg_ralue_pack4(ralue_pl, proto, ralue_op, fib->vr->id,

				      fib_entry->fib_node->key.prefix_len,

				      *p_dip);

		break;

	case MLXSW_SP_L3_PROTO_IPV6:

		mlxsw_reg_ralue_pack6(ralue_pl, proto, op, fib->vr->id,

		mlxsw_reg_ralue_pack6(ralue_pl, proto, ralue_op, fib->vr->id,

				      fib_entry->fib_node->key.prefix_len,

				      fib_entry->fib_node->key.addr);

		break;
@@ -4368,7 +4381,7 @@ static int mlxsw_sp_adj_discard_write(struct mlxsw_sp *mlxsw_sp, u16 rif_index) 


static int mlxsw_sp_fib_entry_op_remote(struct mlxsw_sp *mlxsw_sp,

					struct mlxsw_sp_fib_entry *fib_entry,

					enum mlxsw_reg_ralue_op op)

					enum mlxsw_sp_fib_entry_op op)

{

	struct mlxsw_sp_nexthop_group *nh_group = fib_entry->nh_group;

	char ralue_pl[MLXSW_REG_RALUE_LEN];
@@ -4408,7 +4421,7 @@ static int mlxsw_sp_fib_entry_op_remote(struct mlxsw_sp *mlxsw_sp, 


static int mlxsw_sp_fib_entry_op_local(struct mlxsw_sp *mlxsw_sp,

				       struct mlxsw_sp_fib_entry *fib_entry,

				       enum mlxsw_reg_ralue_op op)

				       enum mlxsw_sp_fib_entry_op op)

{

	struct mlxsw_sp_rif *rif = fib_entry->nh_group->nh_rif;

	enum mlxsw_reg_ralue_trap_action trap_action;
@@ -4432,7 +4445,7 @@ static int mlxsw_sp_fib_entry_op_local(struct mlxsw_sp *mlxsw_sp, 


static int mlxsw_sp_fib_entry_op_trap(struct mlxsw_sp *mlxsw_sp,

				      struct mlxsw_sp_fib_entry *fib_entry,

				      enum mlxsw_reg_ralue_op op)

				      enum mlxsw_sp_fib_entry_op op)

{

	char ralue_pl[MLXSW_REG_RALUE_LEN];
@@ -4443,7 +4456,7 @@ static int mlxsw_sp_fib_entry_op_trap(struct mlxsw_sp *mlxsw_sp, 


static int mlxsw_sp_fib_entry_op_blackhole(struct mlxsw_sp *mlxsw_sp,

					   struct mlxsw_sp_fib_entry *fib_entry,

					   enum mlxsw_reg_ralue_op op)

					   enum mlxsw_sp_fib_entry_op op)

{

	enum mlxsw_reg_ralue_trap_action trap_action;

	char ralue_pl[MLXSW_REG_RALUE_LEN];
@@ -4457,7 +4470,7 @@ static int mlxsw_sp_fib_entry_op_blackhole(struct mlxsw_sp *mlxsw_sp, 
static int

mlxsw_sp_fib_entry_op_unreachable(struct mlxsw_sp *mlxsw_sp,

				  struct mlxsw_sp_fib_entry *fib_entry,

				  enum mlxsw_reg_ralue_op op)

				  enum mlxsw_sp_fib_entry_op op)

{

	enum mlxsw_reg_ralue_trap_action trap_action;

	char ralue_pl[MLXSW_REG_RALUE_LEN];
@@ -4474,7 +4487,7 @@ mlxsw_sp_fib_entry_op_unreachable(struct mlxsw_sp *mlxsw_sp, 
static int

mlxsw_sp_fib_entry_op_ipip_decap(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_fib_entry *fib_entry,

				 enum mlxsw_reg_ralue_op op)

				 enum mlxsw_sp_fib_entry_op op)

{

	struct mlxsw_sp_ipip_entry *ipip_entry = fib_entry->decap.ipip_entry;

	const struct mlxsw_sp_ipip_ops *ipip_ops;
@@ -4489,7 +4502,7 @@ mlxsw_sp_fib_entry_op_ipip_decap(struct mlxsw_sp *mlxsw_sp, 


static int mlxsw_sp_fib_entry_op_nve_decap(struct mlxsw_sp *mlxsw_sp,

					   struct mlxsw_sp_fib_entry *fib_entry,

					   enum mlxsw_reg_ralue_op op)

					   enum mlxsw_sp_fib_entry_op op)

{

	char ralue_pl[MLXSW_REG_RALUE_LEN];
@@ -4501,7 +4514,7 @@ static int mlxsw_sp_fib_entry_op_nve_decap(struct mlxsw_sp *mlxsw_sp, 


static int __mlxsw_sp_fib_entry_op(struct mlxsw_sp *mlxsw_sp,

				   struct mlxsw_sp_fib_entry *fib_entry,

				   enum mlxsw_reg_ralue_op op)

				   enum mlxsw_sp_fib_entry_op op)

{

	switch (fib_entry->type) {

	case MLXSW_SP_FIB_ENTRY_TYPE_REMOTE:
@@ -4526,7 +4539,7 @@ static int __mlxsw_sp_fib_entry_op(struct mlxsw_sp *mlxsw_sp, 


static int mlxsw_sp_fib_entry_op(struct mlxsw_sp *mlxsw_sp,

				 struct mlxsw_sp_fib_entry *fib_entry,

				 enum mlxsw_reg_ralue_op op)

				 enum mlxsw_sp_fib_entry_op op)

{

	int err = __mlxsw_sp_fib_entry_op(mlxsw_sp, fib_entry, op);
@@ -4542,14 +4555,14 @@ static int mlxsw_sp_fib_entry_update(struct mlxsw_sp *mlxsw_sp, 
				     struct mlxsw_sp_fib_entry *fib_entry)

{

	return mlxsw_sp_fib_entry_op(mlxsw_sp, fib_entry,

				     MLXSW_REG_RALUE_OP_WRITE_WRITE);

				     MLXSW_SP_FIB_ENTRY_OP_WRITE);

}



static int mlxsw_sp_fib_entry_del(struct mlxsw_sp *mlxsw_sp,

				  struct mlxsw_sp_fib_entry *fib_entry)

{

	return mlxsw_sp_fib_entry_op(mlxsw_sp, fib_entry,

				     MLXSW_REG_RALUE_OP_WRITE_DELETE);

				     MLXSW_SP_FIB_ENTRY_OP_DELETE);

}



static int

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

+5 −0
Original line number Diff line number Diff line
@@ -61,6 +61,11 @@ struct mlxsw_sp_router_ll_ops { 
	int (*raltb_write)(struct mlxsw_sp *mlxsw_sp, char *xraltb_pl);

};



enum mlxsw_sp_fib_entry_op {

	MLXSW_SP_FIB_ENTRY_OP_WRITE,

	MLXSW_SP_FIB_ENTRY_OP_DELETE,

};



struct mlxsw_sp_rif_ipip_lb;

struct mlxsw_sp_rif_ipip_lb_config {

	enum mlxsw_reg_ritr_loopback_ipip_type lb_ipipt;