* [PATCH net-next 0/2] Fixes for mv88e6161
@ 2017-06-02 21:22 Andrew Lunn
2017-06-02 21:22 ` [PATCH net-next 1/2] net: dsa: mv88e6xxx: 6161 uses global 2 for PHY access Andrew Lunn
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Andrew Lunn @ 2017-06-02 21:22 UTC (permalink / raw)
To: David Miller
Cc: Vivien Didelot, Chris Healy, Nikita Yushchenko, netdev, Andrew Lunn
Testing a board with an mv88e6161 turned up two issues. The PHYs were
not found, because the wrong method to access them was used. The
statistics did not work, because the wrong snapshot method was used
Andrew Lunn (2):
net: dsa: mv88e6xxx: mv88e6161 uses global 2 for PHY access
net: dsa: mv88e6xxx: mv88e6161 uses mv88e6320 stats snapshot
drivers/net/dsa/mv88e6xxx/chip.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--
2.11.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH net-next 1/2] net: dsa: mv88e6xxx: 6161 uses global 2 for PHY access
2017-06-02 21:22 [PATCH net-next 0/2] Fixes for mv88e6161 Andrew Lunn
@ 2017-06-02 21:22 ` Andrew Lunn
2017-06-02 21:28 ` Vivien Didelot
2017-06-02 21:22 ` [PATCH net-next 2/2] net: dsa: mv88e6xxx: mv88e6161 uses mv88e6320 stats snapshot Andrew Lunn
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Andrew Lunn @ 2017-06-02 21:22 UTC (permalink / raw)
To: David Miller
Cc: Vivien Didelot, Chris Healy, Nikita Yushchenko, netdev, Andrew Lunn
Access to the internal PHYs of the 6161 and 6123 go through global 2
SMI registers. Fix the ops structure.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
drivers/net/dsa/mv88e6xxx/chip.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 7cf470c3e662..80ed4ab84028 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2455,8 +2455,8 @@ static const struct mv88e6xxx_ops mv88e6097_ops = {
static const struct mv88e6xxx_ops mv88e6123_ops = {
/* MV88E6XXX_FAMILY_6165 */
.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
- .phy_read = mv88e6165_phy_read,
- .phy_write = mv88e6165_phy_write,
+ .phy_read = mv88e6xxx_g2_smi_phy_read,
+ .phy_write = mv88e6xxx_g2_smi_phy_write,
.port_set_link = mv88e6xxx_port_set_link,
.port_set_duplex = mv88e6xxx_port_set_duplex,
.port_set_speed = mv88e6185_port_set_speed,
@@ -2544,8 +2544,8 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
static const struct mv88e6xxx_ops mv88e6161_ops = {
/* MV88E6XXX_FAMILY_6165 */
.set_switch_mac = mv88e6xxx_g2_set_switch_mac,
- .phy_read = mv88e6165_phy_read,
- .phy_write = mv88e6165_phy_write,
+ .phy_read = mv88e6xxx_g2_smi_phy_read,
+ .phy_write = mv88e6xxx_g2_smi_phy_write,
.port_set_link = mv88e6xxx_port_set_link,
.port_set_duplex = mv88e6xxx_port_set_duplex,
.port_set_speed = mv88e6185_port_set_speed,
--
2.11.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH net-next 2/2] net: dsa: mv88e6xxx: mv88e6161 uses mv88e6320 stats snapshot
2017-06-02 21:22 [PATCH net-next 0/2] Fixes for mv88e6161 Andrew Lunn
2017-06-02 21:22 ` [PATCH net-next 1/2] net: dsa: mv88e6xxx: 6161 uses global 2 for PHY access Andrew Lunn
@ 2017-06-02 21:22 ` Andrew Lunn
2017-06-02 21:28 ` Vivien Didelot
2017-06-02 21:29 ` [PATCH net-next 0/2] Fixes for mv88e6161 Vivien Didelot
2017-06-05 1:35 ` David Miller
3 siblings, 1 reply; 7+ messages in thread
From: Andrew Lunn @ 2017-06-02 21:22 UTC (permalink / raw)
To: David Miller
Cc: Vivien Didelot, Chris Healy, Nikita Yushchenko, netdev, Andrew Lunn
The mv88e6161 was using the wrong method to perform statistics
snapshot.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
drivers/net/dsa/mv88e6xxx/chip.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 80ed4ab84028..084bc655020a 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2464,7 +2464,7 @@ static const struct mv88e6xxx_ops mv88e6123_ops = {
.port_set_egress_floods = mv88e6352_port_set_egress_floods,
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
- .stats_snapshot = mv88e6xxx_g1_stats_snapshot,
+ .stats_snapshot = mv88e6320_g1_stats_snapshot,
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
.stats_get_strings = mv88e6095_stats_get_strings,
.stats_get_stats = mv88e6095_stats_get_stats,
@@ -2558,7 +2558,7 @@ static const struct mv88e6xxx_ops mv88e6161_ops = {
.port_pause_config = mv88e6097_port_pause_config,
.port_disable_learn_limit = mv88e6xxx_port_disable_learn_limit,
.port_disable_pri_override = mv88e6xxx_port_disable_pri_override,
- .stats_snapshot = mv88e6xxx_g1_stats_snapshot,
+ .stats_snapshot = mv88e6320_g1_stats_snapshot,
.stats_get_sset_count = mv88e6095_stats_get_sset_count,
.stats_get_strings = mv88e6095_stats_get_strings,
.stats_get_stats = mv88e6095_stats_get_stats,
--
2.11.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 1/2] net: dsa: mv88e6xxx: 6161 uses global 2 for PHY access
2017-06-02 21:22 ` [PATCH net-next 1/2] net: dsa: mv88e6xxx: 6161 uses global 2 for PHY access Andrew Lunn
@ 2017-06-02 21:28 ` Vivien Didelot
0 siblings, 0 replies; 7+ messages in thread
From: Vivien Didelot @ 2017-06-02 21:28 UTC (permalink / raw)
To: Andrew Lunn, David Miller
Cc: Chris Healy, Nikita Yushchenko, netdev, Andrew Lunn
Andrew Lunn <andrew@lunn.ch> writes:
> Access to the internal PHYs of the 6161 and 6123 go through global 2
> SMI registers. Fix the ops structure.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 2/2] net: dsa: mv88e6xxx: mv88e6161 uses mv88e6320 stats snapshot
2017-06-02 21:22 ` [PATCH net-next 2/2] net: dsa: mv88e6xxx: mv88e6161 uses mv88e6320 stats snapshot Andrew Lunn
@ 2017-06-02 21:28 ` Vivien Didelot
0 siblings, 0 replies; 7+ messages in thread
From: Vivien Didelot @ 2017-06-02 21:28 UTC (permalink / raw)
To: Andrew Lunn, David Miller
Cc: Chris Healy, Nikita Yushchenko, netdev, Andrew Lunn
Andrew Lunn <andrew@lunn.ch> writes:
> The mv88e6161 was using the wrong method to perform statistics
> snapshot.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 0/2] Fixes for mv88e6161
2017-06-02 21:22 [PATCH net-next 0/2] Fixes for mv88e6161 Andrew Lunn
2017-06-02 21:22 ` [PATCH net-next 1/2] net: dsa: mv88e6xxx: 6161 uses global 2 for PHY access Andrew Lunn
2017-06-02 21:22 ` [PATCH net-next 2/2] net: dsa: mv88e6xxx: mv88e6161 uses mv88e6320 stats snapshot Andrew Lunn
@ 2017-06-02 21:29 ` Vivien Didelot
2017-06-05 1:35 ` David Miller
3 siblings, 0 replies; 7+ messages in thread
From: Vivien Didelot @ 2017-06-02 21:29 UTC (permalink / raw)
To: Andrew Lunn, David Miller
Cc: Chris Healy, Nikita Yushchenko, netdev, Andrew Lunn
Hi Andrew,
Andrew Lunn <andrew@lunn.ch> writes:
> Testing a board with an mv88e6161 turned up two issues. The PHYs were
> not found, because the wrong method to access them was used. The
> statistics did not work, because the wrong snapshot method was used
Thanks for testing!
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH net-next 0/2] Fixes for mv88e6161
2017-06-02 21:22 [PATCH net-next 0/2] Fixes for mv88e6161 Andrew Lunn
` (2 preceding siblings ...)
2017-06-02 21:29 ` [PATCH net-next 0/2] Fixes for mv88e6161 Vivien Didelot
@ 2017-06-05 1:35 ` David Miller
3 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2017-06-05 1:35 UTC (permalink / raw)
To: andrew; +Cc: vivien.didelot, cphealy, nikita.yoush, netdev
From: Andrew Lunn <andrew@lunn.ch>
Date: Fri, 2 Jun 2017 23:22:44 +0200
> Testing a board with an mv88e6161 turned up two issues. The PHYs were
> not found, because the wrong method to access them was used. The
> statistics did not work, because the wrong snapshot method was used
Series applied, thanks Andrew.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-06-05 1:35 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-02 21:22 [PATCH net-next 0/2] Fixes for mv88e6161 Andrew Lunn
2017-06-02 21:22 ` [PATCH net-next 1/2] net: dsa: mv88e6xxx: 6161 uses global 2 for PHY access Andrew Lunn
2017-06-02 21:28 ` Vivien Didelot
2017-06-02 21:22 ` [PATCH net-next 2/2] net: dsa: mv88e6xxx: mv88e6161 uses mv88e6320 stats snapshot Andrew Lunn
2017-06-02 21:28 ` Vivien Didelot
2017-06-02 21:29 ` [PATCH net-next 0/2] Fixes for mv88e6161 Vivien Didelot
2017-06-05 1:35 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.