From: Tim Harvey <tharvey@gateworks.com>
To: u-boot@lists.denx.de, "Joe Hershberger" <joe.hershberger@ni.com>,
"Ramon Fried" <rfried.dev@gmail.com>,
"Vladimir Oltean" <vladimir.oltean@nxp.com>,
"Stefano Babic" <sbabic@denx.de>,
"Fabio Estevam" <festevam@gmail.com>,
"NXP i . MX U-Boot Team" <uboot-imx@nxp.com>,
"Marek Behún" <marek.behun@nic.cz>
Cc: Tim Harvey <tharvey@gateworks.com>, Fabio Estevam <festevam@denx.de>
Subject: [PATCH v9 4/8] net: dsa: allow rcv() and xmit() to be optional
Date: Wed, 30 Nov 2022 09:42:47 -0800 [thread overview]
Message-ID: <20221130174251.82087-5-tharvey@gateworks.com> (raw)
In-Reply-To: <20221130174251.82087-1-tharvey@gateworks.com>
Allow rcv() and xmit() dsa driver ops to be optional in case a driver
does not care to mangle a packet as in U-Boot only one network port is
enabled at a time and thus no packet mangling is necessary.
Suggested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Fabio Estevam <festevam@denx.de>
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
---
v9:
- fixed dsa_port_send when xmit function is defined
v8:
- no changes
v7:
- no changes
v6:
- no changes
v5:
- added Fabio's rb tag
v4:
- no changes
v3:
- added Vladimir's rb tag
v2: new patch
---
net/dsa-uclass.c | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/net/dsa-uclass.c b/net/dsa-uclass.c
index 211a991cdd0d..dd78e5744d58 100644
--- a/net/dsa-uclass.c
+++ b/net/dsa-uclass.c
@@ -142,20 +142,22 @@ static int dsa_port_send(struct udevice *pdev, void *packet, int length)
struct dsa_port_pdata *port_pdata;
int err;
- if (length + head + tail > PKTSIZE_ALIGN)
- return -EINVAL;
+ if (ops->xmit) {
+ if (length + head + tail > PKTSIZE_ALIGN)
+ return -EINVAL;
- memset(dsa_packet_tmp, 0, head);
- memset(dsa_packet_tmp + head + length, 0, tail);
- memcpy(dsa_packet_tmp + head, packet, length);
- length += head + tail;
- /* copy back to preserve original buffer alignment */
- memcpy(packet, dsa_packet_tmp, length);
+ memset(dsa_packet_tmp, 0, head);
+ memset(dsa_packet_tmp + head + length, 0, tail);
+ memcpy(dsa_packet_tmp + head, packet, length);
+ length += head + tail;
+ /* copy back to preserve original buffer alignment */
+ memcpy(packet, dsa_packet_tmp, length);
- port_pdata = dev_get_parent_plat(pdev);
- err = ops->xmit(dev, port_pdata->index, packet, length);
- if (err)
- return err;
+ port_pdata = dev_get_parent_plat(pdev);
+ err = ops->xmit(dev, port_pdata->index, packet, length);
+ if (err)
+ return err;
+ }
return eth_get_ops(master)->send(master, packet, length);
}
@@ -172,7 +174,7 @@ static int dsa_port_recv(struct udevice *pdev, int flags, uchar **packetp)
int length, port_index, err;
length = eth_get_ops(master)->recv(master, flags, packetp);
- if (length <= 0)
+ if (length <= 0 || !ops->rcv)
return length;
/*
--
2.25.1
next prev parent reply other threads:[~2022-11-30 17:44 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 17:42 [PATCH v9 0/8] Add MV88E6xxx DSA driver and use on gwventana Tim Harvey
2022-11-30 17:42 ` [PATCH v9 1/8] net: mdio-uclass: scan for dm mdio children on post-bind Tim Harvey
2023-02-03 18:20 ` Tom Rini
2022-11-30 17:42 ` [PATCH v9 2/8] net: dsa: move cpu port probe to dsa_post_probe Tim Harvey
2022-11-30 17:42 ` [PATCH v9 3/8] net: dsa: ensure dsa driver has proper ops Tim Harvey
2022-11-30 17:42 ` Tim Harvey [this message]
2022-11-30 17:42 ` [PATCH v9 5/8] net: ksz9477: remove unnecessary xmit and recv functions Tim Harvey
2022-11-30 17:42 ` [PATCH v9 6/8] net: fec: add support for DM_MDIO Tim Harvey
2022-11-30 17:42 ` [PATCH v9 7/8] net: add MV88E6xxx DSA driver Tim Harvey
2022-11-30 17:42 ` [PATCH v9 8/8] board: gw_ventana: enable MV88E61XX DSA support Tim Harvey
2022-11-30 22:30 ` [PATCH v9 0/8] Add MV88E6xxx DSA driver and use on gwventana Vladimir Oltean
2022-11-30 23:27 ` Tim Harvey
2022-12-01 0:26 ` Vladimir Oltean
2023-01-25 17:26 ` Tim Harvey
2023-01-31 23:14 ` Tim Harvey
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=20221130174251.82087-5-tharvey@gateworks.com \
--to=tharvey@gateworks.com \
--cc=festevam@denx.de \
--cc=festevam@gmail.com \
--cc=joe.hershberger@ni.com \
--cc=marek.behun@nic.cz \
--cc=rfried.dev@gmail.com \
--cc=sbabic@denx.de \
--cc=u-boot@lists.denx.de \
--cc=uboot-imx@nxp.com \
--cc=vladimir.oltean@nxp.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