| From foo@baz Fri 31 May 2019 03:24:14 PM PDT |
| From: Rasmus Villemoes <rasmus.villemoes@prevas.dk> |
| Date: Wed, 29 May 2019 07:02:11 +0000 |
| Subject: net: dsa: mv88e6xxx: fix handling of upper half of STATS_TYPE_PORT |
| |
| From: Rasmus Villemoes <rasmus.villemoes@prevas.dk> |
| |
| [ Upstream commit 84b3fd1fc9592d431e23b077e692fa4e3fd0f086 ] |
| |
| Currently, the upper half of a 4-byte STATS_TYPE_PORT statistic ends |
| up in bits 47:32 of the return value, instead of bits 31:16 as they |
| should. |
| |
| Fixes: 6e46e2d821bb ("net: dsa: mv88e6xxx: Fix u64 statistics") |
| Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> |
| Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/dsa/mv88e6xxx/chip.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/dsa/mv88e6xxx/chip.c |
| +++ b/drivers/net/dsa/mv88e6xxx/chip.c |
| @@ -789,7 +789,7 @@ static uint64_t _mv88e6xxx_get_ethtool_s |
| err = mv88e6xxx_port_read(chip, port, s->reg + 1, ®); |
| if (err) |
| return UINT64_MAX; |
| - high = reg; |
| + low |= ((u32)reg) << 16; |
| } |
| break; |
| case BANK0: |