lkml.org 
[lkml]   [2019]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH lora-next 07/11] net: lora: sx130x: add work queue to tx path
Date
As we are not allowed to sleep in _start_xmit, we need to add a work queue
to handle transmission of the packets.

Signed-off-by: Ben Whitten <ben.whitten@lairdtech.com>
---
drivers/net/lora/sx130x.c | 50 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 49 insertions(+), 1 deletion(-)

diff --git a/drivers/net/lora/sx130x.c b/drivers/net/lora/sx130x.c
index 88932fbbb598..820ec0220e28 100644
--- a/drivers/net/lora/sx130x.c
+++ b/drivers/net/lora/sx130x.c
@@ -69,6 +69,10 @@ struct sx130x_priv {
void *drvdata;
struct sx130x_tx_gain_lut tx_gain_lut[SX1301_TX_GAIN_LUT_MAX];
u8 tx_gain_lut_size;
+
+ struct sk_buff *tx_skb;
+ struct workqueue_struct *wq;
+ struct work_struct tx_work;
};

struct regmap *sx130x_get_regmap(struct device *dev)
@@ -644,6 +648,8 @@ static int sx130x_agc_init(struct sx130x_priv *priv)

static netdev_tx_t sx130x_loradev_start_xmit(struct sk_buff *skb, struct net_device *netdev)
{
+ struct sx130x_priv *priv = netdev_priv(netdev);
+
if (skb->protocol != htons(ETH_P_LORA)) {
kfree_skb(skb);
netdev->stats.tx_dropped++;
@@ -651,11 +657,36 @@ static netdev_tx_t sx130x_loradev_start_xmit(struct sk_buff *skb, struct net_dev
}

netif_stop_queue(netdev);
+ priv->tx_skb = skb;
+ queue_work(priv->wq, &priv->tx_work);

- /* TODO */
return NETDEV_TX_OK;
}

+static void sx130x_tx_work_handler(struct work_struct *ws)
+{
+ struct sx130x_priv *priv = container_of(ws, struct sx130x_priv, tx_work);
+ struct net_device *netdev = dev_get_drvdata(priv->dev);
+ int ret;
+
+ netdev_dbg(netdev, "%s\n", __func__);
+
+ if (priv->tx_skb) {
+
+ /* TODO actual tx* */
+
+ if (!(netdev->flags & IFF_ECHO) ||
+ priv->tx_skb->pkt_type != PACKET_LOOPBACK ||
+ priv->tx_skb->protocol != htons(ETH_P_LORA))
+ kfree_skb(priv->tx_skb);
+
+ priv->tx_skb = NULL;
+ }
+
+ if (netif_queue_stopped(netdev))
+ netif_wake_queue(netdev);
+}
+
static int sx130x_loradev_open(struct net_device *netdev)
{
struct sx130x_priv *priv = netdev_priv(netdev);
@@ -715,6 +746,12 @@ static int sx130x_loradev_open(struct net_device *netdev)

mutex_unlock(&priv->io_lock);

+ priv->tx_skb = NULL;
+
+ priv->wq = alloc_workqueue("sx130x_wq",
+ WQ_FREEZABLE | WQ_MEM_RECLAIM, 0);
+ INIT_WORK(&priv->tx_work, sx130x_tx_work_handler);
+
netif_start_queue(netdev);

return 0;
@@ -729,11 +766,22 @@ static int sx130x_loradev_open(struct net_device *netdev)

static int sx130x_loradev_stop(struct net_device *netdev)
{
+ struct sx130x_priv *priv = netdev_priv(netdev);
+
netdev_dbg(netdev, "%s", __func__);

netif_stop_queue(netdev);
close_loradev(netdev);

+ destroy_workqueue(priv->wq);
+ priv->wq = NULL;
+
+ if (priv->tx_skb) {
+ netdev->stats.tx_errors++;
+ dev_kfree_skb(priv->tx_skb);
+ }
+ priv->tx_skb = NULL;
+
return 0;
}

--
2.17.1
\
 
 \ /
  Last update: 2019-01-28 18:04    [W:0.092 / U:0.228 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site