rsi: RX path improvements
cover rsi: RX path improvements
From: Amitkumar Karwar <[email protected]>
This patch series adds a thread for Rx handling and other related enhancements for better throughput.
Prameela Rani Garnepudi (3):
rsi: improve RX handling in SDIO interface
rsi: use dynamic RX control blocks instead of MAX_RX_URB
rsi: improve RX packet handling in USB interface
drivers/net/wireless/rsi/rsi_91x_sdio.c | 45 +++++++--- drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 64 ++++++++++++--- drivers/net/wireless/rsi/rsi_91x_usb.c | 122 ++++++++++++++++------------ drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 34 +++----- drivers/net/wireless/rsi/rsi_hal.h | 1 + drivers/net/wireless/rsi/rsi_main.h | 2 +- drivers/net/wireless/rsi/rsi_sdio.h | 8 ++ drivers/net/wireless/rsi/rsi_usb.h | 5 +- 8 files changed, 181 insertions(+), 100 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/3 rsi: improve RX handling in SDIO interface
From: Prameela Rani Garnepudi <[email protected]>
Currently, RX packets are handled in interrupt context in SDIO interface. To improve the efficiency of processing RX packets, RX thread and RX skb queues are introduced.
When the packet is read from device, driver prepares skb, add to RX queue and trigger RX thread event. RX thread processes the packets from RX queue.
--- drivers/net/wireless/rsi/rsi_91x_sdio.c | 45 +++++++++++++++----- drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 64 +++++++++++++++++++++++------ drivers/net/wireless/rsi/rsi_main.h | 1 + drivers/net/wireless/rsi/rsi_sdio.h | 8 ++++ 4 files changed, 94 insertions(+), 24 deletions(-)
drivers/net/wireless/rsi/rsi_91x_sdio.c +34 -11
@@ -933,6 +933,8 @@ static int rsi_probe(struct sdio_func *pfunction, const struct sdio_device_id *id) {struct rsi_hw *adapter; +struct rsi_91x_sdiodev *sdev; +int status;rsi_dbg (INIT_ZONE ,"%s: Init function called\n" , __func__);
@@ -940,7 +942,7 @@ static int rsi_probe(struct sdio_func *pfunction,if (!adapter) {rsi_dbg (ERR_ZONE ,"%s: Failed to init os intf ops\n" , __func__); -return 1 ; +return -EINVAL ; } adapter->rsi_host_intf =RSI_HOST_INTF_SDIO ; adapter->host_intf_ops = &sdio_host_intf_ops;
@@ -948,39 +950,58 @@ static int rsi_probe(struct sdio_func *pfunction,if (rsi_init_sdio_interface (adapter, pfunction)) {rsi_dbg (ERR_ZONE ,"%s: Failed to init sdio interface\n" , __func__); - goto fail; + status = -EIO ; + goto fail_free_adapter; + } + sdev = (struct rsi_91x_sdiodev *)adapter->rsi_dev; +rsi_init_event (&sdev->rx_thread.event); + status =rsi_create_kthread (adapter->priv, &sdev->rx_thread, + rsi_sdio_rx_thread,"SDIO-RX-Thread" ); +if (status) { +rsi_dbg (ERR_ZONE ,"%s: Unable to init rx thrd\n" , __func__); + goto fail_free_adapter; } +skb_queue_head_init (&sdev->rx_q.head); + sdev->rx_q.num_rx_pkts =0 ; +sdio_claim_host (pfunction);if (sdio_claim_irq (pfunction, rsi_handle_interrupt)) {rsi_dbg (ERR_ZONE ,"%s: Failed to request IRQ\n" , __func__);sdio_release_host (pfunction); - goto fail; + status = -EIO ; + goto fail_kill_thread; }sdio_release_host (pfunction);rsi_dbg (INIT_ZONE ,"%s: Registered Interrupt handler\n" , __func__);if (rsi_hal_device_init (adapter)) {rsi_dbg (ERR_ZONE ,"%s: Failed in device init\n" , __func__); -sdio_claim_host (pfunction); -sdio_release_irq (pfunction); -sdio_disable_func (pfunction); -sdio_release_host (pfunction); - goto fail; + status = -EINVAL ; + goto fail_kill_thread; }rsi_dbg (INFO_ZONE ,"===> RSI Device Init Done <===\n" );if (rsi_sdio_master_access_msword (adapter,MISC_CFG_BASE_ADDR )) {rsi_dbg (ERR_ZONE ,"%s: Unable to set ms word reg\n" , __func__); -return -EIO ; + status = -EIO ; + goto fail_dev_init; } adapter->priv->hibernate_resume = false; adapter->priv->reinit_hw = false;return 0 ; -fail: + +fail_dev_init: +sdio_claim_host (pfunction); +sdio_release_irq (pfunction); +sdio_disable_func (pfunction); +sdio_release_host (pfunction); +fail_kill_thread: +rsi_kill_thread (&sdev->rx_thread); +fail_free_adapter:rsi_91x_deinit (adapter);rsi_dbg (ERR_ZONE ,"%s: Failed in probe...Exiting\n" , __func__); -return 1 ; +return status; } static void ulp_read_write(struct rsi_hw *adapter, u16 addr, u32 data,
@@ -1076,6 +1097,8 @@ static void rsi_disconnect(struct sdio_func *pfunction)return ; dev = (struct rsi_91x_sdiodev *)adapter->rsi_dev; + +rsi_kill_thread (&dev->rx_thread);sdio_claim_host (pfunction);sdio_release_irq (pfunction);sdio_release_host (pfunction);
drivers/net/wireless/rsi/rsi_91x_sdio_ops.c +51 -13
90 lines not on this page · raw message
drivers/net/wireless/rsi/rsi_main.h +1 -0
@@ -112,6 +112,7 @@ extern __printf(2, 3) void rsi_dbg(u32 zone, const char *fmt, ...);#define RSI_WOW_NO_CONNECTION BIT(1)#define RSI_DEV_9113 1 +#define RSI_MAX_RX_PKTS 64struct version_info {u16 major;
drivers/net/wireless/rsi/rsi_sdio.h +8 -0
@@ -105,6 +105,11 @@ struct receive_info {u32 buf_available_counter; }; +struct rsi_sdio_rx_q { +u8 num_rx_pkts; +struct sk_buff_head head; +}; +struct rsi_91x_sdiodev {struct sdio_func *pfunction;struct task_struct *sdio_irq_task;
@@ -117,6 +122,8 @@ struct rsi_91x_sdiodev {u16 tx_blk_size;u8 write_fail;bool buff_status_updated; +struct rsi_sdio_rx_q rx_q; +struct rsi_thread rx_thread; };void rsi_interrupt_handler (struct rsi_hw *adapter);
@@ -131,4 +138,5 @@ int rsi_sdio_master_access_msword(struct rsi_hw *adapter, u16 ms_word);void rsi_sdio_ack_intr (struct rsi_hw *adapter,u8 int_bit);int rsi_sdio_determine_event_timeout (struct rsi_hw *adapter);int rsi_sdio_check_buffer_status (struct rsi_hw *adapter,u8 q_num); +void rsi_sdio_rx_thread (struct rsi_common *common);#endif
Signature · 1 line
2.7.4
Re: [PATCH 1/3] rsi: improve RX handling in SDIO interface
Quoted 11 lines · Amitkumar Karwar
From: Prameela Rani Garnepudi <[email protected]>
Currently, RX packets are handled in interrupt context in SDIO interface. To improve the efficiency of processing RX packets, RX thread and RX skb queues are introduced.
When the packet is read from device, driver prepares skb, add to RX queue and trigger RX thread event. RX thread processes the packets from RX queue.Signed-off-by Prameela Rani Garnepudi <[email protected]>Signed-off-by Amitkumar Karwar <[email protected]>
[...]
drivers/net/wireless/rsi/rsi_91x_sdio_ops.c int rsi_sdio_master_access_msword(struct rsi_hw *adapter, u16 ms_word) · line 72
Quoted 10 lines
drivers/net/wireless/rsi/rsi_91x_sdio_ops.c +10
-0+void rsi_sdio_rx_thread (struct rsi_common *common) +{ +struct rsi_hw *adapter = common->priv; +struct rsi_91x_sdiodev *sdev = adapter->rsi_dev; +struct sk_buff *skb; +int status; + + do { + rsi_wait_event(&sdev->rx_thread.event, EVENT_WAIT_FOREVER); + rsi_reset_event(&sdev->rx_thread.event);
I started to wonder what these rsi_wait_event() and rsi_reset_event() are and indeed, at least to me, they look suspicious (creating own kthread and use of atomics etc). Why reinvent the wheel and not use standard kernel frameworks, like workqueue? Most of the time trying to be too clever ends up just being buggy.
No need for any immeadiate action but something to keep in mind and hopefully clean up later.
Signature · 1 line
Kalle Valo
Re: [1/3] rsi: improve RX handling in SDIO interface
In reply to Amitkumar KarwarQuoted 11 lines · Amitkumar Karwar
From: Prameela Rani Garnepudi <[email protected]>
Currently, RX packets are handled in interrupt context in SDIO interface. To improve the efficiency of processing RX packets, RX thread and RX skb queues are introduced.
When the packet is read from device, driver prepares skb, add to RX queue and trigger RX thread event. RX thread processes the packets from RX queue.Signed-off-by Prameela Rani Garnepudi <[email protected]>Signed-off-by Amitkumar Karwar <[email protected]>
3 patches applied to wireless-drivers-next.git, thanks.
50117605770c rsi: improve RX handling in SDIO interface 8809f08cdc0b rsi: use dynamic RX control blocks instead of MAX_RX_URB a1854fae1414 rsi: improve RX packet handling in USB interface
Signature · 3 lines
https://patchwork.kernel.org/patch/10246955/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
PATCH 2/3 rsi: use dynamic RX control blocks instead of MAX_RX_URB
In reply to Amitkumar KarwarFrom: Prameela Rani Garnepudi <[email protected]>
Currently 2 RX control blocks are allocated by default. If wifi alone mode is used rx control block 2 is unusable. So, changes are done accordingly in all places to use RX control blocks dynamically based on coex mode check.
--- drivers/net/wireless/rsi/rsi_91x_usb.c | 34 ++++++++++++++++++------------ drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 5 +++-- 2 files changed, 23 insertions(+), 16 deletions(-)
drivers/net/wireless/rsi/rsi_91x_usb.c +20 -14
@@ -497,15 +497,15 @@ static struct rsi_host_intf_ops usb_host_intf_ops = {*/ static void rsi_deinit_usb_interface (struct rsi_hw *adapter) { -u8 idx; -struct rsi_91x_usbdev *dev = (struct rsi_91x_usbdev *)adapter->rsi_dev;rsi_kill_thread (&dev->rx_thread); -for (idx =0 ; idx <MAX_RX_URBS ; idx++) { -usb_free_urb (dev->rx_cb[idx].rx_urb); -kfree (dev->rx_cb[idx].rx_buffer); +usb_free_urb (dev->rx_cb[0 ].rx_urb); +kfree (dev->rx_cb[0 ].rx_buffer); +if (adapter->priv->coex_mode >1 ) { +usb_free_urb (dev->rx_cb[1 ].rx_urb); +kfree (dev->rx_cb[1 ].rx_buffer); }kfree (adapter->priv->rx_data_pkt);
@@ -516,9 +516,11 @@ static int rsi_usb_init_rx(struct rsi_hw *adapter) {struct rsi_91x_usbdev *dev = (struct rsi_91x_usbdev *)adapter->rsi_dev;struct rx_usb_ctrl_block *rx_cb; -u8 idx; +u8 idx, num_rx_cb; + + num_rx_cb = (adapter->priv->coex_mode >1 ?2 :1 ); -for (idx =0 ; idx <MAX_RX_URBS ; idx++) { +for (idx =0 ; idx < num_rx_cb; idx++) { rx_cb = &dev->rx_cb[idx]; rx_cb->rx_buffer = kzalloc(RSI_USB_BUF_SIZE * 2,
@@ -538,9 +540,11 @@ static int rsi_usb_init_rx(struct rsi_hw *adapter)return 0 ; err: -for (idx =0 ; idx <MAX_RX_URBS ; idx++) { -kfree (dev->rx_cb[idx].rx_buffer); -kfree (dev->rx_cb[idx].rx_urb); +kfree (dev->rx_cb[0 ].rx_buffer); +usb_free_urb (dev->rx_cb[0 ].rx_urb); +if (adapter->priv->coex_mode >1 ) { +kfree (dev->rx_cb[1 ].rx_buffer); +usb_free_urb (dev->rx_cb[1 ].rx_urb); }return -1 ; }
@@ -557,7 +561,7 @@ static int rsi_init_usb_interface(struct rsi_hw *adapter, {struct rsi_91x_usbdev *rsi_dev;struct rsi_common *common = adapter->priv; -int status, i; +int status; rsi_dev =kzalloc (sizeof (*rsi_dev),GFP_KERNEL );if (!rsi_dev)
@@ -617,9 +621,11 @@ static int rsi_init_usb_interface(struct rsi_hw *adapter,return 0 ; fail_thread: -for (i =0 ; i <MAX_RX_URBS ; i++) { -kfree (rsi_dev->rx_cb[i].rx_buffer); -kfree (rsi_dev->rx_cb[i].rx_urb); +kfree (rsi_dev->rx_cb[0 ].rx_buffer); +usb_free_urb (rsi_dev->rx_cb[0 ].rx_urb); +if (common->coex_mode >1 ) { +kfree (rsi_dev->rx_cb[1 ].rx_buffer); +usb_free_urb (rsi_dev->rx_cb[1 ].rx_urb); } fail_tx:kfree (common->rx_data_pkt);
drivers/net/wireless/rsi/rsi_91x_usb_ops.c +3 -2
@@ -30,15 +30,16 @@ void rsi_usb_rx_thread(struct rsi_common *common)struct rsi_hw *adapter = common->priv;struct rsi_91x_usbdev *dev = (struct rsi_91x_usbdev *)adapter->rsi_dev;struct rx_usb_ctrl_block *rx_cb; -int status, idx; +int status, idx, num_rx_cb; + num_rx_cb = (adapter->priv->coex_mode >1 ?2 :1 ); do { rsi_wait_event(&dev->rx_thread.event, EVENT_WAIT_FOREVER); if (atomic_read(&dev->rx_thread.thread_done)) goto out; - for (idx = 0; idx < MAX_RX_URBS; idx++) { + for (idx = 0; idx < num_rx_cb; idx++) { rx_cb = &dev->rx_cb[idx]; if (!rx_cb->pend) continue;
Signature · 1 line
2.7.4
PATCH 3/3 rsi: improve RX packet handling in USB interface
In reply to Amitkumar KarwarFrom: Prameela Rani Garnepudi <[email protected]>
Curretly, RX packet processing is done sequencially. To improve the efficiency, RX skb queue is introduced.
Here, while preparing RX URB skb is allocated and used for RX buffer. When rx done handler is called, enqueue the skb to rx_q and set the thread event.
RX thread is modified to dequeue packets from skb queue and process further.
--- drivers/net/wireless/rsi/rsi_91x_usb.c | 110 ++++++++++++++++------------- drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 35 ++++----- drivers/net/wireless/rsi/rsi_hal.h | 1 + drivers/net/wireless/rsi/rsi_main.h | 1 - drivers/net/wireless/rsi/rsi_usb.h | 5 +- 5 files changed, 78 insertions(+), 74 deletions(-)
drivers/net/wireless/rsi/rsi_91x_usb.c +62 -48
@@ -29,6 +29,8 @@ MODULE_PARM_DESC(dev_oper_mode,"9[Wi-Fi STA + BT LE], 13[Wi-Fi STA + BT classic + BT LE]\n" "6[AP + BT classic], 14[AP + BT classic + BT LE]"); +static int rsi_rx_urb_submit (struct rsi_hw *adapter,u8 ep_num); +/** * rsi_usb_card_write() - This function writes to the USB Card. * @adapter: Pointer to the adapter structure.
@@ -260,12 +262,31 @@ static void rsi_rx_done_handler(struct urb *urb) {struct rx_usb_ctrl_block *rx_cb = urb->context;struct rsi_91x_usbdev *dev = (struct rsi_91x_usbdev *)rx_cb->data; +int status = -EINVAL ;if (urb->status) -return ; + goto out; + +if (urb->actual_length <=0 ) { +rsi_dbg (INFO_ZONE ,"%s: Zero length packet\n" , __func__); + goto out; + } +if (skb_queue_len (&dev->rx_q) >=RSI_MAX_RX_PKTS ) { +rsi_dbg (INFO_ZONE ,"Max RX packets reached\n" ); + goto out; + } +skb_put (rx_cb->rx_skb, urb->actual_length); +skb_queue_tail (&dev->rx_q, rx_cb->rx_skb); - rx_cb->pend =1 ;rsi_set_event (&dev->rx_thread.event); + status =0 ; + +out: +if (rsi_rx_urb_submit (dev->priv, rx_cb->ep_num)) +rsi_dbg (ERR_ZONE ,"%s: Failed in urb submission" , __func__); + +if (status) +dev_kfree_skb (rx_cb->rx_skb); }/**
@@ -280,13 +301,26 @@ static int rsi_rx_urb_submit(struct rsi_hw *adapter, u8 ep_num)struct rx_usb_ctrl_block *rx_cb = &dev->rx_cb[ep_num -1 ];struct urb *urb = rx_cb->rx_urb;int status; +struct sk_buff *skb; +u8 dword_align_bytes =0 ; + +#define RSI_MAX_RX_USB_PKT_SIZE 3000 + skb =dev_alloc_skb (RSI_MAX_RX_USB_PKT_SIZE ); +if (!skb) +return -ENOMEM ; +skb_reserve (skb,MAX_DWORD_ALIGN_BYTES ); + dword_align_bytes = (unsigned long )skb->data &0x3f ; +if (dword_align_bytes >0 ) +skb_push (skb, dword_align_bytes); + urb->transfer_buffer = skb->data; + rx_cb->rx_skb = skb;usb_fill_bulk_urb (urb, dev->usbdev,usb_rcvbulkpipe (dev->usbdev, dev->bulkin_endpoint_addr[ep_num -1 ]), urb->transfer_buffer, -3000 , +RSI_MAX_RX_USB_PKT_SIZE , rsi_rx_done_handler, rx_cb);
@@ -502,13 +536,9 @@ static void rsi_deinit_usb_interface(struct rsi_hw *adapter)rsi_kill_thread (&dev->rx_thread);usb_free_urb (dev->rx_cb[0 ].rx_urb); -kfree (dev->rx_cb[0 ].rx_buffer); -if (adapter->priv->coex_mode >1 ) { +if (adapter->priv->coex_mode >1 )usb_free_urb (dev->rx_cb[1 ].rx_urb); -kfree (dev->rx_cb[1 ].rx_buffer); - } -kfree (adapter->priv->rx_data_pkt);kfree (dev->tx_buffer); }
@@ -523,29 +553,29 @@ static int rsi_usb_init_rx(struct rsi_hw *adapter)for (idx =0 ; idx < num_rx_cb; idx++) { rx_cb = &dev->rx_cb[idx]; - rx_cb->rx_buffer =kzalloc (RSI_USB_BUF_SIZE *2 , -GFP_KERNEL ); -if (!rx_cb->rx_buffer) - goto err; - rx_cb->rx_urb =usb_alloc_urb (0 ,GFP_KERNEL );if (!rx_cb->rx_urb) {rsi_dbg (ERR_ZONE ,"Failed alloc rx urb[%d]\n" , idx); goto err; } - rx_cb->rx_urb->transfer_buffer = rx_cb->rx_buffer; rx_cb->ep_num = idx +1 ; rx_cb->data = (void *)dev; } +skb_queue_head_init (&dev->rx_q); +rsi_init_event (&dev->rx_thread.event); +if (rsi_create_kthread (adapter->priv, &dev->rx_thread, + rsi_usb_rx_thread,"RX-Thread" )) { +rsi_dbg (ERR_ZONE ,"%s: Unable to init rx thrd\n" , __func__); + goto err; + } +return 0 ; err: -kfree (dev->rx_cb[0 ].rx_buffer);usb_free_urb (dev->rx_cb[0 ].rx_urb); -if (adapter->priv->coex_mode >1 ) { -kfree (dev->rx_cb[1 ].rx_buffer); +if (adapter->priv->coex_mode >1 )usb_free_urb (dev->rx_cb[1 ].rx_urb); - } +return -1 ; }
@@ -560,7 +590,6 @@ static int rsi_init_usb_interface(struct rsi_hw *adapter, struct usb_interface *pfunction) {struct rsi_91x_usbdev *rsi_dev; -struct rsi_common *common = adapter->priv;int status; rsi_dev =kzalloc (sizeof (*rsi_dev),GFP_KERNEL );
@@ -569,49 +598,37 @@ static int rsi_init_usb_interface(struct rsi_hw *adapter, adapter->rsi_dev = rsi_dev; rsi_dev->usbdev =interface_to_usbdev (pfunction); + rsi_dev->priv = (void *)adapter; -if (rsi_find_bulk_in_and_out_endpoints (pfunction, adapter)) -return -EINVAL ; +if (rsi_find_bulk_in_and_out_endpoints (pfunction, adapter)) { + status = -EINVAL ; + goto fail_eps; + } adapter->device = &pfunction->dev;usb_set_intfdata (pfunction, adapter); - common->rx_data_pkt =kmalloc (2048 ,GFP_KERNEL ); -if (!common->rx_data_pkt) { -rsi_dbg (ERR_ZONE ,"%s: Failed to allocate memory\n" , - __func__); -return -ENOMEM ; - } - rsi_dev->tx_buffer =kmalloc (2048 ,GFP_KERNEL );if (!rsi_dev->tx_buffer) { status = -ENOMEM ; - goto fail_tx; + goto fail_eps; }if (rsi_usb_init_rx (adapter)) {rsi_dbg (ERR_ZONE ,"Failed to init RX handle\n" ); -return -ENOMEM ; + status = -ENOMEM ; + goto fail_rx; } rsi_dev->tx_blk_size =252 ; adapter->block_size = rsi_dev->tx_blk_size;/* Initializing function callbacks */ - adapter->rx_urb_submit = rsi_rx_urb_submit; adapter->check_hw_queue_status = rsi_usb_check_queue_status; adapter->determine_event_timeout = rsi_usb_event_timeout; adapter->rsi_host_intf =RSI_HOST_INTF_USB ; adapter->host_intf_ops = &usb_host_intf_ops; -rsi_init_event (&rsi_dev->rx_thread.event); - status =rsi_create_kthread (common, &rsi_dev->rx_thread, - rsi_usb_rx_thread,"RX-Thread" ); -if (status) { -rsi_dbg (ERR_ZONE ,"%s: Unable to init rx thrd\n" , __func__); - goto fail_thread; - } -#ifdef CONFIG_RSI_DEBUGFS /* In USB, one less than the MAX_DEBUGFS_ENTRIES entries is required */ adapter->num_debugfs_entries = (MAX_DEBUGFS_ENTRIES -1 );
@@ -620,15 +637,12 @@ static int rsi_init_usb_interface(struct rsi_hw *adapter,rsi_dbg (INIT_ZONE ,"%s: Enabled the interface\n" , __func__);return 0 ; -fail_thread: -kfree (rsi_dev->rx_cb[0 ].rx_buffer); -usb_free_urb (rsi_dev->rx_cb[0 ].rx_urb); -if (common->coex_mode >1 ) { -kfree (rsi_dev->rx_cb[1 ].rx_buffer); -usb_free_urb (rsi_dev->rx_cb[1 ].rx_urb); - } -fail_tx: -kfree (common->rx_data_pkt); +fail_rx: +kfree (rsi_dev->tx_buffer); + +fail_eps: +kfree (rsi_dev); +return status; }
drivers/net/wireless/rsi/rsi_91x_usb_ops.c +12 -23
@@ -29,44 +29,33 @@ void rsi_usb_rx_thread(struct rsi_common *common) {struct rsi_hw *adapter = common->priv;struct rsi_91x_usbdev *dev = (struct rsi_91x_usbdev *)adapter->rsi_dev; -struct rx_usb_ctrl_block *rx_cb; -int status, idx, num_rx_cb; +int status; +struct sk_buff *skb; - num_rx_cb = (adapter->priv->coex_mode >1 ?2 :1 );do {rsi_wait_event (&dev->rx_thread.event,EVENT_WAIT_FOREVER ); +rsi_reset_event (&dev->rx_thread.event); -if (atomic_read (&dev->rx_thread.thread_done)) - goto out; - -for (idx =0 ; idx < num_rx_cb; idx++) { - rx_cb = &dev->rx_cb[idx]; -if (!rx_cb->pend) -continue ; +while (true) { +if (atomic_read (&dev->rx_thread.thread_done)) + goto out; -mutex_lock (&common->rx_lock); - status =rsi_read_pkt (common, rx_cb->rx_buffer,0 ); + skb =skb_dequeue (&dev->rx_q); +if (!skb) +break ; + status =rsi_read_pkt (common, skb->data,0 );if (status) {rsi_dbg (ERR_ZONE ,"%s: Failed To read data" , __func__); -mutex_unlock (&common->rx_lock);break ; } - rx_cb->pend =0 ; -mutex_unlock (&common->rx_lock); - -if (adapter->rx_urb_submit (adapter, rx_cb->ep_num)) { -rsi_dbg (ERR_ZONE , -"%s: Failed in urb submission" , - __func__); -return ; - } +dev_kfree_skb (skb); } -rsi_reset_event (&dev->rx_thread.event); }while (1 ); out:rsi_dbg (INFO_ZONE ,"%s: Terminated thread\n" , __func__); +skb_queue_purge (&dev->rx_q);complete_and_exit (&dev->rx_thread.completion,0 ); }
drivers/net/wireless/rsi/rsi_hal.h +1 -0
@@ -114,6 +114,7 @@#define FW_FLASH_OFFSET 0x820#define LMAC_VER_OFFSET (FW_FLASH_OFFSET + 0x200) +#define MAX_DWORD_ALIGN_BYTES 64struct bl_header {__le32 flags;
drivers/net/wireless/rsi/rsi_main.h +0 -1
@@ -341,7 +341,6 @@ struct rsi_hw {void *rsi_dev;struct rsi_host_intf_ops *host_intf_ops;int (*check_hw_queue_status)(struct rsi_hw *adapter,u8 q_num); -int (*rx_urb_submit)(struct rsi_hw *adapter,u8 ep_num);int (*determine_event_timeout)(struct rsi_hw *adapter); };
drivers/net/wireless/rsi/rsi_usb.h +3 -2
@@ -42,12 +42,12 @@struct rx_usb_ctrl_block {u8 *data;struct urb *rx_urb; -u8 *rx_buffer; +struct sk_buff *rx_skb;u8 ep_num; -u8 pend; };struct rsi_91x_usbdev { +void *priv;struct rsi_thread rx_thread;u8 endpoint;struct usb_device *usbdev;
@@ -60,6 +60,7 @@ struct rsi_91x_usbdev {u8 bulkout_endpoint_addr[MAX_BULK_EP ];u32 tx_blk_size;u8 write_fail; +struct sk_buff_head rx_q; };static inline int rsi_usb_check_queue_status (struct rsi_hw *adapter,u8 q_num)
Signature · 1 line
2.7.4