From: Lorenzo Bianconi <lorenzo@kernel.org>
To: nbd@nbd.name
Cc: lorenzo.bianconi@redhat.com, linux-wireless@vger.kernel.org,
Sean.Wang@mediatek.com
Subject: [PATCH v3 02/18] mt76: mt76u: add mt76u_process_rx_queue utility routine
Date: Wed, 15 Jan 2020 11:58:42 +0100 [thread overview]
Message-ID: <aaba46a7277cb271f7bad365abaddc5a31a08ca0.1579085367.git.lorenzo@kernel.org> (raw)
In-Reply-To: <cover.1579085367.git.lorenzo@kernel.org>
Introduce mt76u_process_rx_queue routine to process rx hw queue.
This is a preliminary patch to support new devices (e.g. mt7663u) that
rely on a hw queue for mcu messages
Co-developed-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
drivers/net/wireless/mediatek/mt76/usb.c | 30 +++++++++++++++---------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index fbc4c0bb0102..9b0a4104ec0e 100644
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -468,9 +468,9 @@ mt76u_build_rx_skb(void *data, int len, int buf_size)
}
static int
-mt76u_process_rx_entry(struct mt76_dev *dev, struct urb *urb)
+mt76u_process_rx_entry(struct mt76_dev *dev, struct urb *urb,
+ int buf_size)
{
- struct mt76_queue *q = &dev->q_rx[MT_RXQ_MAIN];
u8 *data = urb->num_sgs ? sg_virt(&urb->sg[0]) : urb->transfer_buffer;
int data_len = urb->num_sgs ? urb->sg[0].length : urb->actual_length;
int len, nsgs = 1;
@@ -484,7 +484,7 @@ mt76u_process_rx_entry(struct mt76_dev *dev, struct urb *urb)
return 0;
data_len = min_t(int, len, data_len - MT_DMA_HDR_LEN);
- skb = mt76u_build_rx_skb(data, data_len, q->buf_size);
+ skb = mt76u_build_rx_skb(data, data_len, buf_size);
if (!skb)
return 0;
@@ -493,8 +493,8 @@ mt76u_process_rx_entry(struct mt76_dev *dev, struct urb *urb)
data_len = min_t(int, len, urb->sg[nsgs].length);
skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags,
sg_page(&urb->sg[nsgs]),
- urb->sg[nsgs].offset,
- data_len, q->buf_size);
+ urb->sg[nsgs].offset, data_len,
+ buf_size);
len -= data_len;
nsgs++;
}
@@ -545,20 +545,19 @@ mt76u_submit_rx_buf(struct mt76_dev *dev, struct urb *urb)
return usb_submit_urb(urb, GFP_ATOMIC);
}
-static void mt76u_rx_tasklet(unsigned long data)
+static void
+mt76u_process_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
{
- struct mt76_dev *dev = (struct mt76_dev *)data;
+ int qid = q - &dev->q_rx[MT_RXQ_MAIN];
struct urb *urb;
int err, count;
- rcu_read_lock();
-
while (true) {
urb = mt76u_get_next_rx_entry(dev);
if (!urb)
break;
- count = mt76u_process_rx_entry(dev, urb);
+ count = mt76u_process_rx_entry(dev, urb, q->buf_size);
if (count > 0) {
err = mt76u_refill_rx(dev, urb, count, GFP_ATOMIC);
if (err < 0)
@@ -566,8 +565,17 @@ static void mt76u_rx_tasklet(unsigned long data)
}
mt76u_submit_rx_buf(dev, urb);
}
- mt76_rx_poll_complete(dev, MT_RXQ_MAIN, NULL);
+ if (qid == MT_RXQ_MAIN)
+ mt76_rx_poll_complete(dev, MT_RXQ_MAIN, NULL);
+}
+static void mt76u_rx_tasklet(unsigned long data)
+{
+ struct mt76_dev *dev = (struct mt76_dev *)data;
+ struct mt76_queue *q = &dev->q_rx[MT_RXQ_MAIN];
+
+ rcu_read_lock();
+ mt76u_process_rx_queue(dev, q);
rcu_read_unlock();
}
--
2.21.1
next prev parent reply other threads:[~2020-01-15 10:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-15 10:58 [PATCH v3 00/18] rework mt76u layer to support new devices Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 01/18] mt76: mt76u: check tx_status_data pointer in mt76u_tx_tasklet Lorenzo Bianconi
2020-01-15 10:58 ` Lorenzo Bianconi [this message]
2020-01-15 10:58 ` [PATCH v3 03/18] mt76: mt76u: add mt76_queue to mt76u_get_next_rx_entry signature Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 04/18] mt76: mt76u: add mt76_queue to mt76u_refill_rx signature Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 05/18] mt76: mt76u: use mt76_queue as mt76u_complete_rx context Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 06/18] mt76: mt76u: add queue id parameter to mt76u_submit_rx_buffers Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 07/18] mt76: mt76u: move mcu buffer allocation in mt76x02u drivers Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 08/18] mt76: mt76u: introduce mt76u_free_rx_queue utility routine Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 09/18] mt76: mt76u: stop/free all possible rx queues Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 10/18] mt76: mt76u: add mt76u_alloc_rx_queue utility routine Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 11/18] mt76: mt76u: add queue parameter to mt76u_rx_urb_alloc Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 12/18] mt76: mt76u: resume all rx queue in mt76u_resume_rx Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 13/18] mt76: mt76u: introduce mt76u_alloc_mcu_queue utility routine Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 14/18] mt76: mt76u: add {read/write}_extended utility routines Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 15/18] mt76: mt76u: take into account different queue mapping for 7663 Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 16/18] mt76: mt76u: introduce mt76u_skb_dma_info routine Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 17/18] mt76: mt76u: add endpoint to mt76u_bulk_msg signature Lorenzo Bianconi
2020-01-15 10:58 ` [PATCH v3 18/18] mt76: mt76u: introduce MT_DRV_RX_DMA_HDR flag Lorenzo Bianconi
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=aaba46a7277cb271f7bad365abaddc5a31a08ca0.1579085367.git.lorenzo@kernel.org \
--to=lorenzo@kernel.org \
--cc=Sean.Wang@mediatek.com \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=nbd@nbd.name \
/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;
as well as URLs for NNTP newsgroup(s).