move mcu shared code in mt76-core
Subsystems (2)
cover move mcu shared code in mt76-core
Move mcu shared routines in mt76-core module in order to reuse them adding support for mt7603 driver
Lorenzo Bianconi (3):
mt76: move mt76_mcu_msg_alloc in mt76-core
mt76: move mt76_mcu_get_response in mt76-core
mt76: move mt76_mcu_rx_event in mt76-core
drivers/net/wireless/mediatek/mt76/Makefile | 3 +- drivers/net/wireless/mediatek/mt76/mcu.c | 60 +++++++++++++++++++ drivers/net/wireless/mediatek/mt76/mt76.h | 7 +++ .../net/wireless/mediatek/mt76/mt76x02_mcu.c | 29 +-------- .../net/wireless/mediatek/mt76/mt76x02_mcu.h | 6 ++ .../net/wireless/mediatek/mt76/mt76x02_txrx.c | 3 +- .../wireless/mediatek/mt76/mt76x02_usb_mcu.c | 17 +----- 7 files changed, 78 insertions(+), 47 deletions(-) create mode 100644 drivers/net/wireless/mediatek/mt76/mcu.c
Signature · 1 line
2.20.1
PATCH 1/3 mt76: move mt76_mcu_msg_alloc in mt76-core
Move mt76_mcu_msg_alloc in mt76-core module and remove duplicated code. mt76_mcu_msg_alloc will be reused adding support for mt7603 driver
--- drivers/net/wireless/mediatek/mt76/Makefile | 3 +- drivers/net/wireless/mediatek/mt76/mcu.c | 36 +++++++++++++++++++ drivers/net/wireless/mediatek/mt76/mt76.h | 4 +++ .../net/wireless/mediatek/mt76/mt76x02_mcu.c | 12 ------- .../net/wireless/mediatek/mt76/mt76x02_mcu.h | 6 ++++ .../wireless/mediatek/mt76/mt76x02_usb_mcu.c | 17 +-------- 6 files changed, 49 insertions(+), 29 deletions(-) create mode 100644 drivers/net/wireless/mediatek/mt76/mcu.c
drivers/net/wireless/mediatek/mt76/Makefile +2 -1
@@ -4,7 +4,8 @@ obj-$(CONFIG_MT76x02_LIB) += mt76x02-lib.o obj-$(CONFIG_MT76x02_USB) += mt76x02-usb.o mt76-y := \ - mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o tx.o agg-rx.o + mmio.o util.o trace.o dma.o mac80211.o debugfs.o eeprom.o \ + tx.o agg-rx.o mcu.o mt76-usb-y := usb.o usb_trace.o usb_mcu.o
drivers/net/wireless/mediatek/mt76/mcu.c new file +36 -0
@@ -0,0 +1,36 @@ +/* +* Copyright (C) 2019 Lorenzo Bianconi <[email protected]> +* +* Permission to use, copy, modify, and/or distribute this software for any +* purpose with or without fee is hereby granted, provided that the above +* copyright notice and this permission notice appear in all copies. +* +* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +#include "mt76.h" + +struct sk_buff * +mt76_mcu_msg_alloc (const void *data,int head_len, +int data_len,int tail_len) +{ +struct sk_buff *skb; + + skb =alloc_skb (head_len + data_len + tail_len, +GFP_KERNEL ); +if (!skb) +return NULL ; + +skb_reserve (skb, head_len); +if (data && data_len) +skb_put_data (skb, data, data_len); + +return skb; +} +EXPORT_SYMBOL_GPL (mt76_mcu_msg_alloc);
drivers/net/wireless/mediatek/mt76/mt76.h +4 -0
@@ -773,6 +773,10 @@ void mt76u_stop_queues(struct mt76_dev *dev);void mt76u_stop_stat_wk (struct mt76_dev *dev);void mt76u_queues_deinit (struct mt76_dev *dev); +struct sk_buff * +mt76_mcu_msg_alloc (const void *data,int head_len, +int data_len,int tail_len); +void mt76u_mcu_complete_urb (struct urb *urb);int mt76u_mcu_init_rx (struct mt76_dev *dev);void mt76u_mcu_deinit (struct mt76_dev *dev);
drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c +0 -12
@@ -21,18 +21,6 @@#include "mt76x02_mcu.h" -static struct sk_buff *mt76x02_mcu_msg_alloc (const void *data,int len) -{ -struct sk_buff *skb; - - skb =alloc_skb (len,GFP_KERNEL ); -if (!skb) -return NULL ; -memcpy (skb_put (skb, len), data, len); - -return skb; -} -static struct sk_buff *mt76x02_mcu_get_response (struct mt76x02_dev *dev,unsigned long expires) {
drivers/net/wireless/mediatek/mt76/mt76x02_mcu.h +6 -0
@@ -96,6 +96,12 @@ struct mt76x02_patch_header {u8 pad[2 ]; }; +static inline struct sk_buff * +mt76x02_mcu_msg_alloc (const void *data,int len) +{ +return mt76_mcu_msg_alloc (data,0 , len,0 ); +} +int mt76x02_mcu_cleanup (struct mt76x02_dev *dev);int mt76x02_mcu_calibrate (struct mt76x02_dev *dev,int type,u32 param); int mt76x02_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data,
drivers/net/wireless/mediatek/mt76/mt76x02_usb_mcu.c +1 -16
@@ -28,21 +28,6 @@#define MT_TX_CPU_FROM_FCE_CPU_DESC_IDX 0x09a8 -static struct sk_buff * -mt76x02u_mcu_msg_alloc (const void *data,int len) -{ -struct sk_buff *skb; - - skb =alloc_skb (MT_CMD_HDR_LEN + len +8 ,GFP_KERNEL ); -if (!skb) -return NULL ; - -skb_reserve (skb,MT_CMD_HDR_LEN ); -skb_put_data (skb, data, len); - -return skb; -} -static void mt76x02u_multiple_mcu_reads (struct mt76_dev *dev,u8 *data,int len) {
@@ -166,7 +151,7 @@ mt76x02u_mcu_send_msg(struct mt76_dev *dev, int cmd, const void *data,struct sk_buff *skb;int err; - skb =mt76x02u_mcu_msg_alloc (data, len); + skb =mt76_mcu_msg_alloc (data,MT_CMD_HDR_LEN , len,8 );if (!skb)return -ENOMEM ;
Signature · 1 line
2.20.1
PATCH 2/3 mt76: move mt76_mcu_get_response in mt76-core
In reply to Lorenzo BianconiMove mt76_mcu_get_response in mt76-core module and remove duplicated code. mt76_mcu_get_response will be reused adding support for mt7603 driver
--- drivers/net/wireless/mediatek/mt76/mcu.c | 17 +++++++++++++++++ drivers/net/wireless/mediatek/mt76/mt76.h | 2 ++ .../net/wireless/mediatek/mt76/mt76x02_mcu.c | 17 +---------------- 3 files changed, 20 insertions(+), 16 deletions(-)
drivers/net/wireless/mediatek/mt76/mcu.c +17 -0
@@ -34,3 +34,20 @@ mt76_mcu_msg_alloc(const void *data, int head_len,return skb; }EXPORT_SYMBOL_GPL (mt76_mcu_msg_alloc); + +/* mmio */ +struct sk_buff *mt76_mcu_get_response (struct mt76_dev *dev, +unsigned long expires) +{ +unsigned long timeout; + +if (!time_is_after_jiffies (expires)) +return NULL ; + + timeout = expires - jiffies; +wait_event_timeout (dev->mmio.mcu.wait, + !skb_queue_empty (&dev->mmio.mcu.res_q), + timeout); +return skb_dequeue (&dev->mmio.mcu.res_q); +} +EXPORT_SYMBOL_GPL (mt76_mcu_get_response);
drivers/net/wireless/mediatek/mt76/mt76.h +2 -0
@@ -776,6 +776,8 @@ void mt76u_queues_deinit(struct mt76_dev *dev);struct sk_buff *mt76_mcu_msg_alloc (const void *data,int head_len,int data_len,int tail_len); +struct sk_buff *mt76_mcu_get_response (struct mt76_dev *dev, +unsigned long expires);void mt76u_mcu_complete_urb (struct urb *urb);int mt76u_mcu_init_rx (struct mt76_dev *dev);
drivers/net/wireless/mediatek/mt76/mt76x02_mcu.c +1 -16
@@ -21,21 +21,6 @@#include "mt76x02_mcu.h" -static struct sk_buff * -mt76x02_mcu_get_response (struct mt76x02_dev *dev,unsigned long expires) -{ -unsigned long timeout; - -if (!time_is_after_jiffies (expires)) -return NULL ; - - timeout = expires - jiffies; -wait_event_timeout (dev->mt76.mmio.mcu.wait, - !skb_queue_empty (&dev->mt76.mmio.mcu.res_q), - timeout); -return skb_dequeue (&dev->mt76.mmio.mcu.res_q); -} -static int mt76x02_tx_queue_mcu (struct mt76x02_dev *dev,enum mt76_txq_id qid,struct sk_buff *skb,int cmd,int seq)
@@ -94,7 +79,7 @@ int mt76x02_mcu_msg_send(struct mt76_dev *mdev, int cmd, const void *data,u32 *rxfce;bool check_seq = false; - skb =mt76x02_mcu_get_response (dev, expires); + skb =mt76_mcu_get_response (&dev->mt76, expires);if (!skb) { dev_err(mdev->dev, "MCU message %d (seq %d) timed out\n", cmd,
Signature · 1 line
2.20.1
PATCH 3/3 mt76: move mt76_mcu_rx_event in mt76-core
In reply to Lorenzo BianconiMove mt76_mcu_rx_event i mt76-core module and remove duplicated code. mt76_mcu_rx_event will be reused adding support for mt7603 driver
--- drivers/net/wireless/mediatek/mt76/mcu.c | 7 +++++++ drivers/net/wireless/mediatek/mt76/mt76.h | 1 + drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c | 3 +-- 3 files changed, 9 insertions(+), 2 deletions(-)
drivers/net/wireless/mediatek/mt76/mcu.c +7 -0
@@ -51,3 +51,10 @@ struct sk_buff *mt76_mcu_get_response(struct mt76_dev *dev,return skb_dequeue (&dev->mmio.mcu.res_q); }EXPORT_SYMBOL_GPL (mt76_mcu_get_response); + +void mt76_mcu_rx_event (struct mt76_dev *dev,struct sk_buff *skb) +{ +skb_queue_tail (&dev->mmio.mcu.res_q, skb); +wake_up (&dev->mmio.mcu.wait); +} +EXPORT_SYMBOL_GPL (mt76_mcu_rx_event);
drivers/net/wireless/mediatek/mt76/mt76.h +1 -0
@@ -776,6 +776,7 @@ void mt76u_queues_deinit(struct mt76_dev *dev);struct sk_buff *mt76_mcu_msg_alloc (const void *data,int head_len,int data_len,int tail_len); +void mt76_mcu_rx_event (struct mt76_dev *dev,struct sk_buff *skb);struct sk_buff *mt76_mcu_get_response (struct mt76_dev *dev,unsigned long expires);
drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c +1 -2
@@ -58,8 +58,7 @@ void mt76x02_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,if (q ==MT_RXQ_MCU ) {/* this is used just by mmio code */ -skb_queue_tail (&mdev->mmio.mcu.res_q, skb); -wake_up (&mdev->mmio.mcu.wait); +mt76_mcu_rx_event (&dev->mt76, skb);return ; }
Signature · 1 line
2.20.1
Quoted 2 lines · Lorenzo Bianconi
Move mcu shared routines in mt76-core module in order to reuse them adding support for mt7603 driver
Applied, thanks.
- Felix