ehea: Update multiqueue support

The ehea driver had some multiqueue support but was missing the last
few years of networking stack improvements:

- Use skb_record_rx_queue to record which queue an skb came in on.

- Remove the driver specific netif_queue lock and use the networking
  stack transmit lock instead.

- Remove the driver specific transmit queue hashing and use
  skb_get_queue_mapping instead.

- Use netif_tx_{start|stop|wake}_queue where appropriate. We can also
  remove pr->queue_stopped and just check the queue status directly.

- Print all 16 queues in the ethtool stats.

We now enable multiqueue by default since it is a clear win on all my
testing so far.

v3:
[cascardo] fixed use_mcs parameter description
[cascardo] set ehea_ethtool_stats_keys as const

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 7 deletions

diff --git a/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c b/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
index 7f642aef5e82..d185016c79ef 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_ethtool.c
@@ -180,7 +180,7 @@ static void ehea_set_msglevel(struct net_device *dev, u32 value)
         port->msg_enable = value;
 }
 
-static char ehea_ethtool_stats_keys[][ETH_GSTRING_LEN] = {
+static const char ehea_ethtool_stats_keys[][ETH_GSTRING_LEN] = {
         {"sig_comp_iv"},
         {"swqe_refill_th"},
         {"port resets"},
@@ -189,7 +189,6 @@ static char ehea_ethtool_stats_keys[][ETH_GSTRING_LEN] = {
         {"IP cksum errors"},
         {"Frame cksum errors"},
         {"num SQ stopped"},
-        {"SQ stopped"},
         {"PR0 free_swqes"},
         {"PR1 free_swqes"},
         {"PR2 free_swqes"},
@@ -198,6 +197,14 @@ static char ehea_ethtool_stats_keys[][ETH_GSTRING_LEN] = {
         {"PR5 free_swqes"},
         {"PR6 free_swqes"},
         {"PR7 free_swqes"},
+        {"PR8 free_swqes"},
+        {"PR9 free_swqes"},
+        {"PR10 free_swqes"},
+        {"PR11 free_swqes"},
+        {"PR12 free_swqes"},
+        {"PR13 free_swqes"},
+        {"PR14 free_swqes"},
+        {"PR15 free_swqes"},
         {"LRO aggregated"},
         {"LRO flushed"},
         {"LRO no_desc"},
@@ -255,11 +262,7 @@ static void ehea_get_ethtool_stats(struct net_device *dev,
                 tmp += port->port_res[k].p_stats.queue_stopped;
         data[i++] = tmp;
 
-        for (k = 0, tmp = 0; k < EHEA_MAX_PORT_RES; k++)
-                tmp |= port->port_res[k].queue_stopped;
-        data[i++] = tmp;
-
-        for (k = 0; k < 8; k++)
+        for (k = 0; k < 16; k++)
                 data[i++] = atomic_read(&port->port_res[k].swqe_avail);
 
         for (k = 0, tmp = 0; k < EHEA_MAX_PORT_RES; k++)