* [PATCH] net: mvneta: fix trivial cut-off issue in mvneta_ethtool_update_stats
@ 2016-01-20 8:36 Jisheng Zhang
2016-01-21 20:04 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jisheng Zhang @ 2016-01-20 8:36 UTC (permalink / raw)
To: thomas.petazzoni, netdev; +Cc: linux-kernel, rmk+kernel, Jisheng Zhang
When s->type is T_REG_64, the high 32bits are lost in val. This patch
fixes this trivial issue.
Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
Fixes: 9b0cdefa4cd5 ("net: mvneta: add ethtool statistics")
---
drivers/net/ethernet/marvell/mvneta.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 6bb709a..ea3b034 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3244,26 +3244,25 @@ static void mvneta_ethtool_update_stats(struct mvneta_port *pp)
const struct mvneta_statistic *s;
void __iomem *base = pp->base;
u32 high, low, val;
+ u64 val64;
int i;
for (i = 0, s = mvneta_statistics;
s < mvneta_statistics + ARRAY_SIZE(mvneta_statistics);
s++, i++) {
- val = 0;
-
switch (s->type) {
case T_REG_32:
val = readl_relaxed(base + s->offset);
+ pp->ethtool_stats[i] += val;
break;
case T_REG_64:
/* Docs say to read low 32-bit then high */
low = readl_relaxed(base + s->offset);
high = readl_relaxed(base + s->offset + 4);
- val = (u64)high << 32 | low;
+ val64 = (u64)high << 32 | low;
+ pp->ethtool_stats[i] += val64;
break;
}
-
- pp->ethtool_stats[i] += val;
}
}
--
2.7.0.rc3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: mvneta: fix trivial cut-off issue in mvneta_ethtool_update_stats
2016-01-20 8:36 [PATCH] net: mvneta: fix trivial cut-off issue in mvneta_ethtool_update_stats Jisheng Zhang
@ 2016-01-21 20:04 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2016-01-21 20:04 UTC (permalink / raw)
To: jszhang; +Cc: thomas.petazzoni, netdev, linux-kernel, rmk+kernel
From: Jisheng Zhang <jszhang@marvell.com>
Date: Wed, 20 Jan 2016 16:36:25 +0800
> When s->type is T_REG_64, the high 32bits are lost in val. This patch
> fixes this trivial issue.
>
> Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
> Fixes: 9b0cdefa4cd5 ("net: mvneta: add ethtool statistics")
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-21 20:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-20 8:36 [PATCH] net: mvneta: fix trivial cut-off issue in mvneta_ethtool_update_stats Jisheng Zhang
2016-01-21 20:04 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).