netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Marek Behún" <kabel@kernel.org>
To: netdev@vger.kernel.org, Andrew Lunn <andrew@lunn.ch>,
	Vivien Didelot <vivien.didelot@gmail.com>
Cc: "David S . Miller" <davem@davemloft.net>,
	"Jakub Kicinski" <kuba@kernel.org>,
	"Marek Behún" <kabel@kernel.org>
Subject: [PATCH net v2 5/6] net: dsa: mv88e6xxx: enable SerDes RX stats for Topaz
Date: Thu,  1 Jul 2021 00:22:30 +0200	[thread overview]
Message-ID: <20210630222231.2297-6-kabel@kernel.org> (raw)
In-Reply-To: <20210630222231.2297-1-kabel@kernel.org>

Commit 0df952873636a ("mv88e6xxx: Add serdes Rx statistics") added
support for RX statistics on SerDes ports for Peridot.

This same implementation is also valid for Topaz, but was not enabled
at the time.

We need to use the generic .serdes_get_lane() method instead of the
Peridot specific one in the stats methods so that on Topaz the proper
one is used.

Signed-off-by: Marek Behún <kabel@kernel.org>
Fixes: 0df952873636a ("mv88e6xxx: Add serdes Rx statistics")
---
 drivers/net/dsa/mv88e6xxx/chip.c   | 6 ++++++
 drivers/net/dsa/mv88e6xxx/serdes.c | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c
index 354ff0b84b7f..1e95a0facbd4 100644
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -3623,6 +3623,9 @@ static const struct mv88e6xxx_ops mv88e6141_ops = {
 	.serdes_irq_enable = mv88e6390_serdes_irq_enable,
 	.serdes_irq_status = mv88e6390_serdes_irq_status,
 	.gpio_ops = &mv88e6352_gpio_ops,
+	.serdes_get_sset_count = mv88e6390_serdes_get_sset_count,
+	.serdes_get_strings = mv88e6390_serdes_get_strings,
+	.serdes_get_stats = mv88e6390_serdes_get_stats,
 	.phylink_validate = mv88e6341_phylink_validate,
 };
 
@@ -4429,6 +4432,9 @@ static const struct mv88e6xxx_ops mv88e6341_ops = {
 	.gpio_ops = &mv88e6352_gpio_ops,
 	.avb_ops = &mv88e6390_avb_ops,
 	.ptp_ops = &mv88e6352_ptp_ops,
+	.serdes_get_sset_count = mv88e6390_serdes_get_sset_count,
+	.serdes_get_strings = mv88e6390_serdes_get_strings,
+	.serdes_get_stats = mv88e6390_serdes_get_stats,
 	.phylink_validate = mv88e6341_phylink_validate,
 };
 
diff --git a/drivers/net/dsa/mv88e6xxx/serdes.c b/drivers/net/dsa/mv88e6xxx/serdes.c
index e4fbef81bc52..b1d46dd8eaab 100644
--- a/drivers/net/dsa/mv88e6xxx/serdes.c
+++ b/drivers/net/dsa/mv88e6xxx/serdes.c
@@ -722,7 +722,7 @@ static struct mv88e6390_serdes_hw_stat mv88e6390_serdes_hw_stats[] = {
 
 int mv88e6390_serdes_get_sset_count(struct mv88e6xxx_chip *chip, int port)
 {
-	if (mv88e6390_serdes_get_lane(chip, port) < 0)
+	if (mv88e6xxx_serdes_get_lane(chip, port) < 0)
 		return 0;
 
 	return ARRAY_SIZE(mv88e6390_serdes_hw_stats);
@@ -734,7 +734,7 @@ int mv88e6390_serdes_get_strings(struct mv88e6xxx_chip *chip,
 	struct mv88e6390_serdes_hw_stat *stat;
 	int i;
 
-	if (mv88e6390_serdes_get_lane(chip, port) < 0)
+	if (mv88e6xxx_serdes_get_lane(chip, port) < 0)
 		return 0;
 
 	for (i = 0; i < ARRAY_SIZE(mv88e6390_serdes_hw_stats); i++) {
@@ -770,7 +770,7 @@ int mv88e6390_serdes_get_stats(struct mv88e6xxx_chip *chip, int port,
 	int lane;
 	int i;
 
-	lane = mv88e6390_serdes_get_lane(chip, port);
+	lane = mv88e6xxx_serdes_get_lane(chip, port);
 	if (lane < 0)
 		return 0;
 
-- 
2.31.1


  parent reply	other threads:[~2021-06-30 22:22 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-30 17:43 [PATCH net 0/6] dsa: mv88e6xxx: Topaz fixes Marek Behún
2021-06-30 17:43 ` [PATCH net 1/6] net: dsa: mv88e6xxx: enable .port_set_policy() on Topaz Marek Behún
2021-06-30 20:02   ` Andrew Lunn
2021-06-30 17:43 ` [PATCH net 2/6] net: dsa: mv88e6xxx: use correct .stats_set_histogram() " Marek Behún
2021-06-30 20:03   ` Andrew Lunn
2021-06-30 17:43 ` [PATCH net 3/6] net: dsa: mv88e6xxx: enable .rmu_disable() " Marek Behún
2021-06-30 20:07   ` Andrew Lunn
2021-06-30 17:43 ` [PATCH net 4/6] net: dsa: mv88e6xxx: enable devlink ATU hash param for Topaz Marek Behún
2021-06-30 20:08   ` Andrew Lunn
2021-06-30 17:43 ` [PATCH net 5/6] net: dsa: mv88e6xxx: enable SerDes RX stats " Marek Behún
2021-06-30 20:08   ` Andrew Lunn
2021-06-30 22:15   ` Marek Behún
2021-06-30 17:43 ` [PATCH net 6/6] net: dsa: mv88e6xxx: enable SerDes PCS register dump via ethtool -d on Topaz Marek Behún
2021-06-30 20:10   ` Andrew Lunn
2021-06-30 22:22 ` [PATCH net v2 0/6] dsa: mv88e6xxx: Topaz fixes Marek Behún
2021-06-30 22:22   ` [PATCH net v2 1/6] net: dsa: mv88e6xxx: enable .port_set_policy() on Topaz Marek Behún
2021-06-30 22:22   ` [PATCH net v2 2/6] net: dsa: mv88e6xxx: use correct .stats_set_histogram() " Marek Behún
2021-06-30 22:22   ` [PATCH net v2 3/6] net: dsa: mv88e6xxx: enable .rmu_disable() " Marek Behún
2021-06-30 22:22   ` [PATCH net v2 4/6] net: dsa: mv88e6xxx: enable devlink ATU hash param for Topaz Marek Behún
2021-06-30 22:22   ` Marek Behún [this message]
2021-06-30 22:22   ` [PATCH net v2 6/6] net: dsa: mv88e6xxx: enable SerDes PCS register dump via ethtool -d on Topaz Marek Behún

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210630222231.2297-6-kabel@kernel.org \
    --to=kabel@kernel.org \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=vivien.didelot@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).