From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Cc: "Edmund Henniges" <eh@emlix.com>, "Daniel Glöckner" <dg@emlix.com>
Subject: [PATCH 08/20] net: Add a slice to struct eth_device
Date: Mon, 25 May 2020 12:33:37 +0200 [thread overview]
Message-ID: <20200525103349.19449-9-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20200525103349.19449-1-s.hauer@pengutronix.de>
Add ethernet code safe for being called from a poller.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
include/net.h | 8 ++++++++
net/eth.c | 21 ++++++++++++++++++---
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/include/net.h b/include/net.h
index 54db8a179a..8d2b4923de 100644
--- a/include/net.h
+++ b/include/net.h
@@ -19,6 +19,7 @@
#include <stdlib.h>
#include <clock.h>
#include <led.h>
+#include <slice.h>
#include <xfuncs.h>
#include <linux/phy.h>
#include <linux/string.h> /* memcpy */
@@ -63,6 +64,8 @@ struct eth_device {
char *bootarg;
char *linuxdevname;
+ struct slice slice;
+
bool ifup;
#define ETH_MODE_DHCP 0
#define ETH_MODE_STATIC 1
@@ -72,6 +75,11 @@ struct eth_device {
#define dev_to_edev(d) container_of(d, struct eth_device, dev)
+static inline struct slice *eth_device_slice(struct eth_device *edev)
+{
+ return &edev->slice;
+}
+
static inline const char *eth_name(struct eth_device *edev)
{
return edev->devname;
diff --git a/net/eth.c b/net/eth.c
index e3d0d06efe..2df0a74a5b 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -219,20 +219,32 @@ int eth_send(struct eth_device *edev, void *packet, int length)
if (ret)
return ret;
+ slice_acquire(eth_device_slice(edev));
+
led_trigger_network(LED_TRIGGER_NET_TX);
- return edev->send(edev, packet, length);
+ ret = edev->send(edev, packet, length);
+
+ slice_release(eth_device_slice(edev));
+
+ return ret;
}
static int __eth_rx(struct eth_device *edev)
{
int ret;
+ slice_acquire(eth_device_slice(edev));
+
ret = eth_carrier_check(edev, 0);
if (ret)
- return ret;
+ goto out;
+
+ ret = edev->recv(edev);
+out:
+ slice_release(eth_device_slice(edev));
- return edev->recv(edev);
+ return ret;
}
int eth_rx(void)
@@ -353,6 +365,8 @@ int eth_register(struct eth_device *edev)
if (ret)
return ret;
+ slice_init(&edev->slice, dev_name(dev));
+
edev->devname = xstrdup(dev_name(&edev->dev));
dev_add_param_ip(dev, "ipaddr", NULL, NULL, &edev->ipaddr, edev);
@@ -431,6 +445,7 @@ void eth_unregister(struct eth_device *edev)
free(edev->devname);
unregister_device(&edev->dev);
+ slice_exit(&edev->slice);
list_del(&edev->list);
}
--
2.26.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2020-05-25 10:34 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-25 10:33 [PATCH v2 00/20] Slices and fastboot over UDP Sascha Hauer
2020-05-25 10:33 ` [PATCH 01/20] poller: Give pollers a name Sascha Hauer
2020-05-25 10:33 ` [PATCH 02/20] poller: Add a poller command Sascha Hauer
2020-05-25 10:33 ` [PATCH 03/20] fastboot: split generic code from USB gadget Sascha Hauer
2020-05-25 10:33 ` [PATCH 04/20] fastboot: don't close fd 0 when downloading to ram Sascha Hauer
2020-05-25 10:33 ` [PATCH 05/20] fastboot: Use unique tempfile name Sascha Hauer
2020-05-25 10:33 ` [PATCH 06/20] Introduce slices Sascha Hauer
2020-05-25 10:33 ` [PATCH 07/20] Introduce idle slice Sascha Hauer
2020-05-25 10:33 ` Sascha Hauer [this message]
2020-05-25 10:33 ` [PATCH 09/20] net: mdiobus: Add slice Sascha Hauer
2020-05-25 10:33 ` [PATCH 10/20] usb: Add a slice to usb host controllers Sascha Hauer
2020-05-25 10:33 ` [PATCH 11/20] usbnet: Add slice Sascha Hauer
2020-05-25 10:33 ` [PATCH 12/20] net: Call net_poll() in a poller Sascha Hauer
2020-05-25 10:33 ` [PATCH 13/20] net: reply to ping requests Sascha Hauer
2020-05-25 10:33 ` [PATCH 14/20] usbnet: Be more friendly in the receive path Sascha Hauer
2020-05-25 10:33 ` [PATCH 15/20] poller: Allow to run pollers inside of pollers Sascha Hauer
2020-05-25 10:33 ` [PATCH 16/20] defconfigs: update renamed fastboot options Sascha Hauer
2020-05-25 10:33 ` [PATCH 17/20] globalvar: Add helper for deprecated variable names Sascha Hauer
2020-05-25 17:27 ` Ahmad Fatoum
2020-05-25 10:33 ` [PATCH 18/20] fastboot: rename usbgadget.fastboot_* variables to fastboot.* Sascha Hauer
2020-05-25 10:33 ` [PATCH 19/20] fastboot net: implement fastboot over UDP Sascha Hauer
2020-05-25 10:33 ` [PATCH 20/20] fastboot net: remove may_send Sascha Hauer
2020-05-25 19:45 ` Daniel Glöckner
2020-05-26 6:02 ` Sascha Hauer
2020-06-15 16:36 ` Daniel Glöckner
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=20200525103349.19449-9-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=dg@emlix.com \
--cc=eh@emlix.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