unify rx datapath between mt76x0 and mt76x2 drivers
Subsystems (2)
cover unify rx datapath between mt76x0 and mt76x2 drivers
Move mt76x02_irq_handler irq handler in mt76x02-lib module in order to unify rx datapath between mt76x0 and mt76x2 drivers and remove duplicated code
Changes since rfc:
- drop patch 9/9 ("mt76x0: pci: add mt76x0_register_device in mt76x0e_register_device") for the moment
- rebase on top of 'unify rxwi parsing between mt76x0 and mt76x2 drivers'
https://marc.info/?l=linux-wireless&m=153869000528661&w=2
Lorenzo Bianconi (8):
mt76: move tpc routines in mt76x02-lib module
mt76: move mt76x02_tx_prepare_skb in mt76x02_txrx.c
mt76: usb: move mt76x02u_tx_complete_skb in mt76x02_usb_core.c
mt76: move mt76x02_mac_poll_tx_status in mt76x02-lib moudle
mt76: move mt76x02_tx_complete in mt76x02-lib module
mt76: use mt76x02_dev instead of mt76_dev in mt76x02_mmio.c
mt76: move tx_tasklet management in mt76x02-lib moudle
mt76: move irq handler in mt76x02-lib moudle
drivers/net/wireless/mediatek/mt76/Makefile | 3 +-
drivers/net/wireless/mediatek/mt76/mt76.h | 6 +-
.../net/wireless/mediatek/mt76/mt76x0/pci.c | 8 +-
.../net/wireless/mediatek/mt76/mt76x0/usb.c | 2 +-
drivers/net/wireless/mediatek/mt76/mt76x02.h | 18 +-
.../net/wireless/mediatek/mt76/mt76x02_dma.h | 8 +-
.../net/wireless/mediatek/mt76/mt76x02_mac.c | 70 ++++++-
.../net/wireless/mediatek/mt76/mt76x02_mac.h | 20 ++
.../net/wireless/mediatek/mt76/mt76x02_mmio.c | 174 ++++++++++++++----
.../{mt76x2/pci_trace.c => mt76x02_trace.c} | 2 +-
.../mt76/{mt76x2/trace.h => mt76x02_trace.h} | 21 +--
.../net/wireless/mediatek/mt76/mt76x02_txrx.c | 72 ++++++--
.../net/wireless/mediatek/mt76/mt76x02_usb.h | 2 +
.../wireless/mediatek/mt76/mt76x02_usb_core.c | 18 ++
.../wireless/mediatek/mt76/mt76x2/Makefile | 7 +-
.../net/wireless/mediatek/mt76/mt76x2/mac.h | 20 --
.../wireless/mediatek/mt76/mt76x2/mt76x2.h | 16 --
.../net/wireless/mediatek/mt76/mt76x2/pci.c | 3 +-
.../wireless/mediatek/mt76/mt76x2/pci_core.c | 75 --------
.../wireless/mediatek/mt76/mt76x2/pci_dfs.c | 6 +-
.../wireless/mediatek/mt76/mt76x2/pci_dma.c | 37 ----
.../wireless/mediatek/mt76/mt76x2/pci_init.c | 24 +--
.../wireless/mediatek/mt76/mt76x2/pci_mac.c | 73 +-------
.../wireless/mediatek/mt76/mt76x2/pci_main.c | 2 +-
.../wireless/mediatek/mt76/mt76x2/pci_tx.c | 31 ----
.../net/wireless/mediatek/mt76/mt76x2/tx.c | 49 -----
.../wireless/mediatek/mt76/mt76x2/usb_init.c | 2 +-
27 files changed, 355 insertions(+), 414 deletions(-)
rename drivers/net/wireless/mediatek/mt76/{mt76x2/pci_trace.c => mt76x02_trace.c} (97%)
rename drivers/net/wireless/mediatek/mt76/{mt76x2/trace.h => mt76x02_trace.h} (94%)
delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2/pci_core.c
delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2/pci_dma.c
delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2/tx.cSignature · 1 line
2.17.1
PATCH 1/8 mt76: move tpc routines in mt76x02-lib module
Move mt76x02_tx_get_txpwr_adj and mt76x02_tx_set_txpwr_auto routines in mt76x02-lib module since they are shared between mt76x0 and mt76x2 drivers. Moreover remove get_txpwr_adj function pointer
--- drivers/net/wireless/mediatek/mt76/mt76.h | 2 - drivers/net/wireless/mediatek/mt76/mt76x02.h | 2 + .../net/wireless/mediatek/mt76/mt76x02_mac.c | 8 ++- .../net/wireless/mediatek/mt76/mt76x02_txrx.c | 30 ++++++++++++ .../wireless/mediatek/mt76/mt76x2/Makefile | 2 +- .../wireless/mediatek/mt76/mt76x2/mt76x2.h | 4 -- .../wireless/mediatek/mt76/mt76x2/pci_init.c | 1 - .../wireless/mediatek/mt76/mt76x2/pci_main.c | 2 +- .../net/wireless/mediatek/mt76/mt76x2/tx.c | 49 ------------------- 9 files changed, 37 insertions(+), 63 deletions(-) delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2/tx.c
drivers/net/wireless/mediatek/mt76/mt76.h +0 -2
@@ -262,8 +262,6 @@ struct mt76_driver_ops {void (*sta_ps)(struct mt76_dev *dev,struct ieee80211_sta *sta,bool ps); -s8 (*get_tx_txpwr_adj)(struct mt76_dev *dev,s8 txpwr, -s8 max_txpwr_adj); };struct mt76_channel_state {
drivers/net/wireless/mediatek/mt76/mt76x02.h +2 -0
@@ -138,6 +138,8 @@ void mt76x02_sta_rate_tbl_update(struct ieee80211_hw *hw, struct ieee80211_sta *sta);s8 mt76x02_tx_get_max_txpwr_adj (struct mt76_dev *dev,const struct ieee80211_tx_rate *rate); +s8 mt76x02_tx_get_txpwr_adj (struct mt76_dev *mdev,s8 txpwr,s8 max_txpwr_adj); +void mt76x02_tx_set_txpwr_auto (struct mt76x02_dev *dev,s8 txpwr);int mt76x02_insert_hdr_pad (struct sk_buff *skb);void mt76x02_remove_hdr_pad (struct sk_buff *skb,int len);void mt76x02_tx_complete (struct mt76_dev *dev,struct sk_buff *skb);
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +3 -5
@@ -384,11 +384,9 @@ void mt76x02_mac_write_txwi(struct mt76_dev *dev, struct mt76x02_txwi *txwi, }spin_unlock_bh (&dev->lock); -if (dev->drv->get_tx_txpwr_adj) { - txpwr_adj = dev->drv->get_tx_txpwr_adj (dev, dev->txpower_conf, - max_txpwr_adj); - txwi->ctl2 =FIELD_PREP (MT_TX_PWR_ADJ , txpwr_adj); - } + txpwr_adj =mt76x02_tx_get_txpwr_adj (dev, dev->txpower_conf, + max_txpwr_adj); + txwi->ctl2 =FIELD_PREP (MT_TX_PWR_ADJ , txpwr_adj);if (nstreams >1 &&mt76_rev (dev) >=MT76XX_REV_E4 ) txwi->txstream =0x13 ;
drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c +30 -0
@@ -112,6 +112,36 @@ s8 mt76x02_tx_get_max_txpwr_adj(struct mt76_dev *dev, }EXPORT_SYMBOL_GPL (mt76x02_tx_get_max_txpwr_adj); +s8 mt76x02_tx_get_txpwr_adj (struct mt76_dev *mdev,s8 txpwr,s8 max_txpwr_adj) +{ + struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76); + + txpwr =min_t (s8, txpwr, dev->mt76.txpower_conf); + txpwr -= (dev->target_power + dev->target_power_delta[0 ]); + txpwr =min_t (s8, txpwr, max_txpwr_adj); + +if (!dev->enable_tpc) +return 0 ; +else if (txpwr >=0 ) +return min_t (s8, txpwr,7 ); +else +return (txpwr <-16 ) ?8 : (txpwr +32 ) /2 ; +} +EXPORT_SYMBOL_GPL (mt76x02_tx_get_txpwr_adj); + +void mt76x02_tx_set_txpwr_auto (struct mt76x02_dev *dev,s8 txpwr) +{ +s8 txpwr_adj; + + txpwr_adj =mt76x02_tx_get_txpwr_adj (&dev->mt76, txpwr, + dev->mt76.rate_power.ofdm[4 ]); +mt76_rmw_field (dev,MT_PROT_AUTO_TX_CFG , +MT_PROT_AUTO_TX_CFG_PROT_PADJ , txpwr_adj); +mt76_rmw_field (dev,MT_PROT_AUTO_TX_CFG , +MT_PROT_AUTO_TX_CFG_AUTO_PADJ , txpwr_adj); +} +EXPORT_SYMBOL_GPL (mt76x02_tx_set_txpwr_auto); +static void mt76x02_remove_dma_hdr (struct sk_buff *skb) {int hdr_len;
drivers/net/wireless/mediatek/mt76/mt76x2/Makefile +1 -1
@@ -3,7 +3,7 @@ obj-$(CONFIG_MT76x2E) += mt76x2e.o obj-$(CONFIG_MT76x2U) += mt76x2u.o mt76x2-common-y := \ - eeprom.o tx.o mac.o init.o phy.o debugfs.o mcu.o + eeprom.o mac.o init.o phy.o debugfs.o mcu.o mt76x2e-y := \ pci.o pci_dma.o pci_main.o pci_init.o pci_tx.o \
drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h +0 -4
@@ -102,10 +102,6 @@ void mt76x2_sta_ps(struct mt76_dev *dev, struct ieee80211_sta *sta, bool ps);void mt76x2_update_channel (struct mt76_dev *mdev); -s8 mt76x2_tx_get_txpwr_adj (struct mt76_dev *mdev,s8 txpwr,s8 max_txpwr_adj); -void mt76x2_tx_set_txpwr_auto (struct mt76x02_dev *dev,s8 txpwr); - -void mt76x2_reset_wlan (struct mt76x02_dev *dev,bool enable);void mt76x2_init_txpower (struct mt76x02_dev *dev,struct ieee80211_supported_band *sband);
drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c +0 -1
@@ -360,7 +360,6 @@ struct mt76x02_dev *mt76x2_alloc_device(struct device *pdev) .rx_skb = mt76x02_queue_rx_skb, .rx_poll_complete = mt76x2_rx_poll_complete, .sta_ps = mt76x2_sta_ps, - .get_tx_txpwr_adj = mt76x2_tx_get_txpwr_adj, };struct mt76x02_dev *dev;struct mt76_dev *mdev;
drivers/net/wireless/mediatek/mt76/mt76x2/pci_main.c +1 -1
@@ -112,7 +112,7 @@ mt76x2_config(struct ieee80211_hw *hw, u32 changed)if (test_bit (MT76_STATE_RUNNING , &dev->mt76.state)) {mt76x2_phy_set_txpower (dev); -mt76x2_tx_set_txpwr_auto (dev, dev->mt76.txpower_conf); +mt76x02_tx_set_txpwr_auto (dev, dev->mt76.txpower_conf); } }
drivers/net/wireless/mediatek/mt76/mt76x2/tx.c deleted +0 -49
49 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 2/8 mt76: move mt76x02_tx_prepare_skb in mt76x02_txrx.c
In reply to Lorenzo BianconiMove mt76x02_tx_prepare_skb routine in mt76x02-lib module in order to be reused by mt76x0 driver in tx datapath
--- drivers/net/wireless/mediatek/mt76/mt76x02.h | 4 +++ .../net/wireless/mediatek/mt76/mt76x02_txrx.c | 32 +++++++++++++++++++ .../wireless/mediatek/mt76/mt76x2/mt76x2.h | 4 --- .../wireless/mediatek/mt76/mt76x2/pci_init.c | 2 +- .../wireless/mediatek/mt76/mt76x2/pci_tx.c | 31 ------------------ 5 files changed, 37 insertions(+), 36 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x02.h +4 -0
@@ -150,6 +150,10 @@ void mt76x02_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, struct sk_buff *skb);void mt76x02_tx (struct ieee80211_hw *hw,struct ieee80211_tx_control *control,struct sk_buff *skb); +int mt76x02_tx_prepare_skb (struct mt76_dev *mdev,void *txwi, +struct sk_buff *skb,struct mt76_queue *q, +struct mt76_wcid *wcid,struct ieee80211_sta *sta, +u32 *tx_info);extern const u16 mt76x02_beacon_offsets[16 ];void mt76x02_set_beacon_offsets (struct mt76_dev *dev);
drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c +32 -0
@@ -187,3 +187,35 @@ bool mt76x02_tx_status_data(struct mt76_dev *dev, u8 *update)return true; }EXPORT_SYMBOL_GPL (mt76x02_tx_status_data); + +int mt76x02_tx_prepare_skb (struct mt76_dev *mdev,void *txwi, +struct sk_buff *skb,struct mt76_queue *q, +struct mt76_wcid *wcid,struct ieee80211_sta *sta, +u32 *tx_info) +{ + struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76); +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); +int qsel =MT_QSEL_EDCA ; +int ret; + +if (q == &dev->mt76.q_tx[MT_TXQ_PSD ] && wcid && wcid->idx <128 ) +mt76x02_mac_wcid_set_drop (&dev->mt76, wcid->idx, false); + +mt76x02_mac_write_txwi (mdev, txwi, skb, wcid, sta, skb->len); + + ret =mt76x02_insert_hdr_pad (skb); +if (ret <0 ) +return ret; + +if (info->flags &IEEE80211_TX_CTL_RATE_CTRL_PROBE ) + qsel =MT_QSEL_MGMT ; + + *tx_info =FIELD_PREP (MT_TXD_INFO_QSEL , qsel) | +MT_TXD_INFO_80211 ; + +if (!wcid || wcid->hw_key_idx ==0xff || wcid->sw_iv) + *tx_info |=MT_TXD_INFO_WIV ; + +return 0 ; +} +EXPORT_SYMBOL_GPL (mt76x02_tx_prepare_skb);
drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h +0 -4
@@ -86,10 +86,6 @@ void mt76x2_dma_cleanup(struct mt76x02_dev *dev);void mt76x2_cleanup (struct mt76x02_dev *dev); -int mt76x2_tx_prepare_skb (struct mt76_dev *mdev,void *txwi, -struct sk_buff *skb,struct mt76_queue *q, -struct mt76_wcid *wcid,struct ieee80211_sta *sta, -u32 *tx_info);void mt76x2_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue *q,struct mt76_queue_entry *e,bool flush);void mt76x2_mac_set_tx_protection (struct mt76x02_dev *dev,u32 val);
drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c +1 -1
@@ -355,7 +355,7 @@ struct mt76x02_dev *mt76x2_alloc_device(struct device *pdev)static const struct mt76_driver_ops drv_ops = { .txwi_size =sizeof (struct mt76x02_txwi ), .update_survey = mt76x2_update_channel, - .tx_prepare_skb = mt76x2_tx_prepare_skb, + .tx_prepare_skb = mt76x02_tx_prepare_skb, .tx_complete_skb = mt76x2_tx_complete_skb, .rx_skb = mt76x02_queue_rx_skb, .rx_poll_complete = mt76x2_rx_poll_complete,
drivers/net/wireless/mediatek/mt76/mt76x2/pci_tx.c +0 -31
@@ -22,37 +22,6 @@ struct beacon_bc_data {struct sk_buff *tail[8 ]; }; -int mt76x2_tx_prepare_skb (struct mt76_dev *mdev,void *txwi, -struct sk_buff *skb,struct mt76_queue *q, -struct mt76_wcid *wcid,struct ieee80211_sta *sta, -u32 *tx_info) -{ - struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76); -struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); -int qsel =MT_QSEL_EDCA ; -int ret; - -if (q == &dev->mt76.q_tx[MT_TXQ_PSD ] && wcid && wcid->idx <128 ) -mt76x02_mac_wcid_set_drop (&dev->mt76, wcid->idx, false); - -mt76x02_mac_write_txwi (mdev, txwi, skb, wcid, sta, skb->len); - - ret =mt76x02_insert_hdr_pad (skb); -if (ret <0 ) -return ret; - -if (info->flags &IEEE80211_TX_CTL_RATE_CTRL_PROBE ) - qsel =MT_QSEL_MGMT ; - - *tx_info =FIELD_PREP (MT_TXD_INFO_QSEL , qsel) | -MT_TXD_INFO_80211 ; - -if (!wcid || wcid->hw_key_idx ==0xff || wcid->sw_iv) - *tx_info |=MT_TXD_INFO_WIV ; - -return 0 ; -} -static void mt76x2_update_beacon_iter (void *priv,u8 *mac,struct ieee80211_vif *vif) {
Signature · 1 line
2.17.1
PATCH 3/8 mt76: usb: move mt76x02u_tx_complete_skb in mt76x02_usb_core.c
In reply to Lorenzo BianconiMove mt76x02u_tx_complete_skb and mt76x02u_remove_dma_hdr since they are used just by usb code
--- .../net/wireless/mediatek/mt76/mt76x0/usb.c | 2 +- drivers/net/wireless/mediatek/mt76/mt76x02.h | 2 -- .../net/wireless/mediatek/mt76/mt76x02_txrx.c | 18 ------------------ .../net/wireless/mediatek/mt76/mt76x02_usb.h | 2 ++ .../wireless/mediatek/mt76/mt76x02_usb_core.c | 18 ++++++++++++++++++ .../wireless/mediatek/mt76/mt76x2/usb_init.c | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x0/usb.c +1 -1
@@ -215,7 +215,7 @@ static int mt76x0u_probe(struct usb_interface *usb_intf, {static const struct mt76_driver_ops drv_ops = { .tx_prepare_skb = mt76x02u_tx_prepare_skb, - .tx_complete_skb = mt76x02_tx_complete_skb, + .tx_complete_skb = mt76x02u_tx_complete_skb, .tx_status_data = mt76x02_tx_status_data, .rx_skb = mt76x02_queue_rx_skb, };
drivers/net/wireless/mediatek/mt76/mt76x02.h +0 -2
@@ -143,8 +143,6 @@ void mt76x02_tx_set_txpwr_auto(struct mt76x02_dev *dev, s8 txpwr);int mt76x02_insert_hdr_pad (struct sk_buff *skb);void mt76x02_remove_hdr_pad (struct sk_buff *skb,int len);void mt76x02_tx_complete (struct mt76_dev *dev,struct sk_buff *skb); -void mt76x02_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue *q, -struct mt76_queue_entry *e,bool flush);bool mt76x02_tx_status_data (struct mt76_dev *dev,u8 *update);void mt76x02_queue_rx_skb (struct mt76_dev *mdev,enum mt76_rxq_id q,struct sk_buff *skb);
drivers/net/wireless/mediatek/mt76/mt76x02_txrx.c +0 -18
@@ -142,16 +142,6 @@ void mt76x02_tx_set_txpwr_auto(struct mt76x02_dev *dev, s8 txpwr) }EXPORT_SYMBOL_GPL (mt76x02_tx_set_txpwr_auto); -static void mt76x02_remove_dma_hdr (struct sk_buff *skb) -{ -int hdr_len; - -skb_pull (skb,sizeof (struct mt76x02_txwi ) +MT_DMA_HDR_LEN ); - hdr_len =ieee80211_get_hdrlen_from_skb (skb); -if (hdr_len %4 ) -mt76x02_remove_hdr_pad (skb,2 ); -} -void mt76x02_tx_complete (struct mt76_dev *dev,struct sk_buff *skb) {struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb);
@@ -167,14 +157,6 @@ void mt76x02_tx_complete(struct mt76_dev *dev, struct sk_buff *skb) }EXPORT_SYMBOL_GPL (mt76x02_tx_complete); -void mt76x02_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue *q, -struct mt76_queue_entry *e,bool flush) -{ -mt76x02_remove_dma_hdr (e->skb); -mt76x02_tx_complete (mdev, e->skb); -} -EXPORT_SYMBOL_GPL (mt76x02_tx_complete_skb); -bool mt76x02_tx_status_data (struct mt76_dev *dev,u8 *update) {struct mt76x02_tx_status stat;
drivers/net/wireless/mediatek/mt76/mt76x02_usb.h +2 -0
@@ -29,4 +29,6 @@ int mt76x02u_tx_prepare_skb(struct mt76_dev *dev, void *data, struct sk_buff *skb, struct mt76_queue *q, struct mt76_wcid *wcid, struct ieee80211_sta *sta, u32 *tx_info); +void mt76x02u_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue *q, +struct mt76_queue_entry *e,bool flush);#endif /* __MT76x02_USB_H */
drivers/net/wireless/mediatek/mt76/mt76x02_usb_core.c +18 -0
@@ -16,6 +16,24 @@#include "mt76x02.h" +static void mt76x02u_remove_dma_hdr (struct sk_buff *skb) +{ +int hdr_len; + +skb_pull (skb,sizeof (struct mt76x02_txwi ) +MT_DMA_HDR_LEN ); + hdr_len =ieee80211_get_hdrlen_from_skb (skb); +if (hdr_len %4 ) +mt76x02_remove_hdr_pad (skb,2 ); +} + +void mt76x02u_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue *q, +struct mt76_queue_entry *e,bool flush) +{ +mt76x02u_remove_dma_hdr (e->skb); +mt76x02_tx_complete (mdev, e->skb); +} +EXPORT_SYMBOL_GPL (mt76x02u_tx_complete_skb); +static int mt76x02u_check_skb_rooms (struct sk_buff *skb) {int hdr_len =ieee80211_get_hdrlen_from_skb (skb);
drivers/net/wireless/mediatek/mt76/mt76x2/usb_init.c +1 -1
@@ -138,7 +138,7 @@ struct mt76x02_dev *mt76x2u_alloc_device(struct device *pdev) {static const struct mt76_driver_ops drv_ops = { .tx_prepare_skb = mt76x02u_tx_prepare_skb, - .tx_complete_skb = mt76x02_tx_complete_skb, + .tx_complete_skb = mt76x02u_tx_complete_skb, .tx_status_data = mt76x02_tx_status_data, .rx_skb = mt76x02_queue_rx_skb, };
Signature · 1 line
2.17.1
PATCH 4/8 mt76: move mt76x02_mac_poll_tx_status in mt76x02-lib moudle
In reply to Lorenzo BianconiMove mt76x02_mac_poll_tx_status in mt76x02_mac.c in order to be reused by mt76x0 drivers for irq unification. Moreover introduce mt76x02_trace source file to define mt76x02 trace points
--- drivers/net/wireless/mediatek/mt76/Makefile | 3 +- .../net/wireless/mediatek/mt76/mt76x02_mac.c | 33 +++++++ .../net/wireless/mediatek/mt76/mt76x02_mac.h | 1 + .../wireless/mediatek/mt76/mt76x02_trace.c | 23 +++++ .../wireless/mediatek/mt76/mt76x02_trace.h | 98 +++++++++++++++++++ .../net/wireless/mediatek/mt76/mt76x2/mac.h | 1 - .../wireless/mediatek/mt76/mt76x2/pci_core.c | 2 +- .../wireless/mediatek/mt76/mt76x2/pci_dma.c | 2 +- .../wireless/mediatek/mt76/mt76x2/pci_mac.c | 33 +------ .../net/wireless/mediatek/mt76/mt76x2/trace.h | 55 ----------- 10 files changed, 160 insertions(+), 91 deletions(-) create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_trace.c create mode 100644 drivers/net/wireless/mediatek/mt76/mt76x02_trace.h
drivers/net/wireless/mediatek/mt76/Makefile +2 -1
@@ -10,10 +10,11 @@ mt76-usb-y := usb.o usb_trace.o usb_mcu.o CFLAGS_trace.o := -I$(src) CFLAGS_usb_trace.o := -I$(src) +CFLAGS_mt76x02_trace.o := -I$(src) mt76x02-lib-y := mt76x02_util.o mt76x02_mac.o mt76x02_mcu.o \ mt76x02_eeprom.o mt76x02_phy.o mt76x02_mmio.o \ - mt76x02_txrx.o + mt76x02_txrx.o mt76x02_trace.o mt76x02-usb-y := mt76x02_usb_mcu.o mt76x02_usb_core.o
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +33 -0
@@ -16,6 +16,7 @@*/ #include "mt76x02.h" +#include "mt76x02_trace.h" enum mt76x02_cipher_type mt76x02_mac_get_key_info (struct ieee80211_key_conf *key,u8 *key_data)
@@ -681,3 +682,35 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,return mt76x02_mac_process_rate (status, rate); } + +void mt76x02_mac_poll_tx_status (struct mt76x02_dev *dev,bool irq) +{ +struct mt76x02_tx_status stat = {}; +unsigned long flags; +u8 update =1 ; +bool ret; + +if (!test_bit (MT76_STATE_RUNNING , &dev->mt76.state)) +return ; + +trace_mac_txstat_poll (dev); + +while (!irq || !kfifo_is_full (&dev->txstatus_fifo)) { +spin_lock_irqsave (&dev->mt76.mmio.irq_lock, flags); + ret =mt76x02_mac_load_tx_status (&dev->mt76, &stat); +spin_unlock_irqrestore (&dev->mt76.mmio.irq_lock, flags); + +if (!ret) +break ; + +trace_mac_txstat_fetch (dev, &stat); + +if (!irq) { +mt76x02_send_tx_status (&dev->mt76, &stat, &update); +continue ; + } + +kfifo_put (&dev->txstatus_fifo, stat); + } +} +EXPORT_SYMBOL_GPL (mt76x02_mac_poll_tx_status);
drivers/net/wireless/mediatek/mt76/mt76x02_mac.h +1 -0
@@ -205,4 +205,5 @@ void mt76x02_mac_setaddr(struct mt76_dev *dev, u8 *addr);void mt76x02_mac_write_txwi (struct mt76_dev *dev,struct mt76x02_txwi *txwi,struct sk_buff *skb,struct mt76_wcid *wcid,struct ieee80211_sta *sta,int len); +void mt76x02_mac_poll_tx_status (struct mt76x02_dev *dev,bool irq);#endif
drivers/net/wireless/mediatek/mt76/mt76x02_trace.c new file +23 -0
@@ -0,0 +1,23 @@ +/* +* Copyright (C) 2016 Felix Fietkau <[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 <linux/module.h> + +#ifndef __CHECKER__ +#define CREATE_TRACE_POINTS +#include "mt76x02_trace.h" + +#endif
drivers/net/wireless/mediatek/mt76/mt76x02_trace.h new file +98 -0
98 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x2/mac.h +0 -1
@@ -49,7 +49,6 @@ int mt76x2_mac_set_beacon(struct mt76x02_dev *dev, u8 vif_idx, struct sk_buff *skb);void mt76x2_mac_set_beacon_enable (struct mt76x02_dev *dev,u8 vif_idx,bool val); -void mt76x2_mac_poll_tx_status (struct mt76x02_dev *dev,bool irq);void mt76x2_mac_process_tx_status_fifo (struct mt76x02_dev *dev);void mt76x2_mac_work (struct work_struct *work);
drivers/net/wireless/mediatek/mt76/mt76x2/pci_core.c +1 -1
@@ -61,7 +61,7 @@ irqreturn_t mt76x2_irq_handler(int irq, void *dev_instance)mt76_queue_kick (dev, &dev->mt76.q_tx[MT_TXQ_PSD ]);if (intr &MT_INT_TX_STAT ) { -mt76x2_mac_poll_tx_status (dev, true); +mt76x02_mac_poll_tx_status (dev, true);tasklet_schedule (&dev->tx_tasklet); }
drivers/net/wireless/mediatek/mt76/mt76x2/pci_dma.c +1 -1
@@ -26,7 +26,7 @@ void mt76x2_tx_tasklet(unsigned long data)for (i =MT_TXQ_MCU ; i >=0 ; i--)mt76_queue_tx_cleanup (dev, i, false); -mt76x2_mac_poll_tx_status (dev, false); +mt76x02_mac_poll_tx_status (dev, false);mt76x02_irq_enable (&dev->mt76,MT_INT_TX_DONE_ALL ); }
drivers/net/wireless/mediatek/mt76/mt76x2/pci_mac.c +1 -32
@@ -28,37 +28,6 @@ void mt76x2_mac_set_bssid(struct mt76x02_dev *dev, u8 idx, const u8 *addr) get_unaligned_le16(addr + 4)); } -void mt76x2_mac_poll_tx_status (struct mt76x02_dev *dev,bool irq) -{ -struct mt76x02_tx_status stat = {}; -unsigned long flags; -u8 update =1 ; -bool ret; - -if (!test_bit (MT76_STATE_RUNNING , &dev->mt76.state)) -return ; - -trace_mac_txstat_poll (dev); - -while (!irq || !kfifo_is_full (&dev->txstatus_fifo)) { -spin_lock_irqsave (&dev->mt76.mmio.irq_lock, flags); - ret =mt76x02_mac_load_tx_status (&dev->mt76, &stat); -spin_unlock_irqrestore (&dev->mt76.mmio.irq_lock, flags); - -if (!ret) -break ; - -trace_mac_txstat_fetch (dev, &stat); - -if (!irq) { -mt76x02_send_tx_status (&dev->mt76, &stat, &update); -continue ; - } - -kfifo_put (&dev->txstatus_fifo, stat); - } -} -static void mt76x2_mac_queue_txdone (struct mt76x02_dev *dev,struct sk_buff *skb,void *txwi_ptr)
@@ -66,7 +35,7 @@ mt76x2_mac_queue_txdone(struct mt76x02_dev *dev, struct sk_buff *skb,struct mt76x2_tx_info *txi =mt76x2_skb_tx_info (skb);struct mt76x02_txwi *txwi = txwi_ptr; -mt76x2_mac_poll_tx_status (dev, false); +mt76x02_mac_poll_tx_status (dev, false); txi->tries =0 ; txi->jiffies = jiffies;
drivers/net/wireless/mediatek/mt76/mt76x2/trace.h +0 -55
72 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH 5/8 mt76: move mt76x02_tx_complete in mt76x02-lib module
In reply to Lorenzo BianconiMove mt76x02_tx_complete mt76x02-lib module in order to be reused by mt76x0 drivers for irq unification.
--- .../net/wireless/mediatek/mt76/mt76x02_mac.c | 29 +++++++++++++++++++ .../net/wireless/mediatek/mt76/mt76x02_mac.h | 19 ++++++++++++ .../wireless/mediatek/mt76/mt76x02_trace.h | 22 ++++++++++++++ .../net/wireless/mediatek/mt76/mt76x2/mac.h | 17 ----------- .../wireless/mediatek/mt76/mt76x2/mt76x2.h | 2 -- .../wireless/mediatek/mt76/mt76x2/pci_init.c | 2 +- .../wireless/mediatek/mt76/mt76x2/pci_mac.c | 28 ------------------ .../net/wireless/mediatek/mt76/mt76x2/trace.h | 22 -------------- 8 files changed, 71 insertions(+), 70 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +29 -0
@@ -714,3 +714,32 @@ void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq) } }EXPORT_SYMBOL_GPL (mt76x02_mac_poll_tx_status); + +static void +mt76x02_mac_queue_txdone (struct mt76x02_dev *dev,struct sk_buff *skb, +void *txwi_ptr) +{ +struct mt76x02_tx_info *txi =mt76x02_skb_tx_info (skb); +struct mt76x02_txwi *txwi = txwi_ptr; + +mt76x02_mac_poll_tx_status (dev, false); + + txi->tries =0 ; + txi->jiffies = jiffies; + txi->wcid = txwi->wcid; + txi->pktid = txwi->pktid; +trace_mac_txdone_add (dev, txwi->wcid, txwi->pktid); +mt76x02_tx_complete (&dev->mt76, skb); +} + +void mt76x02_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue *q, +struct mt76_queue_entry *e,bool flush) +{ + struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76); + +if (e->txwi) +mt76x02_mac_queue_txdone (dev, e->skb, &e->txwi->txwi); +else +dev_kfree_skb_any (e->skb); +} +EXPORT_SYMBOL_GPL (mt76x02_tx_complete_skb);
drivers/net/wireless/mediatek/mt76/mt76x02_mac.h +19 -0
@@ -42,6 +42,15 @@ struct mt76x02_vif {struct mt76_wcid group_wcid; }; +struct mt76x02_tx_info { +unsigned long jiffies; +u8 tries; + +u8 wcid; +u8 pktid; +u8 retry; +}; +DECLARE_EWMA (signal,10 ,8 );struct mt76x02_sta {
@@ -181,6 +190,14 @@ static inline bool mt76x02_wait_for_mac(struct mt76_dev *dev)return false; } +static inline struct mt76x02_tx_info * +mt76x02_skb_tx_info (struct sk_buff *skb) +{ +struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); + +return (void *)info->status.status_driver_data; +} +void mt76x02_txq_init (struct mt76_dev *dev,struct ieee80211_txq *txq);enum mt76x02_cipher_type mt76x02_mac_get_key_info (struct ieee80211_key_conf *key,u8 *key_data);
@@ -206,4 +223,6 @@ void mt76x02_mac_write_txwi(struct mt76_dev *dev, struct mt76x02_txwi *txwi, struct sk_buff *skb, struct mt76_wcid *wcid, struct ieee80211_sta *sta, int len);void mt76x02_mac_poll_tx_status (struct mt76x02_dev *dev,bool irq); +void mt76x02_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue *q, +struct mt76_queue_entry *e,bool flush);#endif
drivers/net/wireless/mediatek/mt76/mt76x02_trace.h +22 -0
@@ -46,6 +46,28 @@ DECLARE_EVENT_CLASS(dev_evt,TP_printk (DEV_PR_FMT ,DEV_PR_ARG ) ); +DECLARE_EVENT_CLASS (dev_txid_evt, + TP_PROTO(struct mt76x02_dev *dev, u8 wcid, u8 pktid), +TP_ARGS (dev, wcid, pktid), +TP_STRUCT__entry ( + DEV_ENTRY +TXID_ENTRY + ), +TP_fast_assign ( + DEV_ASSIGN; + TXID_ASSIGN; + ), +TP_printk ( + DEV_PR_FMT TXID_PR_FMT, +DEV_PR_ARG ,TXID_PR_ARG + ) +); + +DEFINE_EVENT (dev_txid_evt, mac_txdone_add, + TP_PROTO(struct mt76x02_dev *dev, u8 wcid, u8 pktid), +TP_ARGS (dev, wcid, pktid) +); +DEFINE_EVENT (dev_evt, mac_txstat_poll, TP_PROTO(struct mt76x02_dev *dev), TP_ARGS(dev)
drivers/net/wireless/mediatek/mt76/mt76x2/mac.h +0 -17
@@ -23,23 +23,6 @@ struct mt76x02_dev;struct mt76x2_sta ;struct mt76x02_vif ; -struct mt76x2_tx_info { -unsigned long jiffies; -u8 tries; - -u8 wcid; -u8 pktid; -u8 retry; -}; - -static inline struct mt76x2_tx_info * -mt76x2_skb_tx_info (struct sk_buff *skb) -{ -struct ieee80211_tx_info *info =IEEE80211_SKB_CB (skb); - -return (void *) info->status.status_driver_data; -} -int mt76x2_mac_start (struct mt76x02_dev *dev);void mt76x2_mac_stop (struct mt76x02_dev *dev,bool force);void mt76x2_mac_resume (struct mt76x02_dev *dev);
drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h +0 -2
@@ -86,8 +86,6 @@ void mt76x2_dma_cleanup(struct mt76x02_dev *dev);void mt76x2_cleanup (struct mt76x02_dev *dev); -void mt76x2_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue *q, -struct mt76_queue_entry *e,bool flush);void mt76x2_mac_set_tx_protection (struct mt76x02_dev *dev,u32 val);void mt76x2_pre_tbtt_tasklet (unsigned long arg);
drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c +1 -1
@@ -356,7 +356,7 @@ struct mt76x02_dev *mt76x2_alloc_device(struct device *pdev) .txwi_size = sizeof(struct mt76x02_txwi), .update_survey = mt76x2_update_channel, .tx_prepare_skb = mt76x02_tx_prepare_skb, - .tx_complete_skb = mt76x2_tx_complete_skb, + .tx_complete_skb = mt76x02_tx_complete_skb, .rx_skb = mt76x02_queue_rx_skb, .rx_poll_complete = mt76x2_rx_poll_complete, .sta_ps = mt76x2_sta_ps,
drivers/net/wireless/mediatek/mt76/mt76x2/pci_mac.c +0 -28
@@ -28,23 +28,6 @@ void mt76x2_mac_set_bssid(struct mt76x02_dev *dev, u8 idx, const u8 *addr) get_unaligned_le16(addr + 4)); } -static void -mt76x2_mac_queue_txdone (struct mt76x02_dev *dev,struct sk_buff *skb, -void *txwi_ptr) -{ -struct mt76x2_tx_info *txi =mt76x2_skb_tx_info (skb); -struct mt76x02_txwi *txwi = txwi_ptr; - -mt76x02_mac_poll_tx_status (dev, false); - - txi->tries =0 ; - txi->jiffies = jiffies; - txi->wcid = txwi->wcid; - txi->pktid = txwi->pktid; -trace_mac_txdone_add (dev, txwi->wcid, txwi->pktid); -mt76x02_tx_complete (&dev->mt76, skb); -} -void mt76x2_mac_process_tx_status_fifo (struct mt76x02_dev *dev) {struct mt76x02_tx_status stat;
@@ -54,17 +37,6 @@ void mt76x2_mac_process_tx_status_fifo(struct mt76x02_dev *dev)mt76x02_send_tx_status (&dev->mt76, &stat, &update); } -void mt76x2_tx_complete_skb (struct mt76_dev *mdev,struct mt76_queue *q, -struct mt76_queue_entry *e,bool flush) -{ - struct mt76x02_dev *dev = container_of(mdev, struct mt76x02_dev, mt76); - -if (e->txwi) -mt76x2_mac_queue_txdone (dev, e->skb, &e->txwi->txwi); -else -dev_kfree_skb_any (e->skb); -} -static int mt76_write_beacon (struct mt76x02_dev *dev,int offset,struct sk_buff *skb) {
drivers/net/wireless/mediatek/mt76/mt76x2/trace.h +0 -22
@@ -34,28 +34,6 @@#define TXID_PR_FMT " [%d:%d]"#define TXID_PR_ARG __entry->wcid, __entry->pktid -DECLARE_EVENT_CLASS (dev_txid_evt, - TP_PROTO(struct mt76x02_dev *dev, u8 wcid, u8 pktid), -TP_ARGS (dev, wcid, pktid), -TP_STRUCT__entry ( - DEV_ENTRY -TXID_ENTRY - ), -TP_fast_assign ( - DEV_ASSIGN; - TXID_ASSIGN; - ), -TP_printk ( - DEV_PR_FMT TXID_PR_FMT, -DEV_PR_ARG ,TXID_PR_ARG - ) -); - -DEFINE_EVENT (dev_txid_evt, mac_txdone_add, - TP_PROTO(struct mt76x02_dev *dev, u8 wcid, u8 pktid), -TP_ARGS (dev, wcid, pktid) -); - TRACE_EVENT(dev_irq, TP_PROTO(struct mt76x02_dev *dev, u32 val, u32 mask),
Signature · 1 line
2.17.1
PATCH 6/8 mt76: use mt76x02_dev instead of mt76_dev in mt76x02_mmio.c
In reply to Lorenzo BianconiUse mt76x02_dev data structure as reference in mt76x02_mmio.c instead of mt76_dev
--- drivers/net/wireless/mediatek/mt76/mt76.h | 4 +- .../net/wireless/mediatek/mt76/mt76x0/pci.c | 6 +- drivers/net/wireless/mediatek/mt76/mt76x02.h | 8 +-- .../net/wireless/mediatek/mt76/mt76x02_dma.h | 7 +- .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 70 +++++++++---------- .../wireless/mediatek/mt76/mt76x2/pci_core.c | 13 ++-- .../wireless/mediatek/mt76/mt76x2/pci_dfs.c | 6 +- .../wireless/mediatek/mt76/mt76x2/pci_dma.c | 2 +- .../wireless/mediatek/mt76/mt76x2/pci_init.c | 6 +- .../wireless/mediatek/mt76/mt76x2/pci_mac.c | 4 +- 10 files changed, 64 insertions(+), 62 deletions(-)
drivers/net/wireless/mediatek/mt76/mt76.h +2 -2
@@ -517,8 +517,8 @@ static inline u16 mt76_rev(struct mt76_dev *dev)#define mt76xx_chip (dev) mt76_chip(&((dev)->mt76))#define mt76xx_rev (dev) mt76_rev(&((dev)->mt76)) -#define __mt76_init_queues (dev) (dev)->queue_ops->init((dev)) -#define __mt76_queue_alloc (dev, ...) (dev)->queue_ops->alloc((dev), __VA_ARGS__) +#define mt76_init_queues (dev) (dev)->mt76.queue_ops->init(&((dev)->mt76)) +#define mt76_queue_alloc (dev, ...) (dev)->mt76.queue_ops->alloc(&((dev)->mt76), __VA_ARGS__)#define mt76_queue_add_buf (dev, ...) (dev)->mt76.queue_ops->add_buf(&((dev)->mt76), __VA_ARGS__)#define mt76_queue_rx_reset (dev, ...) (dev)->mt76.queue_ops->rx_reset(&((dev)->mt76), __VA_ARGS__)#define mt76_queue_tx_cleanup (dev, ...) (dev)->mt76.queue_ops->tx_cleanup(&((dev)->mt76), __VA_ARGS__)
drivers/net/wireless/mediatek/mt76/mt76x0/pci.c +3 -3
@@ -27,7 +27,7 @@ static int mt76x0e_start(struct ieee80211_hw *hw)mutex_lock (&dev->mt76.mutex); -mt76x02_mac_start (&dev->mt76); +mt76x02_mac_start (dev);ieee80211_queue_delayed_work (dev->mt76.hw, &dev->mac_work,MT_CALIBRATE_INTERVAL ); ieee80211_queue_delayed_work(dev->mt76.hw, &dev->cal_work,
@@ -85,12 +85,12 @@ static int mt76x0e_register_device(struct mt76x02_dev *dev)if (!mt76x02_wait_for_mac (&dev->mt76))return -ETIMEDOUT ; -mt76x02_dma_disable (&dev->mt76); +mt76x02_dma_disable (dev); err =mt76x0e_mcu_init (dev);if (err <0 )return err; - err =mt76x02_dma_init (&dev->mt76); + err =mt76x02_dma_init (dev);if (err <0 )return err;
drivers/net/wireless/mediatek/mt76/mt76x02.h +4 -4
@@ -155,15 +155,15 @@ int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi,extern const u16 mt76x02_beacon_offsets[16 ];void mt76x02_set_beacon_offsets (struct mt76_dev *dev); -void mt76x02_set_irq_mask (struct mt76_dev *dev,u32 clear,u32 set); -void mt76x02_mac_start (struct mt76_dev *dev); +void mt76x02_set_irq_mask (struct mt76x02_dev *dev,u32 clear,u32 set); +void mt76x02_mac_start (struct mt76x02_dev *dev); -static inline void mt76x02_irq_enable (struct mt76_dev *dev,u32 mask) +static inline void mt76x02_irq_enable (struct mt76x02_dev *dev,u32 mask) {mt76x02_set_irq_mask (dev,0 , mask); } -static inline void mt76x02_irq_disable (struct mt76_dev *dev,u32 mask) +static inline void mt76x02_irq_disable (struct mt76x02_dev *dev,u32 mask) {mt76x02_set_irq_mask (dev, mask,0 ); }
drivers/net/wireless/mediatek/mt76/mt76x02_dma.h +3 -4
@@ -17,8 +17,8 @@#ifndef __MT76x02_DMA_H#define __MT76x02_DMA_H +#include "mt76x02.h" #include "dma.h" -#include "mt76x02_regs.h" #define MT_TXD_INFO_LEN GENMASK(15, 0)#define MT_TXD_INFO_NEXT_VLD BIT(16)
@@ -70,8 +70,7 @@ mt76x02_wait_for_wpdma(struct mt76_dev *dev, int timeout) 0, timeout); } -int mt76x02_dma_init (struct mt76_dev *dev); -void mt76x02_dma_enable (struct mt76_dev *dev); -void mt76x02_dma_disable (struct mt76_dev *dev); +int mt76x02_dma_init (struct mt76x02_dev *dev); +void mt76x02_dma_disable (struct mt76x02_dev *dev);#endif /* __MT76x02_DMA_H */
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +35 -35
165 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x2/pci_core.c +8 -5
@@ -20,7 +20,10 @@void mt76x2_rx_poll_complete (struct mt76_dev *mdev,enum mt76_rxq_id q) { -mt76x02_irq_enable (mdev,MT_INT_RX_DONE (q)); +struct mt76x02_dev *dev; + + dev = container_of(mdev, struct mt76x02_dev, mt76); +mt76x02_irq_enable (dev,MT_INT_RX_DONE (q)); }irqreturn_t mt76x2_irq_handler (int irq,void *dev_instance)
@@ -39,17 +42,17 @@ irqreturn_t mt76x2_irq_handler(int irq, void *dev_instance) intr &= dev->mt76.mmio.irqmask;if (intr &MT_INT_TX_DONE_ALL ) { -mt76x02_irq_disable (&dev->mt76,MT_INT_TX_DONE_ALL ); +mt76x02_irq_disable (dev,MT_INT_TX_DONE_ALL );tasklet_schedule (&dev->tx_tasklet); }if (intr &MT_INT_RX_DONE (0 )) { -mt76x02_irq_disable (&dev->mt76,MT_INT_RX_DONE (0 )); +mt76x02_irq_disable (dev,MT_INT_RX_DONE (0 ));napi_schedule (&dev->mt76.napi[0 ]); }if (intr &MT_INT_RX_DONE (1 )) { -mt76x02_irq_disable (&dev->mt76,MT_INT_RX_DONE (1 )); +mt76x02_irq_disable (dev,MT_INT_RX_DONE (1 ));napi_schedule (&dev->mt76.napi[1 ]); }
@@ -66,7 +69,7 @@ irqreturn_t mt76x2_irq_handler(int irq, void *dev_instance) }if (intr &MT_INT_GPTIMER ) { -mt76x02_irq_disable (&dev->mt76,MT_INT_GPTIMER ); +mt76x02_irq_disable (dev,MT_INT_GPTIMER );tasklet_schedule (&dev->dfs_pd.dfs_tasklet); }
drivers/net/wireless/mediatek/mt76/mt76x2/pci_dfs.c +3 -3
@@ -679,7 +679,7 @@ static void mt76x2_dfs_tasklet(unsigned long arg)mt76_wr (dev,MT_BBP (DFS ,1 ),0xf ); out: -mt76x02_irq_enable (&dev->mt76,MT_INT_GPTIMER ); +mt76x02_irq_enable (dev,MT_INT_GPTIMER ); }static void mt76x2_dfs_init_sw_detector (struct mt76x02_dev *dev)
@@ -835,7 +835,7 @@ void mt76x2_dfs_init_params(struct mt76x02_dev *dev)/* enable debug mode */ mt76x2_dfs_set_capture_mode_ctrl (dev, true); -mt76x02_irq_enable (&dev->mt76,MT_INT_GPTIMER ); +mt76x02_irq_enable (dev,MT_INT_GPTIMER );mt76_rmw_field (dev,MT_INT_TIMER_EN ,MT_INT_TIMER_EN_GP_TIMER_EN ,1 ); }else {
@@ -845,7 +845,7 @@ void mt76x2_dfs_init_params(struct mt76x02_dev *dev)mt76_wr (dev,MT_BBP (DFS ,1 ),0xf );mt76_wr (dev,0x212c ,0 ); -mt76x02_irq_disable (&dev->mt76,MT_INT_GPTIMER ); +mt76x02_irq_disable (dev,MT_INT_GPTIMER );mt76_rmw_field (dev,MT_INT_TIMER_EN ,MT_INT_TIMER_EN_GP_TIMER_EN ,0 ); }
drivers/net/wireless/mediatek/mt76/mt76x2/pci_dma.c +1 -1
@@ -27,7 +27,7 @@ void mt76x2_tx_tasklet(unsigned long data)mt76_queue_tx_cleanup (dev, i, false);mt76x02_mac_poll_tx_status (dev, false); -mt76x02_irq_enable (&dev->mt76,MT_INT_TX_DONE_ALL ); +mt76x02_irq_enable (dev,MT_INT_TX_DONE_ALL ); }void mt76x2_dma_cleanup (struct mt76x02_dev *dev)
drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c +3 -3
@@ -186,7 +186,7 @@ int mt76x2_mac_start(struct mt76x02_dev *dev)mt76_rr (dev,MT_TX_STAT_FIFO );memset (dev->aggr_stats,0 ,sizeof (dev->aggr_stats)); -mt76x02_mac_start (&dev->mt76); +mt76x02_mac_start (dev);return 0 ; }
@@ -301,7 +301,7 @@ int mt76x2_init_hardware(struct mt76x02_dev *dev)tasklet_init (&dev->pre_tbtt_tasklet, mt76x2_pre_tbtt_tasklet, (unsigned long ) dev); -mt76x02_dma_disable (&dev->mt76); +mt76x02_dma_disable (dev);mt76x2_reset_wlan (dev, true);mt76x2_power_on (dev);
@@ -315,7 +315,7 @@ int mt76x2_init_hardware(struct mt76x02_dev *dev) dev->mt76.rxfilter =mt76_rr (dev,MT_RX_FILTR_CFG ); - ret =mt76x02_dma_init (&dev->mt76); + ret =mt76x02_dma_init (dev);if (ret)return ret;
drivers/net/wireless/mediatek/mt76/mt76x2/pci_mac.c +2 -2
@@ -142,9 +142,9 @@ void mt76x2_mac_set_beacon_enable(struct mt76x02_dev *dev,mt76_rmw (dev,MT_BEACON_TIME_CFG , reg, reg * en);if (en) -mt76x02_irq_enable (&dev->mt76,MT_INT_PRE_TBTT |MT_INT_TBTT ); +mt76x02_irq_enable (dev,MT_INT_PRE_TBTT |MT_INT_TBTT );else -mt76x02_irq_disable (&dev->mt76,MT_INT_PRE_TBTT |MT_INT_TBTT ); +mt76x02_irq_disable (dev,MT_INT_PRE_TBTT |MT_INT_TBTT ); }void mt76x2_update_channel (struct mt76_dev *mdev)
Signature · 1 line
2.17.1
PATCH 7/8 mt76: move tx_tasklet management in mt76x02-lib moudle
In reply to Lorenzo BianconiMove tx_tasklet management in mt76x02_mmio.c in order to be reused by mt76x0 driver and remove duplicated code
--- .../net/wireless/mediatek/mt76/mt76x0/pci.c | 2 +- .../net/wireless/mediatek/mt76/mt76x02_dma.h | 1 + .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 42 ++++++++++++++++++- .../wireless/mediatek/mt76/mt76x2/Makefile | 2 +- .../net/wireless/mediatek/mt76/mt76x2/mac.h | 2 - .../wireless/mediatek/mt76/mt76x2/mt76x2.h | 3 -- .../wireless/mediatek/mt76/mt76x2/pci_dma.c | 37 ---------------- .../wireless/mediatek/mt76/mt76x2/pci_init.c | 11 +---- .../wireless/mediatek/mt76/mt76x2/pci_mac.c | 9 ---- 9 files changed, 45 insertions(+), 64 deletions(-) delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2/pci_dma.c
drivers/net/wireless/mediatek/mt76/mt76x0/pci.c +1 -1
@@ -166,7 +166,7 @@ static void mt76x0e_cleanup(struct mt76x02_dev *dev)clear_bit (MT76_STATE_INITIALIZED , &dev->mt76.state);mt76x0_chip_onoff (dev, false, false);mt76x0e_stop_hw (dev); -mt76_dma_cleanup (&dev->mt76); +mt76x02_dma_cleanup (dev);mt76x02_mcu_cleanup (&dev->mt76); }
drivers/net/wireless/mediatek/mt76/mt76x02_dma.h +1 -0
@@ -72,5 +72,6 @@ mt76x02_wait_for_wpdma(struct mt76_dev *dev, int timeout)int mt76x02_dma_init (struct mt76x02_dev *dev);void mt76x02_dma_disable (struct mt76x02_dev *dev); +void mt76x02_dma_cleanup (struct mt76x02_dev *dev);#endif /* __MT76x02_DMA_H */
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +41 -1
63 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x2/Makefile +1 -1
@@ -6,7 +6,7 @@ mt76x2-common-y := \ eeprom.o mac.o init.o phy.o debugfs.o mcu.o mt76x2e-y := \ - pci.o pci_dma.o pci_main.o pci_init.o pci_tx.o \ + pci.o pci_main.o pci_init.o pci_tx.o \ pci_core.o pci_mac.o pci_mcu.o pci_phy.o \ pci_dfs.o pci_trace.o
drivers/net/wireless/mediatek/mt76/mt76x2/mac.h +0 -2
@@ -32,8 +32,6 @@ int mt76x2_mac_set_beacon(struct mt76x02_dev *dev, u8 vif_idx, struct sk_buff *skb);void mt76x2_mac_set_beacon_enable (struct mt76x02_dev *dev,u8 vif_idx,bool val); -void mt76x2_mac_process_tx_status_fifo (struct mt76x02_dev *dev); -void mt76x2_mac_work (struct work_struct *work);#endif
drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h +0 -3
@@ -81,9 +81,6 @@ int mt76x2_mcu_set_channel(struct mt76x02_dev *dev, u8 channel, u8 bw,int mt76x2_mcu_load_cr (struct mt76x02_dev *dev,u8 type,u8 temp_level,u8 channel); -void mt76x2_tx_tasklet (unsigned long data); -void mt76x2_dma_cleanup (struct mt76x02_dev *dev); -void mt76x2_cleanup (struct mt76x02_dev *dev);void mt76x2_mac_set_tx_protection (struct mt76x02_dev *dev,u32 val);
drivers/net/wireless/mediatek/mt76/mt76x2/pci_dma.c deleted +0 -37
@@ -1,37 +0,0 @@ -/* -* Copyright (C) 2016 Felix Fietkau <[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 "mt76x2.h" - -void mt76x2_tx_tasklet (unsigned long data) -{ -struct mt76x02_dev *dev = (struct mt76x02_dev *) data; -int i; - -mt76x2_mac_process_tx_status_fifo (dev); - -for (i =MT_TXQ_MCU ; i >=0 ; i--) -mt76_queue_tx_cleanup (dev, i, false); - -mt76x02_mac_poll_tx_status (dev, false); -mt76x02_irq_enable (dev,MT_INT_TX_DONE_ALL ); -} - -void mt76x2_dma_cleanup (struct mt76x02_dev *dev) -{ -tasklet_kill (&dev->tx_tasklet); -mt76_dma_cleanup (&dev->mt76); -}
drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c +1 -10
@@ -346,7 +346,7 @@ void mt76x2_cleanup(struct mt76x02_dev *dev)tasklet_disable (&dev->dfs_pd.dfs_tasklet);tasklet_disable (&dev->pre_tbtt_tasklet);mt76x2_stop_hardware (dev); -mt76x2_dma_cleanup (dev); +mt76x02_dma_cleanup (dev);mt76x02_mcu_cleanup (&dev->mt76); }
@@ -464,17 +464,8 @@ int mt76x2_register_device(struct mt76x02_dev *dev) {struct ieee80211_hw *hw =mt76_hw (dev);struct wiphy *wiphy = hw->wiphy; -void *status_fifo; -int fifo_size;int i, ret; - fifo_size =roundup_pow_of_two (32 *sizeof (struct mt76x02_tx_status )); - status_fifo =devm_kzalloc (dev->mt76.dev, fifo_size,GFP_KERNEL ); -if (!status_fifo) -return -ENOMEM ; - -tasklet_init (&dev->tx_tasklet, mt76x2_tx_tasklet, (unsigned long )dev); -kfifo_init (&dev->txstatus_fifo, status_fifo, fifo_size);INIT_DELAYED_WORK (&dev->cal_work, mt76x2_phy_calibrate);INIT_DELAYED_WORK (&dev->mac_work, mt76x2_mac_work);
drivers/net/wireless/mediatek/mt76/mt76x2/pci_mac.c +0 -9
@@ -28,15 +28,6 @@ void mt76x2_mac_set_bssid(struct mt76x02_dev *dev, u8 idx, const u8 *addr) get_unaligned_le16(addr + 4)); } -void mt76x2_mac_process_tx_status_fifo (struct mt76x02_dev *dev) -{ -struct mt76x02_tx_status stat; -u8 update =1 ; - -while (kfifo_get (&dev->txstatus_fifo, &stat)) -mt76x02_send_tx_status (&dev->mt76, &stat, &update); -} -static int mt76_write_beacon (struct mt76x02_dev *dev,int offset,struct sk_buff *skb) {
Signature · 1 line
2.17.1
PATCH 8/8 mt76: move irq handler in mt76x02-lib moudle
In reply to Lorenzo BianconiMove mt76x02_irq_handler handler in mt76x02_mmio.c in order to be reused in mt76x0 driver. Move mt76x02_rx_poll_complete routine in mt76x02-lib module. Moreover remove pci_core.c and mt76x2/trace.{c,h} since are empty files
--- drivers/net/wireless/mediatek/mt76/mt76x02.h | 2 + .../net/wireless/mediatek/mt76/mt76x02_mmio.c | 62 +++++++++++++++ .../wireless/mediatek/mt76/mt76x02_trace.h | 23 ++++++ .../wireless/mediatek/mt76/mt76x2/Makefile | 3 +- .../wireless/mediatek/mt76/mt76x2/mt76x2.h | 3 - .../net/wireless/mediatek/mt76/mt76x2/pci.c | 3 +- .../wireless/mediatek/mt76/mt76x2/pci_core.c | 78 ------------------- .../wireless/mediatek/mt76/mt76x2/pci_init.c | 2 +- .../wireless/mediatek/mt76/mt76x2/pci_mac.c | 1 - .../wireless/mediatek/mt76/mt76x2/pci_trace.c | 23 ------ .../net/wireless/mediatek/mt76/mt76x2/trace.h | 67 ---------------- 11 files changed, 90 insertions(+), 177 deletions(-) delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2/pci_core.c delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2/pci_trace.c delete mode 100644 drivers/net/wireless/mediatek/mt76/mt76x2/trace.h
drivers/net/wireless/mediatek/mt76/mt76x02.h +2 -0
@@ -146,6 +146,8 @@ void mt76x02_tx_complete(struct mt76_dev *dev, struct sk_buff *skb);bool mt76x02_tx_status_data (struct mt76_dev *dev,u8 *update);void mt76x02_queue_rx_skb (struct mt76_dev *mdev,enum mt76_rxq_id q,struct sk_buff *skb); +void mt76x02_rx_poll_complete (struct mt76_dev *mdev,enum mt76_rxq_id q); +irqreturn_t mt76x02_irq_handler (int irq,void *dev_instance);void mt76x02_tx (struct ieee80211_hw *hw,struct ieee80211_tx_control *control,struct sk_buff *skb); int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi,
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c +62 -0
76 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x02_trace.h +23 -0
@@ -110,6 +110,29 @@ TRACE_EVENT(mac_txstat_fetch, ) ); +TRACE_EVENT (dev_irq, + TP_PROTO(struct mt76x02_dev *dev, u32 val, u32 mask), + +TP_ARGS (dev, val, mask), + +TP_STRUCT__entry ( + DEV_ENTRY + __field(u32, val) +__field (u32, mask) + ), + +TP_fast_assign ( + DEV_ASSIGN; + __entry->val = val; + __entry->mask = mask; + ), + +TP_printk ( +DEV_PR_FMT " %08x & %08x" , +DEV_PR_ARG , __entry->val, __entry->mask + ) +); +#endif #undef TRACE_INCLUDE_PATH
drivers/net/wireless/mediatek/mt76/mt76x2/Makefile +1 -2
@@ -7,8 +7,7 @@ mt76x2-common-y := \ mt76x2e-y := \ pci.o pci_main.o pci_init.o pci_tx.o \ - pci_core.o pci_mac.o pci_mcu.o pci_phy.o \ - pci_dfs.o pci_trace.o + pci_mac.o pci_mcu.o pci_phy.o pci_dfs.o mt76x2u-y := \ usb.o usb_init.o usb_main.o usb_mac.o usb_mcu.o \
drivers/net/wireless/mediatek/mt76/mt76x2/mt76x2.h +0 -3
@@ -60,7 +60,6 @@ int mt76x2_register_device(struct mt76x02_dev *dev);void mt76x2_init_debugfs (struct mt76x02_dev *dev);void mt76x2_init_device (struct mt76x02_dev *dev); -irqreturn_t mt76x2_irq_handler (int irq,void *dev_instance);void mt76x2_phy_power_on (struct mt76x02_dev *dev);int mt76x2_init_hardware (struct mt76x02_dev *dev);void mt76x2_stop_hardware (struct mt76x02_dev *dev);
@@ -87,8 +86,6 @@ void mt76x2_mac_set_tx_protection(struct mt76x02_dev *dev, u32 val);void mt76x2_pre_tbtt_tasklet (unsigned long arg); -void mt76x2_rx_poll_complete (struct mt76_dev *mdev,enum mt76_rxq_id q); -void mt76x2_sta_ps (struct mt76_dev *dev,struct ieee80211_sta *sta,bool ps);void mt76x2_update_channel (struct mt76_dev *mdev);
drivers/net/wireless/mediatek/mt76/mt76x2/pci.c +1 -2
@@ -19,7 +19,6 @@#include <linux/pci.h> #include "mt76x2.h" -#include "trace.h" static const struct pci_device_id mt76pci_device_table[] = { {PCI_DEVICE (0x14c3 ,0x7662 ) },
@@ -58,7 +57,7 @@ mt76pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) dev->mt76.rev =mt76_rr (dev,MT_ASIC_VERSION );dev_info (dev->mt76.dev,"ASIC revision: %08x\n" , dev->mt76.rev); - ret =devm_request_irq (dev->mt76.dev, pdev->irq, mt76x2_irq_handler, + ret =devm_request_irq (dev->mt76.dev, pdev->irq, mt76x02_irq_handler,IRQF_SHARED ,KBUILD_MODNAME , dev);if (ret) goto error;
drivers/net/wireless/mediatek/mt76/mt76x2/pci_core.c deleted +0 -78
78 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt76x2/pci_init.c +1 -1
@@ -358,7 +358,7 @@ struct mt76x02_dev *mt76x2_alloc_device(struct device *pdev) .tx_prepare_skb = mt76x02_tx_prepare_skb, .tx_complete_skb = mt76x02_tx_complete_skb, .rx_skb = mt76x02_queue_rx_skb, - .rx_poll_complete = mt76x2_rx_poll_complete, + .rx_poll_complete = mt76x02_rx_poll_complete, .sta_ps = mt76x2_sta_ps, };struct mt76x02_dev *dev;
drivers/net/wireless/mediatek/mt76/mt76x2/pci_mac.c +0 -1
@@ -18,7 +18,6 @@#include "mt76x2.h" #include "mcu.h" #include "eeprom.h" -#include "trace.h" void mt76x2_mac_set_bssid (struct mt76x02_dev *dev,u8 idx,const u8 *addr) {
drivers/net/wireless/mediatek/mt76/mt76x2/pci_trace.c deleted +0 -23
@@ -1,23 +0,0 @@ -/* -* Copyright (C) 2016 Felix Fietkau <[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 <linux/module.h> - -#ifndef __CHECKER__ -#define CREATE_TRACE_POINTS -#include "trace.h" - -#endif
drivers/net/wireless/mediatek/mt76/mt76x2/trace.h deleted +0 -67
67 lines not on this page · raw message
Signature · 1 line
2.17.1
Quoted 3 lines · Lorenzo Bianconi
Move
mt76x02_irq_handlerirq handler in mt76x02-lib module in order to unify rx datapath between mt76x0 and mt76x2 drivers and remove duplicated code
Merged, thanks.
- Felix