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

mlxsw: Use u16 for local_port field instead of u8 



Currently, local_port field is saved as u8, which means that maximum 256
ports can be used.

As preparation for Spectrum-4, which will support more than 256 ports,
local_port field should be extended.

Save local_port as u16 to allow use of additional ports.

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 242e696e

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

+21 −21
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static struct workqueue_struct *mlxsw_owq; 
struct mlxsw_core_port {

	struct devlink_port devlink_port;

	void *port_driver_priv;

	u8 local_port;

	u16 local_port;

};



void *mlxsw_core_port_driver_priv(struct mlxsw_core_port *mlxsw_core_port)
@@ -77,7 +77,7 @@ struct mlxsw_core { 
		bool enable_string_tlv;

	} emad;

	struct {

		u8 *mapping; /* lag_id+port_index to local_port mapping */

		u16 *mapping; /* lag_id+port_index to local_port mapping */

	} lag;

	struct mlxsw_res res;

	struct mlxsw_hwmon *hwmon;
@@ -718,7 +718,7 @@ static void mlxsw_emad_process_response(struct mlxsw_core *mlxsw_core, 
}



/* called with rcu read lock held */

static void mlxsw_emad_rx_listener_func(struct sk_buff *skb, u8 local_port,

static void mlxsw_emad_rx_listener_func(struct sk_buff *skb, u16 local_port,

					void *priv)

{

	struct mlxsw_core *mlxsw_core = priv;
@@ -1959,7 +1959,7 @@ __mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 


	if (MLXSW_CORE_RES_VALID(mlxsw_core, MAX_LAG) &&

	    MLXSW_CORE_RES_VALID(mlxsw_core, MAX_LAG_MEMBERS)) {

		alloc_size = sizeof(u8) *

		alloc_size = sizeof(*mlxsw_core->lag.mapping) *

			MLXSW_CORE_RES_GET(mlxsw_core, MAX_LAG) *

			MLXSW_CORE_RES_GET(mlxsw_core, MAX_LAG_MEMBERS);

		mlxsw_core->lag.mapping = kzalloc(alloc_size, GFP_KERNEL);
@@ -2130,7 +2130,7 @@ int mlxsw_core_skb_transmit(struct mlxsw_core *mlxsw_core, struct sk_buff *skb, 
EXPORT_SYMBOL(mlxsw_core_skb_transmit);



void mlxsw_core_ptp_transmitted(struct mlxsw_core *mlxsw_core,

				struct sk_buff *skb, u8 local_port)

				struct sk_buff *skb, u16 local_port)

{

	if (mlxsw_core->driver->ptp_transmitted)

		mlxsw_core->driver->ptp_transmitted(mlxsw_core, skb,
@@ -2208,7 +2208,7 @@ mlxsw_core_rx_listener_state_set(struct mlxsw_core *mlxsw_core, 
	rxl_item->enabled = enabled;

}



static void mlxsw_core_event_listener_func(struct sk_buff *skb, u8 local_port,

static void mlxsw_core_event_listener_func(struct sk_buff *skb, u16 local_port,

					   void *priv)

{

	struct mlxsw_event_listener_item *event_listener_item = priv;
@@ -2641,7 +2641,7 @@ void mlxsw_core_skb_receive(struct mlxsw_core *mlxsw_core, struct sk_buff *skb, 
{

	struct mlxsw_rx_listener_item *rxl_item;

	const struct mlxsw_rx_listener *rxl;

	u8 local_port;

	u16 local_port;

	bool found = false;



	if (rx_info->is_lag) {
@@ -2699,7 +2699,7 @@ static int mlxsw_core_lag_mapping_index(struct mlxsw_core *mlxsw_core, 
}



void mlxsw_core_lag_mapping_set(struct mlxsw_core *mlxsw_core,

				u16 lag_id, u8 port_index, u8 local_port)

				u16 lag_id, u8 port_index, u16 local_port)

{

	int index = mlxsw_core_lag_mapping_index(mlxsw_core,

						 lag_id, port_index);
@@ -2708,7 +2708,7 @@ void mlxsw_core_lag_mapping_set(struct mlxsw_core *mlxsw_core, 
}

EXPORT_SYMBOL(mlxsw_core_lag_mapping_set);



u8 mlxsw_core_lag_mapping_get(struct mlxsw_core *mlxsw_core,

u16 mlxsw_core_lag_mapping_get(struct mlxsw_core *mlxsw_core,

			       u16 lag_id, u8 port_index)

{

	int index = mlxsw_core_lag_mapping_index(mlxsw_core,
@@ -2719,7 +2719,7 @@ u8 mlxsw_core_lag_mapping_get(struct mlxsw_core *mlxsw_core, 
EXPORT_SYMBOL(mlxsw_core_lag_mapping_get);



void mlxsw_core_lag_mapping_clear(struct mlxsw_core *mlxsw_core,

				  u16 lag_id, u8 local_port)

				  u16 lag_id, u16 local_port)

{

	int i;
@@ -2747,7 +2747,7 @@ u64 mlxsw_core_res_get(struct mlxsw_core *mlxsw_core, 
}

EXPORT_SYMBOL(mlxsw_core_res_get);



static int __mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,

static int __mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u16 local_port,

				  enum devlink_port_flavour flavour,

				  u32 port_number, bool split,

				  u32 split_port_subnumber,
@@ -2778,7 +2778,7 @@ static int __mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port, 
	return err;

}



static void __mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port)

static void __mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u16 local_port)

{

	struct mlxsw_core_port *mlxsw_core_port =

					&mlxsw_core->ports[local_port];
@@ -2788,7 +2788,7 @@ static void __mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port) 
	memset(mlxsw_core_port, 0, sizeof(*mlxsw_core_port));

}



int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,

int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u16 local_port,

			 u32 port_number, bool split,

			 u32 split_port_subnumber,

			 bool splittable, u32 lanes,
@@ -2810,7 +2810,7 @@ int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port, 
}

EXPORT_SYMBOL(mlxsw_core_port_init);



void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port)

void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u16 local_port)

{

	atomic_dec(&mlxsw_core->active_ports_count);
@@ -2845,7 +2845,7 @@ void mlxsw_core_cpu_port_fini(struct mlxsw_core *mlxsw_core) 
}

EXPORT_SYMBOL(mlxsw_core_cpu_port_fini);



void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port,

void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u16 local_port,

			     void *port_driver_priv, struct net_device *dev)

{

	struct mlxsw_core_port *mlxsw_core_port =
@@ -2857,7 +2857,7 @@ void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port, 
}

EXPORT_SYMBOL(mlxsw_core_port_eth_set);



void mlxsw_core_port_ib_set(struct mlxsw_core *mlxsw_core, u8 local_port,

void mlxsw_core_port_ib_set(struct mlxsw_core *mlxsw_core, u16 local_port,

			    void *port_driver_priv)

{

	struct mlxsw_core_port *mlxsw_core_port =
@@ -2869,7 +2869,7 @@ void mlxsw_core_port_ib_set(struct mlxsw_core *mlxsw_core, u8 local_port, 
}

EXPORT_SYMBOL(mlxsw_core_port_ib_set);



void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u8 local_port,

void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u16 local_port,

			   void *port_driver_priv)

{

	struct mlxsw_core_port *mlxsw_core_port =
@@ -2882,7 +2882,7 @@ void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u8 local_port, 
EXPORT_SYMBOL(mlxsw_core_port_clear);



enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core,

						u8 local_port)

						u16 local_port)

{

	struct mlxsw_core_port *mlxsw_core_port =

					&mlxsw_core->ports[local_port];
@@ -2895,7 +2895,7 @@ EXPORT_SYMBOL(mlxsw_core_port_type_get); 


struct devlink_port *

mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core,

				 u8 local_port)

				 u16 local_port)

{

	struct mlxsw_core_port *mlxsw_core_port =

					&mlxsw_core->ports[local_port];
@@ -2905,7 +2905,7 @@ mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core, 
}

EXPORT_SYMBOL(mlxsw_core_port_devlink_port_get);



bool mlxsw_core_port_is_xm(const struct mlxsw_core *mlxsw_core, u8 local_port)

bool mlxsw_core_port_is_xm(const struct mlxsw_core *mlxsw_core, u16 local_port)

{

	const struct mlxsw_bus_info *bus_info = mlxsw_core->bus_info;

	int i;

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

+22 −22
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ int mlxsw_core_bus_device_register(const struct mlxsw_bus_info *mlxsw_bus_info, 
void mlxsw_core_bus_device_unregister(struct mlxsw_core *mlxsw_core, bool reload);



struct mlxsw_tx_info {

	u8 local_port;

	u16 local_port;

	bool is_emad;

};
@@ -67,7 +67,7 @@ struct mlxsw_rx_md_info { 
		u16 tx_sys_port;

		u16 tx_lag_id;

	};

	u8 tx_lag_port_index; /* Valid when 'tx_port_is_lag' is set. */

	u16 tx_lag_port_index; /* Valid when 'tx_port_is_lag' is set. */

	u8 tx_tc;

	u8 latency_valid:1,

	   tx_congestion_valid:1,
@@ -82,11 +82,11 @@ bool mlxsw_core_skb_transmit_busy(struct mlxsw_core *mlxsw_core, 
int mlxsw_core_skb_transmit(struct mlxsw_core *mlxsw_core, struct sk_buff *skb,

			    const struct mlxsw_tx_info *tx_info);

void mlxsw_core_ptp_transmitted(struct mlxsw_core *mlxsw_core,

				struct sk_buff *skb, u8 local_port);

				struct sk_buff *skb, u16 local_port);



struct mlxsw_rx_listener {

	void (*func)(struct sk_buff *skb, u8 local_port, void *priv);

	u8 local_port;

	void (*func)(struct sk_buff *skb, u16 local_port, void *priv);

	u16 local_port;

	u8 mirror_reason;

	u16 trap_id;

};
@@ -209,7 +209,7 @@ struct mlxsw_rx_info { 
		u16 sys_port;

		u16 lag_id;

	} u;

	u8 lag_port_index;

	u16 lag_port_index;

	u8 mirror_reason;

	int trap_id;

};
@@ -218,36 +218,36 @@ void mlxsw_core_skb_receive(struct mlxsw_core *mlxsw_core, struct sk_buff *skb, 
			    struct mlxsw_rx_info *rx_info);



void mlxsw_core_lag_mapping_set(struct mlxsw_core *mlxsw_core,

				u16 lag_id, u8 port_index, u8 local_port);

u8 mlxsw_core_lag_mapping_get(struct mlxsw_core *mlxsw_core,

				u16 lag_id, u8 port_index, u16 local_port);

u16 mlxsw_core_lag_mapping_get(struct mlxsw_core *mlxsw_core,

			       u16 lag_id, u8 port_index);

void mlxsw_core_lag_mapping_clear(struct mlxsw_core *mlxsw_core,

				  u16 lag_id, u8 local_port);

				  u16 lag_id, u16 local_port);



void *mlxsw_core_port_driver_priv(struct mlxsw_core_port *mlxsw_core_port);

int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u8 local_port,

int mlxsw_core_port_init(struct mlxsw_core *mlxsw_core, u16 local_port,

			 u32 port_number, bool split, u32 split_port_subnumber,

			 bool splittable, u32 lanes,

			 const unsigned char *switch_id,

			 unsigned char switch_id_len);

void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u8 local_port);

void mlxsw_core_port_fini(struct mlxsw_core *mlxsw_core, u16 local_port);

int mlxsw_core_cpu_port_init(struct mlxsw_core *mlxsw_core,

			     void *port_driver_priv,

			     const unsigned char *switch_id,

			     unsigned char switch_id_len);

void mlxsw_core_cpu_port_fini(struct mlxsw_core *mlxsw_core);

void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u8 local_port,

void mlxsw_core_port_eth_set(struct mlxsw_core *mlxsw_core, u16 local_port,

			     void *port_driver_priv, struct net_device *dev);

void mlxsw_core_port_ib_set(struct mlxsw_core *mlxsw_core, u8 local_port,

void mlxsw_core_port_ib_set(struct mlxsw_core *mlxsw_core, u16 local_port,

			    void *port_driver_priv);

void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u8 local_port,

void mlxsw_core_port_clear(struct mlxsw_core *mlxsw_core, u16 local_port,

			   void *port_driver_priv);

enum devlink_port_type mlxsw_core_port_type_get(struct mlxsw_core *mlxsw_core,

						u8 local_port);

						u16 local_port);

struct devlink_port *

mlxsw_core_port_devlink_port_get(struct mlxsw_core *mlxsw_core,

				 u8 local_port);

bool mlxsw_core_port_is_xm(const struct mlxsw_core *mlxsw_core, u8 local_port);

				 u16 local_port);

bool mlxsw_core_port_is_xm(const struct mlxsw_core *mlxsw_core, u16 local_port);

struct mlxsw_env *mlxsw_core_env(const struct mlxsw_core *mlxsw_core);



int mlxsw_core_schedule_dw(struct delayed_work *dwork, unsigned long delay);
@@ -316,11 +316,11 @@ struct mlxsw_driver { 
		    struct netlink_ext_ack *extack);

	void (*fini)(struct mlxsw_core *mlxsw_core);

	int (*basic_trap_groups_set)(struct mlxsw_core *mlxsw_core);

	int (*port_type_set)(struct mlxsw_core *mlxsw_core, u8 local_port,

	int (*port_type_set)(struct mlxsw_core *mlxsw_core, u16 local_port,

			     enum devlink_port_type new_type);

	int (*port_split)(struct mlxsw_core *mlxsw_core, u8 local_port,

	int (*port_split)(struct mlxsw_core *mlxsw_core, u16 local_port,

			  unsigned int count, struct netlink_ext_ack *extack);

	int (*port_unsplit)(struct mlxsw_core *mlxsw_core, u8 local_port,

	int (*port_unsplit)(struct mlxsw_core *mlxsw_core, u16 local_port,

			    struct netlink_ext_ack *extack);

	int (*sb_pool_get)(struct mlxsw_core *mlxsw_core,

			   unsigned int sb_index, u16 pool_index,
@@ -394,7 +394,7 @@ struct mlxsw_driver { 
	 * is responsible for freeing the passed-in SKB.

	 */

	void (*ptp_transmitted)(struct mlxsw_core *mlxsw_core,

				struct sk_buff *skb, u8 local_port);

				struct sk_buff *skb, u16 local_port);



	u8 txhdr_len;

	const struct mlxsw_config_profile *profile;

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

+11 −11
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static const struct rhashtable_params mlxsw_afa_set_ht_params = { 
};



struct mlxsw_afa_fwd_entry_ht_key {

	u8 local_port;

	u16 local_port;

};



struct mlxsw_afa_fwd_entry {
@@ -555,7 +555,7 @@ int mlxsw_afa_block_terminate(struct mlxsw_afa_block *block) 
EXPORT_SYMBOL(mlxsw_afa_block_terminate);



static struct mlxsw_afa_fwd_entry *

mlxsw_afa_fwd_entry_create(struct mlxsw_afa *mlxsw_afa, u8 local_port)

mlxsw_afa_fwd_entry_create(struct mlxsw_afa *mlxsw_afa, u16 local_port)

{

	struct mlxsw_afa_fwd_entry *fwd_entry;

	int err;
@@ -598,7 +598,7 @@ static void mlxsw_afa_fwd_entry_destroy(struct mlxsw_afa *mlxsw_afa, 
}



static struct mlxsw_afa_fwd_entry *

mlxsw_afa_fwd_entry_get(struct mlxsw_afa *mlxsw_afa, u8 local_port)

mlxsw_afa_fwd_entry_get(struct mlxsw_afa *mlxsw_afa, u16 local_port)

{

	struct mlxsw_afa_fwd_entry_ht_key ht_key = {0};

	struct mlxsw_afa_fwd_entry *fwd_entry;
@@ -647,7 +647,7 @@ mlxsw_afa_fwd_entry_ref_destructor(struct mlxsw_afa_block *block, 
}



static struct mlxsw_afa_fwd_entry_ref *

mlxsw_afa_fwd_entry_ref_create(struct mlxsw_afa_block *block, u8 local_port)

mlxsw_afa_fwd_entry_ref_create(struct mlxsw_afa_block *block, u16 local_port)

{

	struct mlxsw_afa_fwd_entry_ref *fwd_entry_ref;

	struct mlxsw_afa_fwd_entry *fwd_entry;
@@ -1352,7 +1352,7 @@ EXPORT_SYMBOL(mlxsw_afa_block_append_trap_and_forward); 
struct mlxsw_afa_mirror {

	struct mlxsw_afa_resource resource;

	int span_id;

	u8 local_in_port;

	u16 local_in_port;

	bool ingress;

};
@@ -1379,7 +1379,7 @@ mlxsw_afa_mirror_destructor(struct mlxsw_afa_block *block, 
}



static struct mlxsw_afa_mirror *

mlxsw_afa_mirror_create(struct mlxsw_afa_block *block, u8 local_in_port,

mlxsw_afa_mirror_create(struct mlxsw_afa_block *block, u16 local_in_port,

			const struct net_device *out_dev, bool ingress)

{

	struct mlxsw_afa_mirror *mirror;
@@ -1423,7 +1423,7 @@ mlxsw_afa_block_append_allocated_mirror(struct mlxsw_afa_block *block, 
}



int

mlxsw_afa_block_append_mirror(struct mlxsw_afa_block *block, u8 local_in_port,

mlxsw_afa_block_append_mirror(struct mlxsw_afa_block *block, u16 local_in_port,

			      const struct net_device *out_dev, bool ingress,

			      struct netlink_ext_ack *extack)

{
@@ -1663,7 +1663,7 @@ mlxsw_afa_forward_pack(char *payload, enum mlxsw_afa_forward_type type, 
}



int mlxsw_afa_block_append_fwd(struct mlxsw_afa_block *block,

			       u8 local_port, bool in_port,

			       u16 local_port, bool in_port,

			       struct netlink_ext_ack *extack)

{

	struct mlxsw_afa_fwd_entry_ref *fwd_entry_ref;
@@ -2038,7 +2038,7 @@ static void mlxsw_afa_sampler_pack(char *payload, u8 mirror_agent, u32 rate) 
struct mlxsw_afa_sampler {

	struct mlxsw_afa_resource resource;

	int span_id;

	u8 local_port;

	u16 local_port;

	bool ingress;

};
@@ -2061,7 +2061,7 @@ static void mlxsw_afa_sampler_destructor(struct mlxsw_afa_block *block, 
}



static struct mlxsw_afa_sampler *

mlxsw_afa_sampler_create(struct mlxsw_afa_block *block, u8 local_port,

mlxsw_afa_sampler_create(struct mlxsw_afa_block *block, u16 local_port,

			 struct psample_group *psample_group, u32 rate,

			 u32 trunc_size, bool truncate, bool ingress,

			 struct netlink_ext_ack *extack)
@@ -2104,7 +2104,7 @@ mlxsw_afa_block_append_allocated_sampler(struct mlxsw_afa_block *block, 
	return 0;

}



int mlxsw_afa_block_append_sampler(struct mlxsw_afa_block *block, u8 local_port,

int mlxsw_afa_block_append_sampler(struct mlxsw_afa_block *block, u16 local_port,

				   struct psample_group *psample_group,

				   u32 rate, u32 trunc_size, bool truncate,

				   bool ingress,

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

+8 −8
Original line number Diff line number Diff line
@@ -17,24 +17,24 @@ struct mlxsw_afa_ops { 
	void (*kvdl_set_del)(void *priv, u32 kvdl_index, bool is_first);

	int (*kvdl_set_activity_get)(void *priv, u32 kvdl_index,

				     bool *activity);

	int (*kvdl_fwd_entry_add)(void *priv, u32 *p_kvdl_index, u8 local_port);

	int (*kvdl_fwd_entry_add)(void *priv, u32 *p_kvdl_index, u16 local_port);

	void (*kvdl_fwd_entry_del)(void *priv, u32 kvdl_index);

	int (*counter_index_get)(void *priv, unsigned int *p_counter_index);

	void (*counter_index_put)(void *priv, unsigned int counter_index);

	int (*mirror_add)(void *priv, u8 local_in_port,

	int (*mirror_add)(void *priv, u16 local_in_port,

			  const struct net_device *out_dev,

			  bool ingress, int *p_span_id);

	void (*mirror_del)(void *priv, u8 local_in_port, int span_id,

	void (*mirror_del)(void *priv, u16 local_in_port, int span_id,

			   bool ingress);

	int (*policer_add)(void *priv, u64 rate_bytes_ps, u32 burst,

			   u16 *p_policer_index,

			   struct netlink_ext_ack *extack);

	void (*policer_del)(void *priv, u16 policer_index);

	int (*sampler_add)(void *priv, u8 local_port,

	int (*sampler_add)(void *priv, u16 local_port,

			   struct psample_group *psample_group, u32 rate,

			   u32 trunc_size, bool truncate, bool ingress,

			   int *p_span_id, struct netlink_ext_ack *extack);

	void (*sampler_del)(void *priv, u8 local_port, int span_id,

	void (*sampler_del)(void *priv, u16 local_port, int span_id,

			    bool ingress);

	bool dummy_first_set;

};
@@ -62,12 +62,12 @@ int mlxsw_afa_block_append_trap(struct mlxsw_afa_block *block, u16 trap_id); 
int mlxsw_afa_block_append_trap_and_forward(struct mlxsw_afa_block *block,

					    u16 trap_id);

int mlxsw_afa_block_append_mirror(struct mlxsw_afa_block *block,

				  u8 local_in_port,

				  u16 local_in_port,

				  const struct net_device *out_dev,

				  bool ingress,

				  struct netlink_ext_ack *extack);

int mlxsw_afa_block_append_fwd(struct mlxsw_afa_block *block,

			       u8 local_port, bool in_port,

			       u16 local_port, bool in_port,

			       struct netlink_ext_ack *extack);

int mlxsw_afa_block_append_vlan_modify(struct mlxsw_afa_block *block,

				       u16 vid, u8 pcp, u8 et,
@@ -98,7 +98,7 @@ int mlxsw_afa_block_append_police(struct mlxsw_afa_block *block, 
				  u32 fa_index, u64 rate_bytes_ps, u32 burst,

				  u16 *p_policer_index,

				  struct netlink_ext_ack *extack);

int mlxsw_afa_block_append_sampler(struct mlxsw_afa_block *block, u8 local_port,

int mlxsw_afa_block_append_sampler(struct mlxsw_afa_block *block, u16 local_port,

				   struct psample_group *psample_group,

				   u32 rate, u32 trunc_size, bool truncate,

				   bool ingress,

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

+5 −5
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct mlxsw_m { 
struct mlxsw_m_port {

	struct net_device *dev;

	struct mlxsw_m *mlxsw_m;

	u8 local_port;

	u16 local_port;

	u8 module;

};
@@ -180,7 +180,7 @@ static const struct ethtool_ops mlxsw_m_port_ethtool_ops = { 
};



static int

mlxsw_m_port_module_info_get(struct mlxsw_m *mlxsw_m, u8 local_port,

mlxsw_m_port_module_info_get(struct mlxsw_m *mlxsw_m, u16 local_port,

			     u8 *p_module, u8 *p_width)

{

	char pmlp_pl[MLXSW_REG_PMLP_LEN];
@@ -214,7 +214,7 @@ mlxsw_m_port_dev_addr_get(struct mlxsw_m_port *mlxsw_m_port) 
}



static int

mlxsw_m_port_create(struct mlxsw_m *mlxsw_m, u8 local_port, u8 module)

mlxsw_m_port_create(struct mlxsw_m *mlxsw_m, u16 local_port, u8 module)

{

	struct mlxsw_m_port *mlxsw_m_port;

	struct net_device *dev;
@@ -277,7 +277,7 @@ mlxsw_m_port_create(struct mlxsw_m *mlxsw_m, u8 local_port, u8 module) 
	return err;

}



static void mlxsw_m_port_remove(struct mlxsw_m *mlxsw_m, u8 local_port)

static void mlxsw_m_port_remove(struct mlxsw_m *mlxsw_m, u16 local_port)

{

	struct mlxsw_m_port *mlxsw_m_port = mlxsw_m->ports[local_port];
@@ -288,7 +288,7 @@ static void mlxsw_m_port_remove(struct mlxsw_m *mlxsw_m, u8 local_port) 
	mlxsw_core_port_fini(mlxsw_m->core, local_port);

}



static int mlxsw_m_port_module_map(struct mlxsw_m *mlxsw_m, u8 local_port,

static int mlxsw_m_port_module_map(struct mlxsw_m *mlxsw_m, u16 local_port,

				   u8 *last_module)

{

	unsigned int max_ports = mlxsw_core_max_ports(mlxsw_m->core);