mlx4_en: Adding 40gb speed report for ethtool

Query port will now identify a 40G Ethernet speed.

Signed-off-by: Alexander Guller <alexg@mellanox.co.il>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_port.c b/drivers/net/ethernet/mellanox/mlx4/en_port.c
index 8824309bb6253202863ddb72191640875521c13c..9d275558094af436506c049dfd36bbb2d7ba1b0f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_port.c
@@ -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:

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_port.h b/drivers/net/ethernet/mellanox/mlx4/en_port.h
index e3d73e41c567c52c61a6fc35190fb2cd88e28c01..19eb244f516534a9993264336c3fe714245ef9fd 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_port.h
+++ b/drivers/net/ethernet/mellanox/mlx4/en_port.h
@@ -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;