2020-10-20 17:31:50

by Xiaoliang Yang

[permalink] [raw]
Subject: [RFC, net-next 1/3] net: dsa: ethtool preempt ops support on slave ports

Preempt_set and preempt_get are new functions of ethtool ops, which
is to configure frame preemption according to 802.1qbu and 802.3br.
Add them on slave ports of DSA framework, so that DSA devices can
support to configure frame preemption by using ethtool.

Signed-off-by: Xiaoliang Yang <[email protected]>
---
include/net/dsa.h | 12 ++++++++++++
net/dsa/slave.c | 26 ++++++++++++++++++++++++++
2 files changed, 38 insertions(+)

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 35429a140dfa..85b196ade511 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -499,6 +499,18 @@ struct dsa_switch_ops {
int (*get_ts_info)(struct dsa_switch *ds, int port,
struct ethtool_ts_info *ts);

+ /*
+ * ethtool --set-frame-preemption
+ */
+ int (*set_preempt)(struct dsa_switch *ds, int port,
+ struct ethtool_fp *fpcmd);
+
+ /*
+ * ethtool --show-frame-preemption
+ */
+ int (*get_preempt)(struct dsa_switch *ds, int port,
+ struct ethtool_fp *fpcmd);
+
/*
* Suspend and resume
*/
diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index e7c1d62fde99..f51a1575266c 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -1281,6 +1281,30 @@ static int dsa_slave_get_ts_info(struct net_device *dev,
return ds->ops->get_ts_info(ds, p->dp->index, ts);
}

+static int dsa_slave_set_preempt(struct net_device *dev,
+ struct ethtool_fp *fpcmd)
+{
+ struct dsa_slave_priv *p = netdev_priv(dev);
+ struct dsa_switch *ds = p->dp->ds;
+
+ if (!ds->ops->set_preempt)
+ return -EOPNOTSUPP;
+
+ return ds->ops->set_preempt(ds, p->dp->index, fpcmd);
+}
+
+static int dsa_slave_get_preempt(struct net_device *dev,
+ struct ethtool_fp *fpcmd)
+{
+ struct dsa_slave_priv *p = netdev_priv(dev);
+ struct dsa_switch *ds = p->dp->ds;
+
+ if (!ds->ops->get_preempt)
+ return -EOPNOTSUPP;
+
+ return ds->ops->get_preempt(ds, p->dp->index, fpcmd);
+}
+
static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto,
u16 vid)
{
@@ -1571,6 +1595,8 @@ static const struct ethtool_ops dsa_slave_ethtool_ops = {
.get_rxnfc = dsa_slave_get_rxnfc,
.set_rxnfc = dsa_slave_set_rxnfc,
.get_ts_info = dsa_slave_get_ts_info,
+ .set_preempt = dsa_slave_set_preempt,
+ .get_preempt = dsa_slave_get_preempt,
};

/* legacy way, bypassing the bridge *****************************************/
--
2.18.4