mlx4: VLAN filter management by master function.
Subsystems (3)
PATCH 24/25 mlx4: VLAN filter management by master function.
The VLAN filter is a bitmap of 4096 bits.
The mster function sets the VLAN filter as a bitwise OR of the filters of each one of the slaves.
Signed-off-by Yevgeny Petrilin <[email protected]>
--- drivers/net/mlx4/cmd.c | 2 +- drivers/net/mlx4/en_port.c | 35 --------------------- drivers/net/mlx4/en_port.h | 5 --- drivers/net/mlx4/mlx4.h | 9 +++++ drivers/net/mlx4/port.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 41 deletions(-)
drivers/net/mlx4/cmd.c +1 -1
@@ -598,7 +598,7 @@ static struct mlx4_cmd_info { {MLX4_CMD_DIAG_RPRT, 0, 1, 0, NULL, NULL}, /* need verifier *//* Ethernet specific commands */ - {MLX4_CMD_SET_VLAN_FLTR, 1, 0, 0, NULL, NULL}, /* need wrapper */ + {MLX4_CMD_SET_VLAN_FLTR, 1, 0, 0, NULL, mlx4_SET_VLAN_FLTR_wrapper}, {MLX4_CMD_SET_MCAST_FLTR, 0, 0, 0, NULL, mlx4_SET_MCAST_FLTR_wrapper}, {MLX4_CMD_DUMP_ETH_STATS, 0, 1, 0, NULL, NULL}, /* need wrapper */ };
drivers/net/mlx4/en_port.c +0 -35
@@ -41,41 +41,6 @@#include "mlx4_en.h" -int mlx4_SET_VLAN_FLTR (struct mlx4_dev *dev,u8 port,struct vlan_group *grp) -{ -struct mlx4_cmd_mailbox *mailbox; -struct mlx4_set_vlan_fltr_mbox *filter; -int i; -int j; -int index =0 ; -u32 entry; -int err =0 ; - - mailbox =mlx4_alloc_cmd_mailbox (dev); -if (IS_ERR (mailbox)) -return PTR_ERR (mailbox); - - filter = mailbox->buf; -if (grp) { -memset (filter,0 ,sizeof *filter); -for (i =VLAN_FLTR_SIZE -1 ; i >=0 ; i--) { - entry =0 ; -for (j =0 ; j <32 ; j++) -if (vlan_group_get_device (grp, index++)) - entry |=1 << j; - filter->entry[i] =cpu_to_be32 (entry); - } - }else { -/* When no vlans are configured we block all vlans */ -memset (filter,0 ,sizeof (*filter)); - } - err =mlx4_cmd (dev, mailbox->dma, port,0 ,MLX4_CMD_SET_VLAN_FLTR , -MLX4_CMD_TIME_CLASS_B ); -mlx4_free_cmd_mailbox (dev, mailbox); -return err; -} - -int mlx4_SET_PORT_general (struct mlx4_dev *dev,u8 port,int mtu,u8 pptx,u8 pfctx,u8 pprx,u8 pfcrx) {
drivers/net/mlx4/en_port.h +0 -5
@@ -83,11 +83,6 @@ struct mlx4_set_port_rqp_calc_context {__be32 mcast; }; -#define VLAN_FLTR_SIZE 128 -struct mlx4_set_vlan_fltr_mbox { -__be32 entry[VLAN_FLTR_SIZE ]; -}; -enum {MLX4_MCAST_CONFIG =0 ,
drivers/net/mlx4/mlx4.h +9 -0
@@ -221,6 +221,11 @@ struct mlx4_mcast_entry {u64 addr; }; +#define VLAN_FLTR_SIZE 128 +struct mlx4_vlan_fltr { +__be32 entry[VLAN_FLTR_SIZE ]; +}; +struct mlx4_slave_state {u8 comm_toggle;u8 last_cmd;
@@ -230,6 +235,7 @@ struct mlx4_slave_state {__be32 ib_cap_mask[MLX4_MAX_PORTS +1 ];struct mlx4_slave_eqe eq[MLX4_MFUNC_MAX_EQES ];struct list_head mcast_filters[MLX4_MAX_PORTS +1 ]; +struct mlx4_vlan_fltr vlan_filter[MLX4_MAX_PORTS +1 ];u16 eq_pi;u16 eq_ci;int sqp_start;
@@ -560,5 +566,8 @@ int mlx4_MCAST_wrapper(struct mlx4_dev *dev, int slave, struct mlx4_vhcr *vhcr,int mlx4_SET_MCAST_FLTR_wrapper (struct mlx4_dev *dev,int slave,struct mlx4_vhcr *vhcr,struct mlx4_cmd_mailbox *inbox,struct mlx4_cmd_mailbox *outbox); +int mlx4_SET_VLAN_FLTR_wrapper (struct mlx4_dev *dev,int slave,struct mlx4_vhcr *vhcr, +struct mlx4_cmd_mailbox *inbox, +struct mlx4_cmd_mailbox *outbox);#endif /* MLX4_H */
drivers/net/mlx4/port.c +72 -0
81 lines not on this page · raw message
Signature · 1 line
1.6.1.3