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

Commit 98fdbea5 authored by Leon Romanovsky's avatar Leon Romanovsky
Browse files

net/mlx5: Declare more strictly devlink encap mode 



Devlink has UAPI declaration for encap mode, so there is no
need to be loose on the data get/set by drivers.

Update call sites to use enum devlink_eswitch_encap_mode
instead of plain u8.

Suggested-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Reviewed-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarPetr Vorel <pvorel@suse.cz>
parent 1f8a7bee

drivers/net/ethernet/mellanox/mlx5/core/eswitch.h

+5 −3
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ struct mlx5_esw_offload { 
	const struct mlx5_eswitch_rep_ops *rep_ops[NUM_REP_TYPES];

	u8 inline_mode;

	u64 num_flows;

	u8 encap;

	enum devlink_eswitch_encap_mode encap;

};



/* E-Switch MC FDB table hash node */
@@ -357,9 +357,11 @@ int mlx5_devlink_eswitch_inline_mode_set(struct devlink *devlink, u8 mode, 
					 struct netlink_ext_ack *extack);

int mlx5_devlink_eswitch_inline_mode_get(struct devlink *devlink, u8 *mode);

int mlx5_eswitch_inline_mode_get(struct mlx5_eswitch *esw, int nvfs, u8 *mode);

int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink, u8 encap,

int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink,

					enum devlink_eswitch_encap_mode encap,

					struct netlink_ext_ack *extack);

int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink, u8 *encap);

int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink,

					enum devlink_eswitch_encap_mode *encap);

void *mlx5_eswitch_get_uplink_priv(struct mlx5_eswitch *esw, u8 rep_type);



int mlx5_eswitch_add_vlan_action(struct mlx5_eswitch *esw,

drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

+4 −2
Original line number Diff line number Diff line
@@ -2160,7 +2160,8 @@ int mlx5_eswitch_inline_mode_get(struct mlx5_eswitch *esw, int nvfs, u8 *mode) 
	return 0;

}



int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink, u8 encap,

int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink,

					enum devlink_eswitch_encap_mode encap,

					struct netlink_ext_ack *extack)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);
@@ -2209,7 +2210,8 @@ int mlx5_devlink_eswitch_encap_mode_set(struct devlink *devlink, u8 encap, 
	return err;

}



int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink, u8 *encap)

int mlx5_devlink_eswitch_encap_mode_get(struct devlink *devlink,

					enum devlink_eswitch_encap_mode *encap)

{

	struct mlx5_core_dev *dev = devlink_priv(devlink);

	struct mlx5_eswitch *esw = dev->priv.eswitch;

include/net/devlink.h

+4 −2
Original line number Diff line number Diff line
@@ -530,8 +530,10 @@ struct devlink_ops { 
	int (*eswitch_inline_mode_get)(struct devlink *devlink, u8 *p_inline_mode);

	int (*eswitch_inline_mode_set)(struct devlink *devlink, u8 inline_mode,

				       struct netlink_ext_ack *extack);

	int (*eswitch_encap_mode_get)(struct devlink *devlink, u8 *p_encap_mode);

	int (*eswitch_encap_mode_set)(struct devlink *devlink, u8 encap_mode,

	int (*eswitch_encap_mode_get)(struct devlink *devlink,

				      enum devlink_eswitch_encap_mode *p_encap_mode);

	int (*eswitch_encap_mode_set)(struct devlink *devlink,

				      enum devlink_eswitch_encap_mode encap_mode,

				      struct netlink_ext_ack *extack);

	int (*info_get)(struct devlink *devlink, struct devlink_info_req *req,

			struct netlink_ext_ack *extack);

net/core/devlink.c

+4 −2
Original line number Diff line number Diff line
@@ -1552,7 +1552,8 @@ static int devlink_nl_eswitch_fill(struct sk_buff *msg, struct devlink *devlink, 
				   u32 seq, int flags)

{

	const struct devlink_ops *ops = devlink->ops;

	u8 inline_mode, encap_mode;

	enum devlink_eswitch_encap_mode encap_mode;

	u8 inline_mode;

	void *hdr;

	int err = 0;

	u16 mode;
@@ -1628,7 +1629,8 @@ static int devlink_nl_cmd_eswitch_set_doit(struct sk_buff *skb, 
{

	struct devlink *devlink = info->user_ptr[0];

	const struct devlink_ops *ops = devlink->ops;

	u8 inline_mode, encap_mode;

	enum devlink_eswitch_encap_mode encap_mode;

	u8 inline_mode;

	int err = 0;

	u16 mode;