net: dsa: mv88e6xxx: Fix u64 statistics

lunn · davem330 · commit 6e46e2d821bb · 2019-02-28T12:53:02.000-08:00
The switch maintains u64 counters for the number of octets sent and received. These are kept as two u32's which need to be combined. Fix the combing, which wrongly worked on u16's. Fixes: 80c4627 ("dsa: mv88x6xxx: Refactor getting a single statistic") Reported-by: Chris Healy <Chris.Healy@zii.aero> Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -896,7 +896,7 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip,
 	default:
 		return U64_MAX;
 	}
-	value = (((u64)high) << 16) | low;
+	value = (((u64)high) << 32) | low;
 	return value;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -896,7 +896,7 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct mv88e6xxx_chip *chip,`
`896`	`896`	`default:`
`897`	`897`	`return U64_MAX;`
`898`	`898`	`}`
`899`		`- value = (((u64)high) << 16) \| low;`
	`899`	`+ value = (((u64)high) << 32) \| low;`
`900`	`900`	`return value;`
`901`	`901`	`}`
`902`	`902`