mt76x02u: use usb_bulk_msg to upload firmware
PATCH 1/1 mt76x02u: use usb_bulk_msg to upload firmware
commit 5de4db8fcb6d6fc7d9064c22841211790c0ab81b upstream.
We don't need to send firmware data asynchronously, much simpler is just use synchronous usb_bulk_msg().
[ stable note: this patch was originally developed as cleanup, but it remove incorrect usage of page_frag_alloc(): alloc more than PAGE_SIZE and create not ARCH_DMA_MINALIGN dma buffers needed at least for performance reason. Was tested on 5.0 and 4.20, see
https://bugzilla.kernel.org/show_bug.cgi?id=202673 and
https://bugzilla.kernel.org/show_bug.cgi?id=202241 ]
--- drivers/net/wireless/mediatek/mt76/mt76.h | 13 ++++++ .../net/wireless/mediatek/mt76/mt76x02_usb_mcu.c | 52 +++++++--------------- drivers/net/wireless/mediatek/mt76/usb.c | 1 - 3 files changed, 29 insertions(+), 37 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +13 -0
@@ -713,6 +713,19 @@ static inline bool mt76u_check_sg(struct mt76_dev *dev) udev->speed == USB_SPEED_WIRELESS)); } +static inline int +mt76u_bulk_msg (struct mt76_dev *dev,void *data,int len,int timeout) +{ +struct usb_interface *intf =to_usb_interface (dev->dev); +struct usb_device *udev =interface_to_usbdev (intf); +struct mt76_usb *usb = &dev->usb; +unsigned int pipe; +int sent; + + pipe =usb_sndbulkpipe (udev, usb->out_ep[MT_EP_OUT_INBAND_CMD ]); +return usb_bulk_msg (udev, pipe, data, len, &sent, timeout); +} +int mt76u_vendor_request (struct mt76_dev *dev,u8 req,u8 req_type,u16 val,u16 offset,void *buf,size_t len);
drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c +16 -36
104 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/usb.c +0 -1
@@ -326,7 +326,6 @@ int mt76u_buf_alloc(struct mt76_dev *dev, struct mt76u_buf *buf,return mt76u_fill_rx_sg (dev, buf, nsgs, len, sglen); } -EXPORT_SYMBOL_GPL (mt76u_buf_alloc);void mt76u_buf_free (struct mt76u_buf *buf) {
Signature · 1 line
2.7.5
Greg KH
maintainerQuoted 12 lines · Stanislaw Gruszka
commit
5de4db8fcb6d6fc7d9064c22841211790c0ab81bupstream.We don't need to send firmware data asynchronously, much simpler is just use synchronous
usb_bulk_msg().[ stable note: this patch was originally developed as cleanup, but it remove incorrect usage of
page_frag_alloc(): alloc more thanPAGE_SIZEand create notARCH_DMA_MINALIGNdma buffers needed at least for performance reason. Was tested on 5.0 and 4.20, see
https://bugzilla.kernel.org/show_bug.cgi?id=202673 and
https://bugzilla.kernel.org/show_bug.cgi?id=202241 ]
Quoted 8 lines
Tested-by Lorenzo Bianconi <[email protected]>Signed-off-by Felix Fietkau <[email protected]>Signed-off-by Stanislaw Gruszka <[email protected]>--- drivers/net/wireless/mediatek/mt76/mt76.h | 13 ++++++ .../net/wireless/mediatek/mt76/mt76x02_usb_mcu.c | 52 +++++++--------------- drivers/net/wireless/mediatek/mt76/usb.c | 1 - 3 files changed, 29 insertions(+), 37 deletions(-)
4.20 is now end-of-life, but I have queued this up for 5.0.y, thanks!
greg k-h