From: Christian Marangi <ansuelsmth@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
Vladimir Oltean <olteanv@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Tom Rix <trix@redhat.com>, Jens Axboe <axboe@kernel.dk>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Christian Marangi <ansuelsmth@gmail.com>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
llvm@lists.linux.dev
Subject: [net-next PATCH v4 02/14] net: dsa: qca8k: make mib autocast feature optional
Date: Sun, 24 Jul 2022 22:19:26 +0200 [thread overview]
Message-ID: <20220724201938.17387-3-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20220724201938.17387-1-ansuelsmth@gmail.com>
Some switch may not support mib autocast feature and require the legacy
way of reading the regs directly.
Make the mib autocast feature optional and permit to declare support for
it using match_data struct in a dedicated qca8k_info_ops struct.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
drivers/net/dsa/qca/qca8k.c | 11 +++++++++--
drivers/net/dsa/qca/qca8k.h | 5 +++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/net/dsa/qca/qca8k.c b/drivers/net/dsa/qca/qca8k.c
index 212b284f9f73..5d3c3c95ef88 100644
--- a/drivers/net/dsa/qca/qca8k.c
+++ b/drivers/net/dsa/qca/qca8k.c
@@ -2104,8 +2104,8 @@ qca8k_get_ethtool_stats(struct dsa_switch *ds, int port,
u32 hi = 0;
int ret;
- if (priv->mgmt_master &&
- qca8k_get_ethtool_stats_eth(ds, port, data) > 0)
+ if (priv->mgmt_master && priv->info->ops->autocast_mib &&
+ priv->info->ops->autocast_mib(ds, port, data) > 0)
return;
for (i = 0; i < priv->info->mib_count; i++) {
@@ -3248,20 +3248,27 @@ static int qca8k_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(qca8k_pm_ops,
qca8k_suspend, qca8k_resume);
+static const struct qca8k_info_ops qca8xxx_ops = {
+ .autocast_mib = qca8k_get_ethtool_stats_eth,
+};
+
static const struct qca8k_match_data qca8327 = {
.id = QCA8K_ID_QCA8327,
.reduced_package = true,
.mib_count = QCA8K_QCA832X_MIB_COUNT,
+ .ops = &qca8xxx_ops,
};
static const struct qca8k_match_data qca8328 = {
.id = QCA8K_ID_QCA8327,
.mib_count = QCA8K_QCA832X_MIB_COUNT,
+ .ops = &qca8xxx_ops,
};
static const struct qca8k_match_data qca833x = {
.id = QCA8K_ID_QCA8337,
.mib_count = QCA8K_QCA833X_MIB_COUNT,
+ .ops = &qca8xxx_ops,
};
static const struct of_device_id qca8k_of_match[] = {
diff --git a/drivers/net/dsa/qca/qca8k.h b/drivers/net/dsa/qca/qca8k.h
index 0b990b46890a..377ce8c72914 100644
--- a/drivers/net/dsa/qca/qca8k.h
+++ b/drivers/net/dsa/qca/qca8k.h
@@ -324,10 +324,15 @@ enum qca8k_mid_cmd {
QCA8K_MIB_CAST = 3,
};
+struct qca8k_info_ops {
+ int (*autocast_mib)(struct dsa_switch *ds, int port, u64 *data);
+};
+
struct qca8k_match_data {
u8 id;
bool reduced_package;
u8 mib_count;
+ const struct qca8k_info_ops *ops;
};
enum {
--
2.36.1
next prev parent reply other threads:[~2022-07-24 22:51 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-24 20:19 [net-next PATCH v4 00/14] net: dsa: qca8k: code split for qca8k Christian Marangi
2022-07-24 20:19 ` [net-next PATCH v4 01/14] net: dsa: qca8k: cache match data to speed up access Christian Marangi
2022-07-24 20:19 ` Christian Marangi [this message]
2022-07-24 20:19 ` [net-next PATCH v4 03/14] net: dsa: qca8k: move mib struct to common code Christian Marangi
2022-07-24 20:19 ` [net-next PATCH v4 04/14] net: dsa: qca8k: move qca8k read/write/rmw and reg table " Christian Marangi
2022-07-24 20:19 ` [net-next PATCH v4 05/14] net: dsa: qca8k: move qca8k bulk read/write helper " Christian Marangi
2022-07-24 20:19 ` [net-next PATCH v4 06/14] net: dsa: qca8k: move mib init function " Christian Marangi
2022-07-24 20:19 ` [net-next PATCH v4 07/14] net: dsa: qca8k: move port set status/eee/ethtool stats " Christian Marangi
2022-07-24 20:19 ` [net-next PATCH v4 08/14] net: dsa: qca8k: move bridge functions " Christian Marangi
2022-07-24 20:19 ` [net-next PATCH v4 09/14] net: dsa: qca8k: move set age/MTU/port enable/disable " Christian Marangi
2022-07-26 0:17 ` Vladimir Oltean
2022-07-24 20:19 ` [net-next PATCH v4 10/14] net: dsa: qca8k: move port FDB/MDB function " Christian Marangi
2022-07-24 20:19 ` [net-next PATCH v4 11/14] net: dsa: qca8k: move port mirror functions " Christian Marangi
2022-07-24 20:19 ` [net-next PATCH v4 12/14] net: dsa: qca8k: move port VLAN " Christian Marangi
2022-07-24 20:19 ` [net-next PATCH v4 13/14] net: dsa: qca8k: move port LAG " Christian Marangi
2022-07-24 20:19 ` [net-next PATCH v4 14/14] net: dsa: qca8k: move read_switch_id function " Christian Marangi
2022-07-26 0:22 ` [net-next PATCH v4 00/14] net: dsa: qca8k: code split for qca8k Vladimir Oltean
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=20220724201938.17387-3-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=andrew@lunn.ch \
--cc=axboe@kernel.dk \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=f.fainelli@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.com \
--cc=pabeni@redhat.com \
--cc=trix@redhat.com \
--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