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

Commit e34305c8 authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller
Browse files

net/mlx4_core: Use both physical ports to set the VF link state 



In HA mode, the link state for VFs for which the policy is "auto"
(i.e. follow the physical link state) should be ORed from both ports.

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: default avatarJack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0d76d6e8

drivers/net/ethernet/mellanox/mlx4/fw.c

+11 −1
Original line number Diff line number Diff line
@@ -1104,6 +1104,7 @@ int mlx4_QUERY_PORT(struct mlx4_dev *dev, int port, struct mlx4_port_cap *port_c 
			goto out;



		MLX4_GET(field, outbox, QUERY_PORT_SUPPORTED_TYPE_OFFSET);

		port_cap->link_state = (field & 0x80) >> 7;

		port_cap->supported_port_types = field & 3;

		port_cap->suggested_type = (field >> 3) & 1;

		port_cap->default_sense = (field >> 4) & 1;
@@ -1310,6 +1311,15 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave, 
			port_type |= MLX4_PORT_LINK_UP_MASK;

		else if (IFLA_VF_LINK_STATE_DISABLE == admin_link_state)

			port_type &= ~MLX4_PORT_LINK_UP_MASK;

		else if (IFLA_VF_LINK_STATE_AUTO == admin_link_state && mlx4_is_bonded(dev)) {

			int other_port = (port == 1) ? 2 : 1;

			struct mlx4_port_cap port_cap;



			err = mlx4_QUERY_PORT(dev, other_port, &port_cap);

			if (err)

				goto out;

			port_type |= (port_cap.link_state << 7);

		}



		MLX4_PUT(outbox->buf, port_type,

			 QUERY_PORT_SUPPORTED_TYPE_OFFSET);
@@ -1325,7 +1335,7 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave, 
		MLX4_PUT(outbox->buf, short_field,

			 QUERY_PORT_CUR_MAX_PKEY_OFFSET);

	}



out:

	return err;

}

drivers/net/ethernet/mellanox/mlx4/fw.h

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ struct mlx4_mod_stat_cfg { 
};



struct mlx4_port_cap {

	u8  link_state;

	u8  supported_port_types;

	u8  suggested_type;

	u8  default_sense;