From: Ansuel Smith <ansuelsmth@gmail.com>
To: Vladimir Oltean <olteanv@gmail.com>
Cc: Andrew Lunn <andrew@lunn.ch>,
Vivien Didelot <vivien.didelot@gmail.com>,
Florian Fainelli <f.fainelli@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [RFC PATCH v7 06/16] net: dsa: tag_qca: add define for handling mgmt Ethernet packet
Date: Mon, 24 Jan 2022 17:16:46 +0100 [thread overview]
Message-ID: <61eed0f1.1c69fb81.5b7bd.585e@mx.google.com> (raw)
In-Reply-To: <20220124160537.6xqdd337mg43ivn6@skbuf>
On Mon, Jan 24, 2022 at 06:05:37PM +0200, Vladimir Oltean wrote:
> On Sun, Jan 23, 2022 at 02:33:27AM +0100, Ansuel Smith wrote:
> > Add all the required define to prepare support for mgmt read/write in
> > Ethernet packet. Any packet of this type has to be dropped as the only
> > use of these special packet is receive ack for an mgmt write request or
> > receive data for an mgmt read request.
> > A struct is used that emulates the Ethernet header but is used for a
> > different purpose.
> >
> > Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
> > ---
> > include/linux/dsa/tag_qca.h | 44 +++++++++++++++++++++++++++++++++++++
> > net/dsa/tag_qca.c | 13 ++++++++---
> > 2 files changed, 54 insertions(+), 3 deletions(-)
> >
> > diff --git a/include/linux/dsa/tag_qca.h b/include/linux/dsa/tag_qca.h
> > index c02d2d39ff4a..1a02f695f3a3 100644
> > --- a/include/linux/dsa/tag_qca.h
> > +++ b/include/linux/dsa/tag_qca.h
> > @@ -12,10 +12,54 @@
> > #define QCA_HDR_RECV_FRAME_IS_TAGGED BIT(3)
> > #define QCA_HDR_RECV_SOURCE_PORT GENMASK(2, 0)
> >
> > +/* Packet type for recv */
> > +#define QCA_HDR_RECV_TYPE_NORMAL 0x0
> > +#define QCA_HDR_RECV_TYPE_MIB 0x1
> > +#define QCA_HDR_RECV_TYPE_RW_REG_ACK 0x2
> > +
> > #define QCA_HDR_XMIT_VERSION GENMASK(15, 14)
> > #define QCA_HDR_XMIT_PRIORITY GENMASK(13, 11)
> > #define QCA_HDR_XMIT_CONTROL GENMASK(10, 8)
> > #define QCA_HDR_XMIT_FROM_CPU BIT(7)
> > #define QCA_HDR_XMIT_DP_BIT GENMASK(6, 0)
> >
> > +/* Packet type for xmit */
> > +#define QCA_HDR_XMIT_TYPE_NORMAL 0x0
> > +#define QCA_HDR_XMIT_TYPE_RW_REG 0x1
> > +
> > +/* Check code for a valid mgmt packet. Switch will ignore the packet
> > + * with this wrong.
> > + */
> > +#define QCA_HDR_MGMT_CHECK_CODE_VAL 0x5
> > +
> > +/* Specific define for in-band MDIO read/write with Ethernet packet */
> > +#define QCA_HDR_MGMT_SEQ_LEN 4 /* 4 byte for the seq */
> > +#define QCA_HDR_MGMT_COMMAND_LEN 4 /* 4 byte for the command */
> > +#define QCA_HDR_MGMT_DATA1_LEN 4 /* First 4 byte for the mdio data */
> > +#define QCA_HDR_MGMT_HEADER_LEN (QCA_HDR_MGMT_SEQ_LEN + \
> > + QCA_HDR_MGMT_COMMAND_LEN + \
> > + QCA_HDR_MGMT_DATA1_LEN)
> > +
> > +#define QCA_HDR_MGMT_DATA2_LEN 12 /* Other 12 byte for the mdio data */
> > +#define QCA_HDR_MGMT_PADDING_LEN 34 /* Padding to reach the min Ethernet packet */
> > +
> > +#define QCA_HDR_MGMT_PKG_LEN (QCA_HDR_MGMT_HEADER_LEN + \
> > + QCA_HDR_LEN + \
> > + QCA_HDR_MGMT_DATA2_LEN + \
> > + QCA_HDR_MGMT_PADDING_LEN)
>
> s/PKG/PKT/
>
> > +
> > +#define QCA_HDR_MGMT_SEQ_NUM GENMASK(31, 0) /* 63, 32 */
> > +#define QCA_HDR_MGMT_CHECK_CODE GENMASK(31, 29) /* 31, 29 */
> > +#define QCA_HDR_MGMT_CMD BIT(28) /* 28 */
> > +#define QCA_HDR_MGMT_LENGTH GENMASK(23, 20) /* 23, 20 */
> > +#define QCA_HDR_MGMT_ADDR GENMASK(18, 0) /* 18, 0 */
> > +
> > +/* Special struct emulating a Ethernet header */
> > +struct mgmt_ethhdr {
> > + u32 command; /* command bit 31:0 */
> > + u32 seq; /* seq 63:32 */
> > + u32 mdio_data; /* first 4byte mdio */
> > + __be16 hdr; /* qca hdr */
> > +} __packed;
>
> Could you name this something a bit more specific, like qca_mgmt_ethhdr?
>
Sure will fix in v8.
> > +
> > #endif /* __TAG_QCA_H */
> > diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c
> > index f8df49d5956f..c57d6e1a0c0c 100644
> > --- a/net/dsa/tag_qca.c
> > +++ b/net/dsa/tag_qca.c
> > @@ -32,10 +32,10 @@ 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)
> > {
> > - u8 ver;
> > - u16 hdr;
> > - int port;
> > + u16 hdr, pk_type;
> > __be16 *phdr;
> > + int port;
> > + u8 ver;
> >
> > if (unlikely(!pskb_may_pull(skb, QCA_HDR_LEN)))
> > return NULL;
> > @@ -48,6 +48,13 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev)
> > if (unlikely(ver != QCA_HDR_VERSION))
> > return NULL;
> >
> > + /* Get pk type */
> > + pk_type = FIELD_GET(QCA_HDR_RECV_TYPE, hdr);
> > +
> > + /* Ethernet MDIO read/write packet */
> > + if (pk_type == QCA_HDR_RECV_TYPE_RW_REG_ACK)
> > + return NULL;
> > +
> > /* Remove QCA tag and recalculate checksum */
> > skb_pull_rcsum(skb, QCA_HDR_LEN);
> > dsa_strip_etype_header(skb, QCA_HDR_LEN);
> > --
> > 2.33.1
> >
>
--
Ansuel
next prev parent reply other threads:[~2022-01-24 16:16 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-23 1:33 [RFC PATCH v7 00/16] Add support for qca8k mdio rw in Ethernet packet Ansuel Smith
2022-01-23 1:33 ` [RFC PATCH v7 01/16] net: dsa: provide switch operations for tracking the master state Ansuel Smith
2022-01-26 3:22 ` Florian Fainelli
2022-01-26 21:00 ` Vladimir Oltean
2022-01-23 1:33 ` [RFC PATCH v7 02/16] net: dsa: replay master state events in dsa_tree_{setup,teardown}_master Ansuel Smith
2022-01-26 3:27 ` Florian Fainelli
2022-01-23 1:33 ` [RFC PATCH v7 03/16] net: dsa: tag_qca: convert to FIELD macro Ansuel Smith
2022-01-24 16:00 ` Vladimir Oltean
2022-01-26 3:28 ` Florian Fainelli
2022-01-23 1:33 ` [RFC PATCH v7 04/16] net: dsa: tag_qca: move define to include linux/dsa Ansuel Smith
2022-01-24 15:59 ` Vladimir Oltean
2022-01-26 3:28 ` Florian Fainelli
2022-01-23 1:33 ` [RFC PATCH v7 05/16] net: dsa: tag_qca: enable promisc_on_master flag Ansuel Smith
2022-01-26 3:28 ` Florian Fainelli
2022-01-23 1:33 ` [RFC PATCH v7 06/16] net: dsa: tag_qca: add define for handling mgmt Ethernet packet Ansuel Smith
2022-01-24 16:05 ` Vladimir Oltean
2022-01-24 16:16 ` Ansuel Smith [this message]
2022-01-26 3:54 ` Florian Fainelli
2022-01-26 4:01 ` Ansuel Smith
2022-01-26 4:02 ` Florian Fainelli
2022-01-26 4:05 ` Ansuel Smith
2022-01-26 3:57 ` Florian Fainelli
2022-01-23 1:33 ` [RFC PATCH v7 07/16] net: dsa: tag_qca: add define for handling MIB packet Ansuel Smith
2022-01-23 1:33 ` [RFC PATCH v7 08/16] net: dsa: tag_qca: add support for handling mgmt and MIB Ethernet packet Ansuel Smith
2022-01-24 16:08 ` Vladimir Oltean
2022-01-26 3:34 ` Florian Fainelli
2022-01-23 1:33 ` [RFC PATCH v7 09/16] net: dsa: qca8k: add tracking state of master port Ansuel Smith
2022-01-26 3:37 ` Florian Fainelli
2022-01-23 1:33 ` [RFC PATCH v7 10/16] net: dsa: qca8k: add support for mgmt read/write in Ethernet packet Ansuel Smith
2022-01-24 16:32 ` Vladimir Oltean
2022-01-24 16:48 ` Ansuel Smith
2022-01-25 14:54 ` Vladimir Oltean
2022-01-23 1:33 ` [RFC PATCH v7 11/16] net: dsa: qca8k: add support for mib autocast " Ansuel Smith
2022-01-25 15:12 ` Vladimir Oltean
2022-01-23 1:33 ` [RFC PATCH v7 12/16] net: dsa: qca8k: add support for phy read/write with mgmt Ethernet Ansuel Smith
2022-01-25 15:03 ` Vladimir Oltean
2022-01-25 23:14 ` Ansuel Smith
2022-01-26 1:48 ` Vladimir Oltean
2022-01-26 1:57 ` Ansuel Smith
2022-01-26 22:05 ` Vladimir Oltean
2022-01-23 1:33 ` [RFC PATCH v7 13/16] net: dsa: qca8k: move page cache to driver priv Ansuel Smith
2022-01-26 3:50 ` Florian Fainelli
2022-02-01 21:39 ` Ansuel Smith
2022-01-23 1:33 ` [RFC PATCH v7 14/16] net: dsa: qca8k: cache lo and hi for mdio write Ansuel Smith
2022-01-26 3:42 ` Florian Fainelli
2022-01-23 1:33 ` [RFC PATCH v7 15/16] net: da: qca8k: add support for larger read/write size with mgmt Ethernet Ansuel Smith
2022-01-26 3:48 ` Florian Fainelli
2022-01-26 3:57 ` Ansuel Smith
2022-01-23 1:33 ` [RFC PATCH v7 16/16] net: dsa: qca8k: introduce qca8k_bulk_read/write function Ansuel Smith
2022-01-26 3:45 ` Florian Fainelli
2022-01-26 3:53 ` Ansuel Smith
2022-01-30 13:59 ` [RFC PATCH v7 00/16] Add support for qca8k mdio rw in Ethernet packet Ansuel Smith
2022-01-30 17:07 ` Florian Fainelli
2022-02-03 17:59 ` Ansuel Smith
2022-02-03 18:21 ` Vladimir Oltean
2022-02-03 20:10 ` Jakub Kicinski
2022-02-03 20:31 ` Ansuel Smith
2022-02-03 21:25 ` 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=61eed0f1.1c69fb81.5b7bd.585e@mx.google.com \
--to=ansuelsmth@gmail.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olteanv@gmail.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;
as well as URLs for NNTP newsgroup(s).