mlx4_en: Adding 40gb speed report for ethtool (f0ec7177) · Commits · 戴 / test

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

+13 −3

Original line number	Diff line number	Diff line
		@@ -167,11 +167,21 @@ int mlx4_en_QUERY_PORT(struct mlx4_en_dev *mdev, u8 port)
		/* This command is always accessed from Ethtool context
		* already synchronized, no need in locking */
		state->link_state = !!(qport_context->link_up & MLX4_EN_LINK_UP_MASK);
		if ((qport_context->link_speed & MLX4_EN_SPEED_MASK) ==
		MLX4_EN_1G_SPEED)
		switch (qport_context->link_speed & MLX4_EN_SPEED_MASK) {
		case MLX4_EN_1G_SPEED:
		state->link_speed = 1000;
		else
		break;
		case MLX4_EN_10G_SPEED_XAUI:
		case MLX4_EN_10G_SPEED_XFI:
		state->link_speed = 10000;
		break;
		case MLX4_EN_40G_SPEED:
		state->link_speed = 40000;
		break;
		default:
		state->link_speed = -1;
		break;
		}
		state->transciver = qport_context->transceiver;

		out:

+9 −2

Original line number	Diff line number	Diff line
		@@ -94,6 +94,14 @@ enum {
		MLX4_MCAST_ENABLE = 2,
		};

		enum {
		MLX4_EN_1G_SPEED = 0x02,
		MLX4_EN_10G_SPEED_XFI = 0x01,
		MLX4_EN_10G_SPEED_XAUI = 0x00,
		MLX4_EN_40G_SPEED = 0x40,
		MLX4_EN_OTHER_SPEED = 0x0f,
		};

		struct mlx4_en_query_port_context {
		u8 link_up;
		#define MLX4_EN_LINK_UP_MASK 0x80
		@@ -101,8 +109,7 @@ struct mlx4_en_query_port_context {
		__be16 mtu;
		u8 reserved2;
		u8 link_speed;
		#define MLX4_EN_SPEED_MASK 0x3
		#define MLX4_EN_1G_SPEED 0x2
		#define MLX4_EN_SPEED_MASK 0x43
		u16 reserved3[5];
		__be64 mac;
		u8 transceiver;