From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jRADp-0003PZ-8C for barebox@lists.infradead.org; Wed, 22 Apr 2020 07:55:07 +0000 From: Sascha Hauer Date: Wed, 22 Apr 2020 09:54:45 +0200 Message-Id: <20200422075452.25226-5-s.hauer@pengutronix.de> In-Reply-To: <20200422075452.25226-1-s.hauer@pengutronix.de> References: <20200422075452.25226-1-s.hauer@pengutronix.de> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 04/11] net: Add a slice to struct eth_device To: Barebox List Cc: Edmund Henniges , =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= Add ethernet code safe for being called from a poller. Signed-off-by: Sascha Hauer --- include/net.h | 8 ++++++++ net/eth.c | 20 +++++++++++++++++--- 2 files changed, 25 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 #include #include +#include #include #include #include /* 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 4a8a7a8876..5cd1d703c4 100644 --- a/net/eth.c +++ b/net/eth.c @@ -222,20 +222,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) @@ -356,6 +368,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); -- 2.26.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox