Message ID | 20190915020003.27926-3-olteanv@gmail.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | tc-taprio offload for SJA1105 DSA | expand |
On Sun, Sep 15, 2019 at 04:59:59AM +0300, Vladimir Oltean wrote: > DSA currently handles shared block filters (for the classifier-action > qdisc) in the core due to what I believe are simply pragmatic reasons - > hiding the complexity from drivers and offerring a simple API for port > mirroring. > > Extend the dsa_slave_setup_tc function by passing all other qdisc > offloads to the driver layer, where the driver may choose what it > implements and how. DSA is simply a pass-through in this case. > > Signed-off-by: Vladimir Oltean <olteanv@gmail.com> > Acked-by: Kurt Kanzenbach <kurt@linutronix.de> > Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> > --- > Changes since v2: > - Added Florian Fainelli's Reviewed-by. > > Changes since v1: > - Added Kurt Kanzenbach's Acked-by. > > Changes since RFC: > - Removed the unused declaration of struct tc_taprio_qopt_offload. > > include/net/dsa.h | 2 ++ > net/dsa/slave.c | 12 ++++++++---- > 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/include/net/dsa.h b/include/net/dsa.h > index 96acb14ec1a8..541fb514e31d 100644 > --- a/include/net/dsa.h > +++ b/include/net/dsa.h > @@ -515,6 +515,8 @@ struct dsa_switch_ops { > bool ingress); > void (*port_mirror_del)(struct dsa_switch *ds, int port, > struct dsa_mall_mirror_tc_entry *mirror); > + int (*port_setup_tc)(struct dsa_switch *ds, int port, > + enum tc_setup_type type, void *type_data); > > /* > * Cross-chip operations > diff --git a/net/dsa/slave.c b/net/dsa/slave.c > index 9a88035517a6..75d58229a4bd 100644 > --- a/net/dsa/slave.c > +++ b/net/dsa/slave.c > @@ -1035,12 +1035,16 @@ static int dsa_slave_setup_tc_block(struct net_device *dev, > static int dsa_slave_setup_tc(struct net_device *dev, enum tc_setup_type type, > void *type_data) > { > - switch (type) { > - case TC_SETUP_BLOCK: > + struct dsa_port *dp = dsa_slave_to_port(dev); > + struct dsa_switch *ds = dp->ds; > + > + if (type == TC_SETUP_BLOCK) > return dsa_slave_setup_tc_block(dev, type_data); > - default: > + > + if (!ds->ops->port_setup_tc) > return -EOPNOTSUPP; > - } > + > + return ds->ops->port_setup_tc(ds, dp->index, type, type_data); > } > > static void dsa_slave_get_stats64(struct net_device *dev, > -- > 2.17.1 > Acked-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
diff --git a/include/net/dsa.h b/include/net/dsa.h index 96acb14ec1a8..541fb514e31d 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -515,6 +515,8 @@ struct dsa_switch_ops { bool ingress); void (*port_mirror_del)(struct dsa_switch *ds, int port, struct dsa_mall_mirror_tc_entry *mirror); + int (*port_setup_tc)(struct dsa_switch *ds, int port, + enum tc_setup_type type, void *type_data); /* * Cross-chip operations diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 9a88035517a6..75d58229a4bd 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -1035,12 +1035,16 @@ static int dsa_slave_setup_tc_block(struct net_device *dev, static int dsa_slave_setup_tc(struct net_device *dev, enum tc_setup_type type, void *type_data) { - switch (type) { - case TC_SETUP_BLOCK: + struct dsa_port *dp = dsa_slave_to_port(dev); + struct dsa_switch *ds = dp->ds; + + if (type == TC_SETUP_BLOCK) return dsa_slave_setup_tc_block(dev, type_data); - default: + + if (!ds->ops->port_setup_tc) return -EOPNOTSUPP; - } + + return ds->ops->port_setup_tc(ds, dp->index, type, type_data); } static void dsa_slave_get_stats64(struct net_device *dev,