target/linux/mvebu/patches-4.4/036-net-mvneta-fix-trivial-cut-off-issue-in-mvneta_ethto.patch

   1 From: Jisheng Zhang <jszhang@marvell.com>
   2 Date: Wed, 20 Jan 2016 16:36:25 +0800
   3 Subject: [PATCH] net: mvneta: fix trivial cut-off issue in
   4  mvneta_ethtool_update_stats
   5
   6 When s->type is T_REG_64, the high 32bits are lost in val. This patch
   7 fixes this trivial issue.
   8
   9 Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
  10 Fixes: 9b0cdefa4cd5 ("net: mvneta: add ethtool statistics")
  11 Signed-off-by: David S. Miller <davem@davemloft.net>
  12 ---
  13
  14 --- a/drivers/net/ethernet/marvell/mvneta.c
  15 +++ b/drivers/net/ethernet/marvell/mvneta.c
  16 @@ -3242,26 +3242,25 @@ static void mvneta_ethtool_update_stats(
  17         const struct mvneta_statistic *s;
  18         void __iomem *base = pp->base;
  19         u32 high, low, val;
  20 +       u64 val64;
  21         int i;
  22
  23         for (i = 0, s = mvneta_statistics;
  24              s < mvneta_statistics + ARRAY_SIZE(mvneta_statistics);
  25              s++, i++) {
  26 -               val = 0;
  27 -
  28                 switch (s->type) {
  29                 case T_REG_32:
  30                         val = readl_relaxed(base + s->offset);
  31 +                       pp->ethtool_stats[i] += val;
  32                         break;
  33                 case T_REG_64:
  34                         /* Docs say to read low 32-bit then high */
  35                         low = readl_relaxed(base + s->offset);
  36                         high = readl_relaxed(base + s->offset + 4);
  37 -                       val = (u64)high << 32 | low;
  38 +                       val64 = (u64)high << 32 | low;
  39 +                       pp->ethtool_stats[i] += val64;
  40                         break;
  41                 }
  42 -
  43 -               pp->ethtool_stats[i] += val;
  44         }
  45  }
  46