AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-06 00:45:03 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

mwifiex: Support USB interrupt endpoint for command response/event

Browse Source 
USB firmware added support for sending command response/event through
interrupt endpoint, to enhance RX throughput. Added corresponding changes
required to support this feature. This change takes care of backward
compatibility with older firmware.

Signed-off-by: Ganapathi Bhat <gbhat@marvell.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Ganapathi Bhat 2017-03-27 18:27:44 +05:30 committed by Kalle Valo
parent 1c92af00a5
commit 182f569660
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/net/wireless/marvell/mwifiex/usb.c
View File

@ -306,9 +306,17 @@ static int mwifiex_usb_submit_rx_urb(struct urb_context *ctx, int size)
} }
} }
if (card->rx_cmd_ep == ctx->ep &&
card->rx_cmd_ep_type == USB_ENDPOINT_XFER_INT)
usb_fill_int_urb(ctx->urb, card->udev,
usb_rcvintpipe(card->udev, ctx->ep),
ctx->skb->data, size, mwifiex_usb_rx_complete,
(void *)ctx, card->rx_cmd_interval);
else
usb_fill_bulk_urb(ctx->urb, card->udev, usb_fill_bulk_urb(ctx->urb, card->udev,
usb_rcvbulkpipe(card->udev, ctx->ep), ctx->skb->data, usb_rcvbulkpipe(card->udev, ctx->ep),
size, mwifiex_usb_rx_complete, (void *)ctx); ctx->skb->data, size, mwifiex_usb_rx_complete,
(void *)ctx);
if (card->rx_cmd_ep == ctx->ep) if (card->rx_cmd_ep == ctx->ep)
atomic_inc(&card->rx_cmd_urb_pending); atomic_inc(&card->rx_cmd_urb_pending);
@ -424,10 +432,13 @@ static int mwifiex_usb_probe(struct usb_interface *intf,
epd = &iface_desc->endpoint[i].desc; epd = &iface_desc->endpoint[i].desc;
if (usb_endpoint_dir_in(epd) && if (usb_endpoint_dir_in(epd) &&
usb_endpoint_num(epd) == MWIFIEX_USB_EP_CMD_EVENT && usb_endpoint_num(epd) == MWIFIEX_USB_EP_CMD_EVENT &&
usb_endpoint_xfer_bulk(epd)) { (usb_endpoint_xfer_bulk(epd) ||
pr_debug("info: bulk IN: max pkt size: %d, addr: %d\n", usb_endpoint_xfer_int(epd))) {
card->rx_cmd_ep_type = usb_endpoint_type(epd);
card->rx_cmd_interval = epd->bInterval;
pr_debug("info: Rx CMD/EVT:: max pkt size: %d, addr: %d, ep_type: %d\n",
le16_to_cpu(epd->wMaxPacketSize), le16_to_cpu(epd->wMaxPacketSize),
epd->bEndpointAddress); epd->bEndpointAddress, card->rx_cmd_ep_type);
card->rx_cmd_ep = usb_endpoint_num(epd); card->rx_cmd_ep = usb_endpoint_num(epd);
atomic_set(&card->rx_cmd_urb_pending, 0); atomic_set(&card->rx_cmd_urb_pending, 0);
} }
@ -461,10 +472,16 @@ static int mwifiex_usb_probe(struct usb_interface *intf,
} }
if (usb_endpoint_dir_out(epd) && if (usb_endpoint_dir_out(epd) &&
usb_endpoint_num(epd) == MWIFIEX_USB_EP_CMD_EVENT && usb_endpoint_num(epd) == MWIFIEX_USB_EP_CMD_EVENT &&
usb_endpoint_xfer_bulk(epd)) { (usb_endpoint_xfer_bulk(epd) ||
usb_endpoint_xfer_int(epd))) {
card->tx_cmd_ep_type = usb_endpoint_type(epd);
card->tx_cmd_interval = epd->bInterval;
pr_debug("info: bulk OUT: max pkt size: %d, addr: %d\n", pr_debug("info: bulk OUT: max pkt size: %d, addr: %d\n",
le16_to_cpu(epd->wMaxPacketSize), le16_to_cpu(epd->wMaxPacketSize),
epd->bEndpointAddress); epd->bEndpointAddress);
pr_debug("info: Tx CMD:: max pkt size: %d, addr: %d, ep_type: %d\n",
le16_to_cpu(epd->wMaxPacketSize),
epd->bEndpointAddress, card->tx_cmd_ep_type);
card->tx_cmd_ep = usb_endpoint_num(epd); card->tx_cmd_ep = usb_endpoint_num(epd);
atomic_set(&card->tx_cmd_urb_pending, 0); atomic_set(&card->tx_cmd_urb_pending, 0);
card->bulk_out_maxpktsize = card->bulk_out_maxpktsize =
@ -884,8 +901,16 @@ static int mwifiex_usb_host_to_card(struct mwifiex_adapter *adapter, u8 ep,
context->skb = skb; context->skb = skb;
tx_urb = context->urb; tx_urb = context->urb;
usb_fill_bulk_urb(tx_urb, card->udev, usb_sndbulkpipe(card->udev, ep), if (ep == card->tx_cmd_ep &&
data, skb->len, mwifiex_usb_tx_complete, card->tx_cmd_ep_type == USB_ENDPOINT_XFER_INT)
usb_fill_int_urb(tx_urb, card->udev,
usb_sndintpipe(card->udev, ep), data,
skb->len, mwifiex_usb_tx_complete,
(void *)context, card->tx_cmd_interval);
else
usb_fill_bulk_urb(tx_urb, card->udev,
usb_sndbulkpipe(card->udev, ep), data,
skb->len, mwifiex_usb_tx_complete,
(void *)context); (void *)context);
tx_urb->transfer_flags |= URB_ZERO_PACKET; tx_urb->transfer_flags |= URB_ZERO_PACKET;

4
drivers/net/wireless/marvell/mwifiex/usb.h
View File

@ -90,6 +90,10 @@ struct usb_card_rec {
struct urb_context tx_cmd; struct urb_context tx_cmd;
u8 mc_resync_flag; u8 mc_resync_flag;
struct usb_tx_data_port port[MWIFIEX_TX_DATA_PORT]; struct usb_tx_data_port port[MWIFIEX_TX_DATA_PORT];
int rx_cmd_ep_type;
u8 rx_cmd_interval;
int tx_cmd_ep_type;
u8 tx_cmd_interval;
}; };
struct fw_header { struct fw_header {