]>
Commit | Line | Data |
---|---|---|
ffc20820 GKH |
1 | From foo@baz Fri 31 May 2019 03:16:39 PM PDT |
2 | From: Rasmus Villemoes <rasmus.villemoes@prevas.dk> | |
3 | Date: Wed, 29 May 2019 07:02:11 +0000 | |
4 | Subject: net: dsa: mv88e6xxx: fix handling of upper half of STATS_TYPE_PORT | |
5 | ||
6 | From: Rasmus Villemoes <rasmus.villemoes@prevas.dk> | |
7 | ||
8 | [ Upstream commit 84b3fd1fc9592d431e23b077e692fa4e3fd0f086 ] | |
9 | ||
10 | Currently, the upper half of a 4-byte STATS_TYPE_PORT statistic ends | |
11 | up in bits 47:32 of the return value, instead of bits 31:16 as they | |
12 | should. | |
13 | ||
14 | Fixes: 6e46e2d821bb ("net: dsa: mv88e6xxx: Fix u64 statistics") | |
15 | Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> | |
16 | Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com> | |
17 | Signed-off-by: David S. Miller <davem@davemloft.net> | |
18 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
19 | --- | |
20 | drivers/net/dsa/mv88e6xxx/chip.c | 2 +- | |
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
22 | ||
23 | --- a/drivers/net/dsa/mv88e6xxx/chip.c | |
24 | +++ b/drivers/net/dsa/mv88e6xxx/chip.c | |
25 | @@ -910,7 +910,7 @@ static uint64_t _mv88e6xxx_get_ethtool_s | |
26 | err = mv88e6xxx_port_read(chip, port, s->reg + 1, ®); | |
27 | if (err) | |
28 | return U64_MAX; | |
29 | - high = reg; | |
30 | + low |= ((u32)reg) << 16; | |
31 | } | |
32 | break; | |
33 | case STATS_TYPE_BANK1: |