ath10k: enable napi on RX path for usb

commit cfee8793a74dc3afabb08fc9 ("ath10k: enable napi on RX path for
sdio") introduced napi for SDIO and updated the htt interface for high
latency devices.

These changes breaks USB, so USB code must be updated to use napi as
well in order to have a working RX path.

Tested-on: QCA9377 hw1.0 USB 1.0.0.299

Signed-off-by: Erik Stromdahl <erik.stromdahl@gmail.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20220327171340.7893-2-erik.stromdahl@gmail.com

diff --git a/drivers/net/wireless/ath/ath10k/usb.c b/drivers/net/wireless/ath/ath10k/usb.c
index 7ed2022ac3c22ba384d5e404416767e563602ff1..10df6ca303a1c351eccabc3c56d4fbf78323c1ec 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/usb.c
+++ b/drivers/net/wireless/ath/ath10k/usb.c
@@ -345,6 +345,12 @@ static void ath10k_usb_rx_complete(struct ath10k *ar, struct sk_buff *skb)
        ep->ep_ops.ep_rx_complete(ar, skb);
        /* The RX complete handler now owns the skb... */
 
+       if (test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags)) {
+               local_bh_disable();
+               napi_schedule(&ar->napi);
+               local_bh_enable();
+       }
+
        return;
 
 out_free_skb:
@@ -387,6 +393,7 @@ static int ath10k_usb_hif_start(struct ath10k *ar)
        int i;
        struct ath10k_usb *ar_usb = ath10k_usb_priv(ar);
 
+       ath10k_core_napi_enable(ar);
        ath10k_usb_start_recv_pipes(ar);
 
        /* set the TX resource avail threshold for each TX pipe */
@@ -462,6 +469,7 @@ err:
 static void ath10k_usb_hif_stop(struct ath10k *ar)
 {
        ath10k_usb_flush_all(ar);
+       ath10k_core_napi_sync_disable(ar);
 }
 
 static u16 ath10k_usb_hif_get_free_queue_number(struct ath10k *ar, u8 pipe_id)
@@ -966,6 +974,20 @@ err:
        return ret;
 }
 
+static int ath10k_usb_napi_poll(struct napi_struct *ctx, int budget)
+{
+       struct ath10k *ar = container_of(ctx, struct ath10k, napi);
+       int done;
+
+       done = ath10k_htt_rx_hl_indication(ar, budget);
+       ath10k_dbg(ar, ATH10K_DBG_USB, "napi poll: done: %d, budget:%d\n", done, budget);
+
+       if (done < budget)
+               napi_complete_done(ctx, done);
+
+       return done;
+}
+
 /* ath10k usb driver registered functions */
 static int ath10k_usb_probe(struct usb_interface *interface,
                            const struct usb_device_id *id)
@@ -992,6 +1014,9 @@ static int ath10k_usb_probe(struct usb_interface *interface,
                return -ENOMEM;
        }
 
+       netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_usb_napi_poll,
+                      ATH10K_NAPI_BUDGET);
+
        usb_get_dev(dev);
        vendor_id = le16_to_cpu(dev->descriptor.idVendor);
        product_id = le16_to_cpu(dev->descriptor.idProduct);
@@ -1045,6 +1070,7 @@ static void ath10k_usb_remove(struct usb_interface *interface)
                return;
 
        ath10k_core_unregister(ar_usb->ar);
+       netif_napi_del(&ar_usb->ar->napi);
        ath10k_usb_destroy(ar_usb->ar);
        usb_put_dev(interface_to_usbdev(interface));
        ath10k_core_destroy(ar_usb->ar);