[net-next RFC PATCH v2 6/8] net: dsa: tag_qca: Add support for handling Ethernet mdio and MIB packet
flat view
STALE1770d
SUPERSEDED
From: Ansuel Smith <ansuelsmth@gmail.com>
Date: 2021-12-08 03:41:14
Also in:
lkml
Subsystem:
networking [dsa], networking [general], qualcomm atheros qca8k dsa switch driver, the rest · Maintainers:
Andrew Lunn, Vladimir Oltean, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Christian Marangi, Linus Torvalds
Revision v2 of 8 in this series.
Revisions (8)
Add connect/disconnect helper to assign private struct to the cpu port dsa priv. Add support for Ethernet mdio packet and MIB packet if the dsa driver provide an handler to correctly parse and elaborate the data. Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> --- include/linux/dsa/tag_qca.h | 7 ++++++ net/dsa/tag_qca.c | 49 +++++++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/include/linux/dsa/tag_qca.h b/include/linux/dsa/tag_qca.h
index 578a4aeafd92..f403fdab6f29 100644
--- a/include/linux/dsa/tag_qca.h
+++ b/include/linux/dsa/tag_qca.h@@ -59,4 +59,11 @@ struct mdio_ethhdr { u16 hdr; /* qca hdr */ } __packed; +struct qca8k_port_tag { + void (*rw_reg_ack_handler)(struct dsa_port *dp, + struct sk_buff *skb); + void (*mib_autocast_handler)(struct dsa_port *dp, + struct sk_buff *skb); +}; + #endif /* __TAG_QCA_H */
diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c
index b8b05d54a74c..451183f0461a 100644
--- a/net/dsa/tag_qca.c
+++ b/net/dsa/tag_qca.c@@ -32,6 +32,8 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev) static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev) { + struct dsa_port *dp = dev->dsa_ptr; + struct qca8k_port_tag *header = dp->priv; u16 hdr, pk_type; __be16 *phdr; int port;
@@ -51,9 +53,19 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev) /* Get pk type */ pk_type = FIELD_GET(QCA_HDR_RECV_TYPE, hdr); - /* MDIO read/write packet */ - if (pk_type == QCA_HDR_RECV_TYPE_RW_REG_ACK) + /* Ethernet MDIO read/write packet */ + if (pk_type == QCA_HDR_RECV_TYPE_RW_REG_ACK) { + if (header->rw_reg_ack_handler) + header->rw_reg_ack_handler(dp, skb); return NULL; + } + + /* Ethernet MIB counter packet */ + if (pk_type == QCA_HDR_RECV_TYPE_MIB) { + if (header->mib_autocast_handler) + header->mib_autocast_handler(dp, skb); + return NULL; + } /* Remove QCA tag and recalculate checksum */ skb_pull_rcsum(skb, QCA_HDR_LEN);
@@ -69,9 +81,42 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev) return skb; } +static int qca_tag_connect(struct dsa_switch_tree *dst) +{ + struct qca8k_port_tag *header; + struct dsa_port *dp; + + list_for_each_entry(dp, &dst->ports, list) { + if (!dsa_port_is_cpu(dp)) + continue; + + header = kzalloc(sizeof(*header), GFP_KERNEL); + if (!header) + return -ENOMEM; + + dp->priv = header; + } + + return 0; +} + +static void qca_tag_disconnect(struct dsa_switch_tree *dst) +{ + struct dsa_port *dp; + + list_for_each_entry(dp, &dst->ports, list) { + if (!dsa_port_is_cpu(dp)) + continue; + + kfree(dp->priv); + } +} + static const struct dsa_device_ops qca_netdev_ops = { .name = "qca", .proto = DSA_TAG_PROTO_QCA, + .connect = qca_tag_connect, + .disconnect = qca_tag_disconnect, .xmit = qca_tag_xmit, .rcv = qca_tag_rcv, .needed_headroom = QCA_HDR_LEN,
--
2.32.0