| Message ID | f0d66c706432282ca97156f2d0c514d7c260ec09.1631667941.git.objelf@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | Add MT7921 SDIO support | expand |
> From: Sean Wang <sean.wang@mediatek.com> > > This is a preliminary patch to introduce mt7921s support. > > Split out a new pci_mac.c from mac.c to make mac.c reusable between > mt7921s and mt7921e. Hi Sean, mostly fine, just few nitpicks inline. Regards, Lorenzo > > Tested-by: Deren Wu <deren.wu@mediatek.com> > Signed-off-by: Sean Wang <sean.wang@mediatek.com> > --- > .../wireless/mediatek/mt76/mt7921/Makefile | 2 +- > .../net/wireless/mediatek/mt76/mt7921/mac.c | 331 +---------------- > .../wireless/mediatek/mt76/mt7921/mt7921.h | 25 +- > .../net/wireless/mediatek/mt76/mt7921/pci.c | 12 +- > .../wireless/mediatek/mt76/mt7921/pci_mac.c | 345 ++++++++++++++++++ > 5 files changed, 379 insertions(+), 336 deletions(-) > create mode 100644 drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/Makefile b/drivers/net/wireless/mediatek/mt76/mt7921/Makefile > index 3471d82fc265..554202358470 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/Makefile > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/Makefile > @@ -4,5 +4,5 @@ obj-$(CONFIG_MT7921E) += mt7921e.o > > CFLAGS_trace.o := -I$(src) > > -mt7921e-y := pci.o mac.o mcu.o dma.o eeprom.o main.o init.o debugfs.o trace.o > +mt7921e-y := pci.o pci_mac.o mac.o mcu.o dma.o eeprom.o main.o init.o debugfs.o trace.o > mt7921e-$(CONFIG_NL80211_TESTMODE) += testmode.o > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c > index 27f13228c5a7..d811702a3a2c 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c > @@ -49,7 +49,7 @@ bool mt7921_mac_wtbl_update(struct mt7921_dev *dev, int idx, u32 mask) > 0, 5000); > } > > -static void mt7921_mac_sta_poll(struct mt7921_dev *dev) > +void mt7921_mac_sta_poll(struct mt7921_dev *dev) > { > static const u8 ac_to_tid[] = { > [IEEE80211_AC_BE] = 0, > @@ -836,7 +836,7 @@ mt7921_mac_write_txwi_80211(struct mt7921_dev *dev, __le32 *txwi, > txwi[7] |= cpu_to_le32(val); > } > > -static void > +void can you please remove new line here? > mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi, > struct sk_buff *skb, struct mt76_wcid *wcid, > struct ieee80211_key_conf *key, int pid, > @@ -922,86 +922,7 @@ mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi, > } > } > > -static void > -mt7921_write_hw_txp(struct mt7921_dev *dev, struct mt76_tx_info *tx_info, > - void *txp_ptr, u32 id) > -{ > - struct mt7921_hw_txp *txp = txp_ptr; > - struct mt7921_txp_ptr *ptr = &txp->ptr[0]; > - int i, nbuf = tx_info->nbuf - 1; > - > - tx_info->buf[0].len = MT_TXD_SIZE + sizeof(*txp); > - tx_info->nbuf = 1; > - > - txp->msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID); > - > - for (i = 0; i < nbuf; i++) { > - u16 len = tx_info->buf[i + 1].len & MT_TXD_LEN_MASK; > - u32 addr = tx_info->buf[i + 1].addr; > - > - if (i == nbuf - 1) > - len |= MT_TXD_LEN_LAST; > - > - if (i & 1) { > - ptr->buf1 = cpu_to_le32(addr); > - ptr->len1 = cpu_to_le16(len); > - ptr++; > - } else { > - ptr->buf0 = cpu_to_le32(addr); > - ptr->len0 = cpu_to_le16(len); > - } > - } > -} > - > -int mt7921_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, > - enum mt76_txq_id qid, struct mt76_wcid *wcid, > - struct ieee80211_sta *sta, > - struct mt76_tx_info *tx_info) > -{ > - struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76); > - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info->skb); > - struct ieee80211_key_conf *key = info->control.hw_key; > - struct mt76_txwi_cache *t; > - struct mt7921_txp_common *txp; > - int id, pid; > - u8 *txwi = (u8 *)txwi_ptr; > - > - if (unlikely(tx_info->skb->len <= ETH_HLEN)) > - return -EINVAL; > - > - if (!wcid) > - wcid = &dev->mt76.global_wcid; > - > - t = (struct mt76_txwi_cache *)(txwi + mdev->drv->txwi_size); > - t->skb = tx_info->skb; > - > - id = mt76_token_consume(mdev, &t); > - if (id < 0) > - return id; > - > - if (sta) { > - struct mt7921_sta *msta = (struct mt7921_sta *)sta->drv_priv; > - > - if (time_after(jiffies, msta->last_txs + HZ / 4)) { > - info->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS; > - msta->last_txs = jiffies; > - } > - } > - > - pid = mt76_tx_status_skb_add(mdev, wcid, tx_info->skb); > - mt7921_mac_write_txwi(dev, txwi_ptr, tx_info->skb, wcid, key, > - pid, false); > - > - txp = (struct mt7921_txp_common *)(txwi + MT_TXD_SIZE); > - memset(txp, 0, sizeof(struct mt7921_txp_common)); > - mt7921_write_hw_txp(dev, tx_info, txp, id); > - > - tx_info->skb = DMA_DUMMY_DATA; > - > - return 0; > -} > - > -static void > +void can you please remove new line here? > mt7921_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi) > { > struct mt7921_sta *msta; > @@ -1026,143 +947,6 @@ mt7921_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi) > ieee80211_start_tx_ba_session(sta, tid, 0); > } > > -static void > -mt7921_txp_skb_unmap(struct mt76_dev *dev, struct mt76_txwi_cache *t) > -{ > - struct mt7921_txp_common *txp; > - int i; > - > - txp = mt7921_txwi_to_txp(dev, t); > - > - for (i = 0; i < ARRAY_SIZE(txp->hw.ptr); i++) { > - struct mt7921_txp_ptr *ptr = &txp->hw.ptr[i]; > - bool last; > - u16 len; > - > - len = le16_to_cpu(ptr->len0); > - last = len & MT_TXD_LEN_LAST; > - len &= MT_TXD_LEN_MASK; > - dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf0), len, > - DMA_TO_DEVICE); > - if (last) > - break; > - > - len = le16_to_cpu(ptr->len1); > - last = len & MT_TXD_LEN_LAST; > - len &= MT_TXD_LEN_MASK; > - dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf1), len, > - DMA_TO_DEVICE); > - if (last) > - break; > - } > -} > - > -static void > -mt7921_txwi_free(struct mt7921_dev *dev, struct mt76_txwi_cache *t, > - struct ieee80211_sta *sta, bool clear_status, > - struct list_head *free_list) > -{ > - struct mt76_dev *mdev = &dev->mt76; > - __le32 *txwi; > - u16 wcid_idx; > - > - mt7921_txp_skb_unmap(mdev, t); > - if (!t->skb) > - goto out; > - > - txwi = (__le32 *)mt76_get_txwi_ptr(mdev, t); > - if (sta) { > - struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv; > - > - if (likely(t->skb->protocol != cpu_to_be16(ETH_P_PAE))) > - mt7921_tx_check_aggr(sta, txwi); > - > - wcid_idx = wcid->idx; > - } else { > - wcid_idx = FIELD_GET(MT_TXD1_WLAN_IDX, le32_to_cpu(txwi[1])); > - } > - > - __mt76_tx_complete_skb(mdev, wcid_idx, t->skb, free_list); > - > -out: > - t->skb = NULL; > - mt76_put_txwi(mdev, t); > -} > - > -static void > -mt7921_mac_tx_free(struct mt7921_dev *dev, struct sk_buff *skb) > -{ > - struct mt7921_tx_free *free = (struct mt7921_tx_free *)skb->data; > - struct mt76_dev *mdev = &dev->mt76; > - struct mt76_txwi_cache *txwi; > - struct ieee80211_sta *sta = NULL; > - LIST_HEAD(free_list); > - struct sk_buff *tmp; > - bool wake = false; > - u8 i, count; > - > - /* clean DMA queues and unmap buffers first */ > - mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_PSD], false); > - mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_BE], false); > - > - /* TODO: MT_TX_FREE_LATENCY is msdu time from the TXD is queued into PLE, > - * to the time ack is received or dropped by hw (air + hw queue time). > - * Should avoid accessing WTBL to get Tx airtime, and use it instead. > - */ > - count = FIELD_GET(MT_TX_FREE_MSDU_CNT, le16_to_cpu(free->ctrl)); > - for (i = 0; i < count; i++) { > - u32 msdu, info = le32_to_cpu(free->info[i]); > - u8 stat; > - > - /* 1'b1: new wcid pair. > - * 1'b0: msdu_id with the same 'wcid pair' as above. > - */ > - if (info & MT_TX_FREE_PAIR) { > - struct mt7921_sta *msta; > - struct mt7921_phy *phy; > - struct mt76_wcid *wcid; > - u16 idx; > - > - count++; > - idx = FIELD_GET(MT_TX_FREE_WLAN_ID, info); > - wcid = rcu_dereference(dev->mt76.wcid[idx]); > - sta = wcid_to_sta(wcid); > - if (!sta) > - continue; > - > - msta = container_of(wcid, struct mt7921_sta, wcid); > - phy = msta->vif->phy; > - spin_lock_bh(&dev->sta_poll_lock); > - if (list_empty(&msta->poll_list)) > - list_add_tail(&msta->poll_list, &dev->sta_poll_list); > - spin_unlock_bh(&dev->sta_poll_lock); > - continue; > - } > - > - msdu = FIELD_GET(MT_TX_FREE_MSDU_ID, info); > - stat = FIELD_GET(MT_TX_FREE_STATUS, info); > - > - txwi = mt76_token_release(mdev, msdu, &wake); > - if (!txwi) > - continue; > - > - mt7921_txwi_free(dev, txwi, sta, stat, &free_list); > - } > - > - if (wake) > - mt76_set_tx_blocked(&dev->mt76, false); > - > - napi_consume_skb(skb, 1); > - > - list_for_each_entry_safe(skb, tmp, &free_list, list) { > - skb_list_del_init(skb); > - napi_consume_skb(skb, 1); > - } > - > - mt7921_mac_sta_poll(dev); > - mt76_worker_schedule(&dev->mt76.tx_worker); > -} > - > static bool > mt7921_mac_add_txs_skb(struct mt7921_dev *dev, struct mt76_wcid *wcid, int pid, > __le32 *txs_data) > @@ -1330,9 +1114,6 @@ void mt7921_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, > type = PKT_TYPE_NORMAL_MCU; > > switch (type) { > - case PKT_TYPE_TXRX_NOTIFY: > - mt7921_mac_tx_free(dev, skb); > - break; > case PKT_TYPE_RX_EVENT: > mt7921_mcu_rx_event(dev, skb); > break; > @@ -1354,33 +1135,6 @@ void mt7921_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, > } > } > > -void mt7921_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e) > -{ > - struct mt7921_dev *dev; > - > - if (!e->txwi) { > - dev_kfree_skb_any(e->skb); > - return; > - } > - > - dev = container_of(mdev, struct mt7921_dev, mt76); > - > - /* error path */ > - if (e->skb == DMA_DUMMY_DATA) { > - struct mt76_txwi_cache *t; > - struct mt7921_txp_common *txp; > - u16 token; > - > - txp = mt7921_txwi_to_txp(mdev, e->txwi); > - token = le16_to_cpu(txp->hw.msdu_id[0]) & ~MT_MSDU_ID_VALID; > - t = mt76_token_put(mdev, token); > - e->skb = t ? t->skb : NULL; > - } > - > - if (e->skb) > - mt76_tx_complete_skb(mdev, e->wcid, e->skb); > -} > - > void mt7921_mac_reset_counters(struct mt7921_phy *phy) > { > struct mt7921_dev *dev = phy->dev; > @@ -1496,20 +1250,6 @@ void mt7921_update_channel(struct mt76_phy *mphy) > mt76_connac_power_save_sched(mphy, &dev->pm); > } > > -void mt7921_tx_token_put(struct mt7921_dev *dev) > -{ > - struct mt76_txwi_cache *txwi; > - int id; > - > - spin_lock_bh(&dev->mt76.token_lock); > - idr_for_each_entry(&dev->mt76.token, txwi, id) { > - mt7921_txwi_free(dev, txwi, NULL, false, NULL); > - dev->mt76.token_count--; > - } > - spin_unlock_bh(&dev->mt76.token_lock); > - idr_destroy(&dev->mt76.token); > -} > - > static void > mt7921_vif_connect_iter(void *priv, u8 *mac, > struct ieee80211_vif *vif) > @@ -1524,69 +1264,6 @@ mt7921_vif_connect_iter(void *priv, u8 *mac, > mt7921_mcu_set_tx(dev, vif); > } > > -static int > -mt7921_mac_reset(struct mt7921_dev *dev) > -{ > - int i, err; > - > - mt76_connac_free_pending_tx_skbs(&dev->pm, NULL); > - > - mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0); > - mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0); > - > - set_bit(MT76_RESET, &dev->mphy.state); > - set_bit(MT76_MCU_RESET, &dev->mphy.state); > - wake_up(&dev->mt76.mcu.wait); > - skb_queue_purge(&dev->mt76.mcu.res_q); > - > - mt76_txq_schedule_all(&dev->mphy); > - > - mt76_worker_disable(&dev->mt76.tx_worker); > - napi_disable(&dev->mt76.napi[MT_RXQ_MAIN]); > - napi_disable(&dev->mt76.napi[MT_RXQ_MCU]); > - napi_disable(&dev->mt76.napi[MT_RXQ_MCU_WA]); > - napi_disable(&dev->mt76.tx_napi); > - > - mt7921_tx_token_put(dev); > - idr_init(&dev->mt76.token); > - > - mt7921_wpdma_reset(dev, true); > - > - mt76_for_each_q_rx(&dev->mt76, i) { > - napi_enable(&dev->mt76.napi[i]); > - napi_schedule(&dev->mt76.napi[i]); > - } > - > - clear_bit(MT76_MCU_RESET, &dev->mphy.state); > - > - mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, > - MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL | > - MT_INT_MCU_CMD); > - mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); > - > - err = mt7921_run_firmware(dev); > - if (err) > - goto out; > - > - err = mt7921_mcu_set_eeprom(dev); > - if (err) > - goto out; > - > - err = mt7921_mac_init(dev); > - if (err) > - goto out; > - > - err = __mt7921_start(&dev->phy); > -out: > - clear_bit(MT76_RESET, &dev->mphy.state); > - > - napi_enable(&dev->mt76.tx_napi); > - napi_schedule(&dev->mt76.tx_napi); > - mt76_worker_enable(&dev->mt76.tx_worker); > - > - return err; > -} > - > /* system error recovery */ > void mt7921_mac_reset_work(struct work_struct *work) > { > @@ -1608,7 +1285,7 @@ void mt7921_mac_reset_work(struct work_struct *work) > for (i = 0; i < 10; i++) { > __mt7921_mcu_drv_pmctrl(dev); > > - if (!mt7921_mac_reset(dev)) > + if (!mt7921_dev_reset(dev)) > break; > } > mutex_unlock(&dev->mt76.mutex); > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h > index e14b86b1c6d1..70c0f41180a1 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h > @@ -133,6 +133,11 @@ struct mt7921_phy { > struct delayed_work scan_work; > }; > > +#define mt7921_dev_reset(dev) ((dev)->hif_ops->reset(dev)) > +struct mt7921_hif_ops { > + int (*reset)(struct mt7921_dev *dev); > +}; > + > struct mt7921_dev { > union { /* must be first */ > struct mt76_dev mt76; > @@ -156,6 +161,7 @@ struct mt7921_dev { > > struct mt76_connac_pm pm; > struct mt76_connac_coredump coredump; > + const struct mt7921_hif_ops *hif_ops; > }; > > enum { > @@ -325,13 +331,13 @@ void mt7921_mac_reset_work(struct work_struct *work); > void mt7921_mac_update_mib_stats(struct mt7921_phy *phy); > void mt7921_reset(struct mt76_dev *mdev); > void mt7921_tx_cleanup(struct mt7921_dev *dev); > -int mt7921_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, > - enum mt76_txq_id qid, struct mt76_wcid *wcid, > - struct ieee80211_sta *sta, > - struct mt76_tx_info *tx_info); > +int mt7921e_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, > + enum mt76_txq_id qid, struct mt76_wcid *wcid, > + struct ieee80211_sta *sta, > + struct mt76_tx_info *tx_info); > > void mt7921_tx_worker(struct mt76_worker *w); > -void mt7921_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e); > +void mt7921e_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e); > int mt7921_init_tx_queues(struct mt7921_phy *phy, int idx, int n_desc); > void mt7921_tx_token_put(struct mt7921_dev *dev); > void mt7921_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, > @@ -366,4 +372,13 @@ int mt7921_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif, > void *data, int len); > int mt7921_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *msg, > struct netlink_callback *cb, void *data, int len); > +void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi, > + struct sk_buff *skb, struct mt76_wcid *wcid, > + struct ieee80211_key_conf *key, int pid, > + bool beacon); > +void mt7921_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi); > +void mt7921_mac_sta_poll(struct mt7921_dev *dev); > +void mt7921e_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, > + struct sk_buff *skb); > +int mt7921e_mac_reset(struct mt7921_dev *dev); > #endif > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c > index cd710360d180..b01b9b7c42b4 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c > @@ -104,9 +104,9 @@ static int mt7921_pci_probe(struct pci_dev *pdev, > SURVEY_INFO_TIME_RX | > SURVEY_INFO_TIME_BSS_RX, > .token_size = MT7921_TOKEN_SIZE, > - .tx_prepare_skb = mt7921_tx_prepare_skb, > - .tx_complete_skb = mt7921_tx_complete_skb, > - .rx_skb = mt7921_queue_rx_skb, > + .tx_prepare_skb = mt7921e_tx_prepare_skb, > + .tx_complete_skb = mt7921e_tx_complete_skb, > + .rx_skb = mt7921e_queue_rx_skb, > .rx_poll_complete = mt7921_rx_poll_complete, > .sta_ps = mt7921_sta_ps, > .sta_add = mt7921_mac_sta_add, > @@ -114,6 +114,11 @@ static int mt7921_pci_probe(struct pci_dev *pdev, > .sta_remove = mt7921_mac_sta_remove, > .update_survey = mt7921_update_channel, > }; > + > + static const struct mt7921_hif_ops mt7921_pcie_ops = { > + .reset = mt7921e_mac_reset, > + }; > + > struct mt7921_dev *dev; > struct mt76_dev *mdev; > int ret; > @@ -147,6 +152,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, > } > > dev = container_of(mdev, struct mt7921_dev, mt76); > + dev->hif_ops = &mt7921_pcie_ops; > > mt76_mmio_init(&dev->mt76, pcim_iomap_table(pdev)[0]); > tasklet_init(&dev->irq_tasklet, mt7921_irq_tasklet, (unsigned long)dev); > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c > new file mode 100644 > index 000000000000..f211dafa311c > --- /dev/null > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c > @@ -0,0 +1,345 @@ > +// SPDX-License-Identifier: ISC > +/* Copyright (C) 2021 MediaTek Inc. */ > + > +#include "mt7921.h" > +#include "../dma.h" > +#include "mac.h" > + > +static void > +mt7921_write_hw_txp(struct mt7921_dev *dev, struct mt76_tx_info *tx_info, > + void *txp_ptr, u32 id) > +{ > + struct mt7921_hw_txp *txp = txp_ptr; > + struct mt7921_txp_ptr *ptr = &txp->ptr[0]; > + int i, nbuf = tx_info->nbuf - 1; > + > + tx_info->buf[0].len = MT_TXD_SIZE + sizeof(*txp); > + tx_info->nbuf = 1; > + > + txp->msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID); > + > + for (i = 0; i < nbuf; i++) { > + u16 len = tx_info->buf[i + 1].len & MT_TXD_LEN_MASK; > + u32 addr = tx_info->buf[i + 1].addr; > + > + if (i == nbuf - 1) > + len |= MT_TXD_LEN_LAST; > + > + if (i & 1) { > + ptr->buf1 = cpu_to_le32(addr); > + ptr->len1 = cpu_to_le16(len); > + ptr++; > + } else { > + ptr->buf0 = cpu_to_le32(addr); > + ptr->len0 = cpu_to_le16(len); > + } > + } > +} > + > +int mt7921e_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, > + enum mt76_txq_id qid, struct mt76_wcid *wcid, > + struct ieee80211_sta *sta, > + struct mt76_tx_info *tx_info) > +{ > + struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76); > + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info->skb); > + struct ieee80211_key_conf *key = info->control.hw_key; > + struct mt76_txwi_cache *t; > + struct mt7921_txp_common *txp; > + int id, pid; > + u8 *txwi = (u8 *)txwi_ptr; > + > + if (unlikely(tx_info->skb->len <= ETH_HLEN)) > + return -EINVAL; > + > + if (!wcid) > + wcid = &dev->mt76.global_wcid; > + > + t = (struct mt76_txwi_cache *)(txwi + mdev->drv->txwi_size); > + t->skb = tx_info->skb; > + > + id = mt76_token_consume(mdev, &t); > + if (id < 0) > + return id; > + > + if (sta) { > + struct mt7921_sta *msta = (struct mt7921_sta *)sta->drv_priv; > + > + if (time_after(jiffies, msta->last_txs + HZ / 4)) { > + info->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS; > + msta->last_txs = jiffies; > + } > + } > + > + pid = mt76_tx_status_skb_add(mdev, wcid, tx_info->skb); > + mt7921_mac_write_txwi(dev, txwi_ptr, tx_info->skb, wcid, key, > + pid, false); > + > + txp = (struct mt7921_txp_common *)(txwi + MT_TXD_SIZE); > + memset(txp, 0, sizeof(struct mt7921_txp_common)); > + mt7921_write_hw_txp(dev, tx_info, txp, id); > + > + tx_info->skb = DMA_DUMMY_DATA; > + > + return 0; > +} > + > +static void > +mt7921_txp_skb_unmap(struct mt76_dev *dev, struct mt76_txwi_cache *t) > +{ > + struct mt7921_txp_common *txp; > + int i; > + > + txp = mt7921_txwi_to_txp(dev, t); > + > + for (i = 0; i < ARRAY_SIZE(txp->hw.ptr); i++) { > + struct mt7921_txp_ptr *ptr = &txp->hw.ptr[i]; > + bool last; > + u16 len; > + > + len = le16_to_cpu(ptr->len0); > + last = len & MT_TXD_LEN_LAST; > + len &= MT_TXD_LEN_MASK; > + dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf0), len, > + DMA_TO_DEVICE); > + if (last) > + break; > + > + len = le16_to_cpu(ptr->len1); > + last = len & MT_TXD_LEN_LAST; > + len &= MT_TXD_LEN_MASK; > + dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf1), len, > + DMA_TO_DEVICE); > + if (last) > + break; > + } > +} > + > +static void > +mt7921_txwi_free(struct mt7921_dev *dev, struct mt76_txwi_cache *t, > + struct ieee80211_sta *sta, bool clear_status, > + struct list_head *free_list) > +{ > + struct mt76_dev *mdev = &dev->mt76; > + __le32 *txwi; > + u16 wcid_idx; > + > + mt7921_txp_skb_unmap(mdev, t); > + if (!t->skb) > + goto out; > + > + txwi = (__le32 *)mt76_get_txwi_ptr(mdev, t); > + if (sta) { > + struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv; > + > + if (likely(t->skb->protocol != cpu_to_be16(ETH_P_PAE))) > + mt7921_tx_check_aggr(sta, txwi); > + > + wcid_idx = wcid->idx; > + } else { > + wcid_idx = FIELD_GET(MT_TXD1_WLAN_IDX, le32_to_cpu(txwi[1])); > + } > + > + __mt76_tx_complete_skb(mdev, wcid_idx, t->skb, free_list); > + > +out: > + t->skb = NULL; > + mt76_put_txwi(mdev, t); > +} > + > +static void > +mt7921_mac_tx_free(struct mt7921_dev *dev, struct sk_buff *skb) > +{ > + struct mt7921_tx_free *free = (struct mt7921_tx_free *)skb->data; > + struct mt76_dev *mdev = &dev->mt76; > + struct mt76_txwi_cache *txwi; > + struct ieee80211_sta *sta = NULL; > + LIST_HEAD(free_list); > + struct sk_buff *tmp; > + bool wake = false; > + u8 i, count; > + > + /* clean DMA queues and unmap buffers first */ > + mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_PSD], false); > + mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_BE], false); > + > + /* TODO: MT_TX_FREE_LATENCY is msdu time from the TXD is queued into PLE, > + * to the time ack is received or dropped by hw (air + hw queue time). > + * Should avoid accessing WTBL to get Tx airtime, and use it instead. > + */ > + count = FIELD_GET(MT_TX_FREE_MSDU_CNT, le16_to_cpu(free->ctrl)); > + for (i = 0; i < count; i++) { > + u32 msdu, info = le32_to_cpu(free->info[i]); > + u8 stat; > + > + /* 1'b1: new wcid pair. > + * 1'b0: msdu_id with the same 'wcid pair' as above. > + */ > + if (info & MT_TX_FREE_PAIR) { > + struct mt7921_sta *msta; > + struct mt7921_phy *phy; > + struct mt76_wcid *wcid; > + u16 idx; > + > + count++; > + idx = FIELD_GET(MT_TX_FREE_WLAN_ID, info); > + wcid = rcu_dereference(dev->mt76.wcid[idx]); > + sta = wcid_to_sta(wcid); > + if (!sta) > + continue; > + > + msta = container_of(wcid, struct mt7921_sta, wcid); > + phy = msta->vif->phy; > + spin_lock_bh(&dev->sta_poll_lock); > + if (list_empty(&msta->poll_list)) > + list_add_tail(&msta->poll_list, &dev->sta_poll_list); > + spin_unlock_bh(&dev->sta_poll_lock); > + continue; > + } > + > + msdu = FIELD_GET(MT_TX_FREE_MSDU_ID, info); > + stat = FIELD_GET(MT_TX_FREE_STATUS, info); > + > + txwi = mt76_token_release(mdev, msdu, &wake); > + if (!txwi) > + continue; > + > + mt7921_txwi_free(dev, txwi, sta, stat, &free_list); > + } > + > + if (wake) > + mt76_set_tx_blocked(&dev->mt76, false); > + > + napi_consume_skb(skb, 1); > + > + list_for_each_entry_safe(skb, tmp, &free_list, list) { > + skb_list_del_init(skb); > + napi_consume_skb(skb, 1); > + } > + > + mt7921_mac_sta_poll(dev); > + mt76_worker_schedule(&dev->mt76.tx_worker); > +} > + > +void mt7921e_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, > + struct sk_buff *skb) > +{ > + struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76); > + __le32 *rxd = (__le32 *)skb->data; > + enum rx_pkt_type type; > + > + type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0])); > + > + switch (type) { > + case PKT_TYPE_TXRX_NOTIFY: > + mt7921_mac_tx_free(dev, skb); > + break; > + default: > + mt7921_queue_rx_skb(mdev, q, skb); > + break; > + } > +} > + > +void mt7921e_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e) > +{ > + struct mt7921_dev *dev; > + > + if (!e->txwi) { > + dev_kfree_skb_any(e->skb); > + return; > + } > + > + dev = container_of(mdev, struct mt7921_dev, mt76); > + > + /* error path */ > + if (e->skb == DMA_DUMMY_DATA) { > + struct mt76_txwi_cache *t; > + struct mt7921_txp_common *txp; > + u16 token; > + > + txp = mt7921_txwi_to_txp(mdev, e->txwi); > + token = le16_to_cpu(txp->hw.msdu_id[0]) & ~MT_MSDU_ID_VALID; > + t = mt76_token_put(mdev, token); > + e->skb = t ? t->skb : NULL; > + } > + > + if (e->skb) > + mt76_tx_complete_skb(mdev, e->wcid, e->skb); > +} > + > +void mt7921_tx_token_put(struct mt7921_dev *dev) > +{ > + struct mt76_txwi_cache *txwi; > + int id; > + > + spin_lock_bh(&dev->mt76.token_lock); > + idr_for_each_entry(&dev->mt76.token, txwi, id) { > + mt7921_txwi_free(dev, txwi, NULL, false, NULL); > + dev->mt76.token_count--; > + } > + spin_unlock_bh(&dev->mt76.token_lock); > + idr_destroy(&dev->mt76.token); > +} > + > +int can you please remove new line here? > +mt7921e_mac_reset(struct mt7921_dev *dev) > +{ > + int i, err; > + > + mt76_connac_free_pending_tx_skbs(&dev->pm, NULL); > + > + mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0); > + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0); > + > + set_bit(MT76_RESET, &dev->mphy.state); > + set_bit(MT76_MCU_RESET, &dev->mphy.state); > + wake_up(&dev->mt76.mcu.wait); > + skb_queue_purge(&dev->mt76.mcu.res_q); > + > + mt76_txq_schedule_all(&dev->mphy); > + > + mt76_worker_disable(&dev->mt76.tx_worker); > + napi_disable(&dev->mt76.napi[MT_RXQ_MAIN]); > + napi_disable(&dev->mt76.napi[MT_RXQ_MCU]); > + napi_disable(&dev->mt76.napi[MT_RXQ_MCU_WA]); > + napi_disable(&dev->mt76.tx_napi); > + > + mt7921_tx_token_put(dev); > + idr_init(&dev->mt76.token); > + > + mt7921_wpdma_reset(dev, true); > + > + mt76_for_each_q_rx(&dev->mt76, i) { > + napi_enable(&dev->mt76.napi[i]); > + napi_schedule(&dev->mt76.napi[i]); > + } > + > + clear_bit(MT76_MCU_RESET, &dev->mphy.state); > + > + mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, > + MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL | > + MT_INT_MCU_CMD); > + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); > + > + err = mt7921_run_firmware(dev); > + if (err) > + goto out; > + > + err = mt7921_mcu_set_eeprom(dev); > + if (err) > + goto out; > + > + err = mt7921_mac_init(dev); > + if (err) > + goto out; > + > + err = __mt7921_start(&dev->phy); > +out: > + clear_bit(MT76_RESET, &dev->mphy.state); > + > + napi_enable(&dev->mt76.tx_napi); > + napi_schedule(&dev->mt76.tx_napi); > + mt76_worker_enable(&dev->mt76.tx_worker); > + > + return err; > +} > -- > 2.25.1 >
diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/Makefile b/drivers/net/wireless/mediatek/mt76/mt7921/Makefile index 3471d82fc265..554202358470 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/Makefile +++ b/drivers/net/wireless/mediatek/mt76/mt7921/Makefile @@ -4,5 +4,5 @@ obj-$(CONFIG_MT7921E) += mt7921e.o CFLAGS_trace.o := -I$(src) -mt7921e-y := pci.o mac.o mcu.o dma.o eeprom.o main.o init.o debugfs.o trace.o +mt7921e-y := pci.o pci_mac.o mac.o mcu.o dma.o eeprom.o main.o init.o debugfs.o trace.o mt7921e-$(CONFIG_NL80211_TESTMODE) += testmode.o diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c index 27f13228c5a7..d811702a3a2c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c @@ -49,7 +49,7 @@ bool mt7921_mac_wtbl_update(struct mt7921_dev *dev, int idx, u32 mask) 0, 5000); } -static void mt7921_mac_sta_poll(struct mt7921_dev *dev) +void mt7921_mac_sta_poll(struct mt7921_dev *dev) { static const u8 ac_to_tid[] = { [IEEE80211_AC_BE] = 0, @@ -836,7 +836,7 @@ mt7921_mac_write_txwi_80211(struct mt7921_dev *dev, __le32 *txwi, txwi[7] |= cpu_to_le32(val); } -static void +void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi, struct sk_buff *skb, struct mt76_wcid *wcid, struct ieee80211_key_conf *key, int pid, @@ -922,86 +922,7 @@ mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi, } } -static void -mt7921_write_hw_txp(struct mt7921_dev *dev, struct mt76_tx_info *tx_info, - void *txp_ptr, u32 id) -{ - struct mt7921_hw_txp *txp = txp_ptr; - struct mt7921_txp_ptr *ptr = &txp->ptr[0]; - int i, nbuf = tx_info->nbuf - 1; - - tx_info->buf[0].len = MT_TXD_SIZE + sizeof(*txp); - tx_info->nbuf = 1; - - txp->msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID); - - for (i = 0; i < nbuf; i++) { - u16 len = tx_info->buf[i + 1].len & MT_TXD_LEN_MASK; - u32 addr = tx_info->buf[i + 1].addr; - - if (i == nbuf - 1) - len |= MT_TXD_LEN_LAST; - - if (i & 1) { - ptr->buf1 = cpu_to_le32(addr); - ptr->len1 = cpu_to_le16(len); - ptr++; - } else { - ptr->buf0 = cpu_to_le32(addr); - ptr->len0 = cpu_to_le16(len); - } - } -} - -int mt7921_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, - enum mt76_txq_id qid, struct mt76_wcid *wcid, - struct ieee80211_sta *sta, - struct mt76_tx_info *tx_info) -{ - struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76); - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info->skb); - struct ieee80211_key_conf *key = info->control.hw_key; - struct mt76_txwi_cache *t; - struct mt7921_txp_common *txp; - int id, pid; - u8 *txwi = (u8 *)txwi_ptr; - - if (unlikely(tx_info->skb->len <= ETH_HLEN)) - return -EINVAL; - - if (!wcid) - wcid = &dev->mt76.global_wcid; - - t = (struct mt76_txwi_cache *)(txwi + mdev->drv->txwi_size); - t->skb = tx_info->skb; - - id = mt76_token_consume(mdev, &t); - if (id < 0) - return id; - - if (sta) { - struct mt7921_sta *msta = (struct mt7921_sta *)sta->drv_priv; - - if (time_after(jiffies, msta->last_txs + HZ / 4)) { - info->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS; - msta->last_txs = jiffies; - } - } - - pid = mt76_tx_status_skb_add(mdev, wcid, tx_info->skb); - mt7921_mac_write_txwi(dev, txwi_ptr, tx_info->skb, wcid, key, - pid, false); - - txp = (struct mt7921_txp_common *)(txwi + MT_TXD_SIZE); - memset(txp, 0, sizeof(struct mt7921_txp_common)); - mt7921_write_hw_txp(dev, tx_info, txp, id); - - tx_info->skb = DMA_DUMMY_DATA; - - return 0; -} - -static void +void mt7921_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi) { struct mt7921_sta *msta; @@ -1026,143 +947,6 @@ mt7921_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi) ieee80211_start_tx_ba_session(sta, tid, 0); } -static void -mt7921_txp_skb_unmap(struct mt76_dev *dev, struct mt76_txwi_cache *t) -{ - struct mt7921_txp_common *txp; - int i; - - txp = mt7921_txwi_to_txp(dev, t); - - for (i = 0; i < ARRAY_SIZE(txp->hw.ptr); i++) { - struct mt7921_txp_ptr *ptr = &txp->hw.ptr[i]; - bool last; - u16 len; - - len = le16_to_cpu(ptr->len0); - last = len & MT_TXD_LEN_LAST; - len &= MT_TXD_LEN_MASK; - dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf0), len, - DMA_TO_DEVICE); - if (last) - break; - - len = le16_to_cpu(ptr->len1); - last = len & MT_TXD_LEN_LAST; - len &= MT_TXD_LEN_MASK; - dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf1), len, - DMA_TO_DEVICE); - if (last) - break; - } -} - -static void -mt7921_txwi_free(struct mt7921_dev *dev, struct mt76_txwi_cache *t, - struct ieee80211_sta *sta, bool clear_status, - struct list_head *free_list) -{ - struct mt76_dev *mdev = &dev->mt76; - __le32 *txwi; - u16 wcid_idx; - - mt7921_txp_skb_unmap(mdev, t); - if (!t->skb) - goto out; - - txwi = (__le32 *)mt76_get_txwi_ptr(mdev, t); - if (sta) { - struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv; - - if (likely(t->skb->protocol != cpu_to_be16(ETH_P_PAE))) - mt7921_tx_check_aggr(sta, txwi); - - wcid_idx = wcid->idx; - } else { - wcid_idx = FIELD_GET(MT_TXD1_WLAN_IDX, le32_to_cpu(txwi[1])); - } - - __mt76_tx_complete_skb(mdev, wcid_idx, t->skb, free_list); - -out: - t->skb = NULL; - mt76_put_txwi(mdev, t); -} - -static void -mt7921_mac_tx_free(struct mt7921_dev *dev, struct sk_buff *skb) -{ - struct mt7921_tx_free *free = (struct mt7921_tx_free *)skb->data; - struct mt76_dev *mdev = &dev->mt76; - struct mt76_txwi_cache *txwi; - struct ieee80211_sta *sta = NULL; - LIST_HEAD(free_list); - struct sk_buff *tmp; - bool wake = false; - u8 i, count; - - /* clean DMA queues and unmap buffers first */ - mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_PSD], false); - mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_BE], false); - - /* TODO: MT_TX_FREE_LATENCY is msdu time from the TXD is queued into PLE, - * to the time ack is received or dropped by hw (air + hw queue time). - * Should avoid accessing WTBL to get Tx airtime, and use it instead. - */ - count = FIELD_GET(MT_TX_FREE_MSDU_CNT, le16_to_cpu(free->ctrl)); - for (i = 0; i < count; i++) { - u32 msdu, info = le32_to_cpu(free->info[i]); - u8 stat; - - /* 1'b1: new wcid pair. - * 1'b0: msdu_id with the same 'wcid pair' as above. - */ - if (info & MT_TX_FREE_PAIR) { - struct mt7921_sta *msta; - struct mt7921_phy *phy; - struct mt76_wcid *wcid; - u16 idx; - - count++; - idx = FIELD_GET(MT_TX_FREE_WLAN_ID, info); - wcid = rcu_dereference(dev->mt76.wcid[idx]); - sta = wcid_to_sta(wcid); - if (!sta) - continue; - - msta = container_of(wcid, struct mt7921_sta, wcid); - phy = msta->vif->phy; - spin_lock_bh(&dev->sta_poll_lock); - if (list_empty(&msta->poll_list)) - list_add_tail(&msta->poll_list, &dev->sta_poll_list); - spin_unlock_bh(&dev->sta_poll_lock); - continue; - } - - msdu = FIELD_GET(MT_TX_FREE_MSDU_ID, info); - stat = FIELD_GET(MT_TX_FREE_STATUS, info); - - txwi = mt76_token_release(mdev, msdu, &wake); - if (!txwi) - continue; - - mt7921_txwi_free(dev, txwi, sta, stat, &free_list); - } - - if (wake) - mt76_set_tx_blocked(&dev->mt76, false); - - napi_consume_skb(skb, 1); - - list_for_each_entry_safe(skb, tmp, &free_list, list) { - skb_list_del_init(skb); - napi_consume_skb(skb, 1); - } - - mt7921_mac_sta_poll(dev); - mt76_worker_schedule(&dev->mt76.tx_worker); -} - static bool mt7921_mac_add_txs_skb(struct mt7921_dev *dev, struct mt76_wcid *wcid, int pid, __le32 *txs_data) @@ -1330,9 +1114,6 @@ void mt7921_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, type = PKT_TYPE_NORMAL_MCU; switch (type) { - case PKT_TYPE_TXRX_NOTIFY: - mt7921_mac_tx_free(dev, skb); - break; case PKT_TYPE_RX_EVENT: mt7921_mcu_rx_event(dev, skb); break; @@ -1354,33 +1135,6 @@ void mt7921_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, } } -void mt7921_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e) -{ - struct mt7921_dev *dev; - - if (!e->txwi) { - dev_kfree_skb_any(e->skb); - return; - } - - dev = container_of(mdev, struct mt7921_dev, mt76); - - /* error path */ - if (e->skb == DMA_DUMMY_DATA) { - struct mt76_txwi_cache *t; - struct mt7921_txp_common *txp; - u16 token; - - txp = mt7921_txwi_to_txp(mdev, e->txwi); - token = le16_to_cpu(txp->hw.msdu_id[0]) & ~MT_MSDU_ID_VALID; - t = mt76_token_put(mdev, token); - e->skb = t ? t->skb : NULL; - } - - if (e->skb) - mt76_tx_complete_skb(mdev, e->wcid, e->skb); -} - void mt7921_mac_reset_counters(struct mt7921_phy *phy) { struct mt7921_dev *dev = phy->dev; @@ -1496,20 +1250,6 @@ void mt7921_update_channel(struct mt76_phy *mphy) mt76_connac_power_save_sched(mphy, &dev->pm); } -void mt7921_tx_token_put(struct mt7921_dev *dev) -{ - struct mt76_txwi_cache *txwi; - int id; - - spin_lock_bh(&dev->mt76.token_lock); - idr_for_each_entry(&dev->mt76.token, txwi, id) { - mt7921_txwi_free(dev, txwi, NULL, false, NULL); - dev->mt76.token_count--; - } - spin_unlock_bh(&dev->mt76.token_lock); - idr_destroy(&dev->mt76.token); -} - static void mt7921_vif_connect_iter(void *priv, u8 *mac, struct ieee80211_vif *vif) @@ -1524,69 +1264,6 @@ mt7921_vif_connect_iter(void *priv, u8 *mac, mt7921_mcu_set_tx(dev, vif); } -static int -mt7921_mac_reset(struct mt7921_dev *dev) -{ - int i, err; - - mt76_connac_free_pending_tx_skbs(&dev->pm, NULL); - - mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0); - mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0); - - set_bit(MT76_RESET, &dev->mphy.state); - set_bit(MT76_MCU_RESET, &dev->mphy.state); - wake_up(&dev->mt76.mcu.wait); - skb_queue_purge(&dev->mt76.mcu.res_q); - - mt76_txq_schedule_all(&dev->mphy); - - mt76_worker_disable(&dev->mt76.tx_worker); - napi_disable(&dev->mt76.napi[MT_RXQ_MAIN]); - napi_disable(&dev->mt76.napi[MT_RXQ_MCU]); - napi_disable(&dev->mt76.napi[MT_RXQ_MCU_WA]); - napi_disable(&dev->mt76.tx_napi); - - mt7921_tx_token_put(dev); - idr_init(&dev->mt76.token); - - mt7921_wpdma_reset(dev, true); - - mt76_for_each_q_rx(&dev->mt76, i) { - napi_enable(&dev->mt76.napi[i]); - napi_schedule(&dev->mt76.napi[i]); - } - - clear_bit(MT76_MCU_RESET, &dev->mphy.state); - - mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, - MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL | - MT_INT_MCU_CMD); - mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); - - err = mt7921_run_firmware(dev); - if (err) - goto out; - - err = mt7921_mcu_set_eeprom(dev); - if (err) - goto out; - - err = mt7921_mac_init(dev); - if (err) - goto out; - - err = __mt7921_start(&dev->phy); -out: - clear_bit(MT76_RESET, &dev->mphy.state); - - napi_enable(&dev->mt76.tx_napi); - napi_schedule(&dev->mt76.tx_napi); - mt76_worker_enable(&dev->mt76.tx_worker); - - return err; -} - /* system error recovery */ void mt7921_mac_reset_work(struct work_struct *work) { @@ -1608,7 +1285,7 @@ void mt7921_mac_reset_work(struct work_struct *work) for (i = 0; i < 10; i++) { __mt7921_mcu_drv_pmctrl(dev); - if (!mt7921_mac_reset(dev)) + if (!mt7921_dev_reset(dev)) break; } mutex_unlock(&dev->mt76.mutex); diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h index e14b86b1c6d1..70c0f41180a1 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h @@ -133,6 +133,11 @@ struct mt7921_phy { struct delayed_work scan_work; }; +#define mt7921_dev_reset(dev) ((dev)->hif_ops->reset(dev)) +struct mt7921_hif_ops { + int (*reset)(struct mt7921_dev *dev); +}; + struct mt7921_dev { union { /* must be first */ struct mt76_dev mt76; @@ -156,6 +161,7 @@ struct mt7921_dev { struct mt76_connac_pm pm; struct mt76_connac_coredump coredump; + const struct mt7921_hif_ops *hif_ops; }; enum { @@ -325,13 +331,13 @@ void mt7921_mac_reset_work(struct work_struct *work); void mt7921_mac_update_mib_stats(struct mt7921_phy *phy); void mt7921_reset(struct mt76_dev *mdev); void mt7921_tx_cleanup(struct mt7921_dev *dev); -int mt7921_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, - enum mt76_txq_id qid, struct mt76_wcid *wcid, - struct ieee80211_sta *sta, - struct mt76_tx_info *tx_info); +int mt7921e_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, + enum mt76_txq_id qid, struct mt76_wcid *wcid, + struct ieee80211_sta *sta, + struct mt76_tx_info *tx_info); void mt7921_tx_worker(struct mt76_worker *w); -void mt7921_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e); +void mt7921e_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e); int mt7921_init_tx_queues(struct mt7921_phy *phy, int idx, int n_desc); void mt7921_tx_token_put(struct mt7921_dev *dev); void mt7921_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, @@ -366,4 +372,13 @@ int mt7921_testmode_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif, void *data, int len); int mt7921_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *msg, struct netlink_callback *cb, void *data, int len); +void mt7921_mac_write_txwi(struct mt7921_dev *dev, __le32 *txwi, + struct sk_buff *skb, struct mt76_wcid *wcid, + struct ieee80211_key_conf *key, int pid, + bool beacon); +void mt7921_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi); +void mt7921_mac_sta_poll(struct mt7921_dev *dev); +void mt7921e_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, + struct sk_buff *skb); +int mt7921e_mac_reset(struct mt7921_dev *dev); #endif diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c index cd710360d180..b01b9b7c42b4 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c @@ -104,9 +104,9 @@ static int mt7921_pci_probe(struct pci_dev *pdev, SURVEY_INFO_TIME_RX | SURVEY_INFO_TIME_BSS_RX, .token_size = MT7921_TOKEN_SIZE, - .tx_prepare_skb = mt7921_tx_prepare_skb, - .tx_complete_skb = mt7921_tx_complete_skb, - .rx_skb = mt7921_queue_rx_skb, + .tx_prepare_skb = mt7921e_tx_prepare_skb, + .tx_complete_skb = mt7921e_tx_complete_skb, + .rx_skb = mt7921e_queue_rx_skb, .rx_poll_complete = mt7921_rx_poll_complete, .sta_ps = mt7921_sta_ps, .sta_add = mt7921_mac_sta_add, @@ -114,6 +114,11 @@ static int mt7921_pci_probe(struct pci_dev *pdev, .sta_remove = mt7921_mac_sta_remove, .update_survey = mt7921_update_channel, }; + + static const struct mt7921_hif_ops mt7921_pcie_ops = { + .reset = mt7921e_mac_reset, + }; + struct mt7921_dev *dev; struct mt76_dev *mdev; int ret; @@ -147,6 +152,7 @@ static int mt7921_pci_probe(struct pci_dev *pdev, } dev = container_of(mdev, struct mt7921_dev, mt76); + dev->hif_ops = &mt7921_pcie_ops; mt76_mmio_init(&dev->mt76, pcim_iomap_table(pdev)[0]); tasklet_init(&dev->irq_tasklet, mt7921_irq_tasklet, (unsigned long)dev); diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c new file mode 100644 index 000000000000..f211dafa311c --- /dev/null +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c @@ -0,0 +1,345 @@ +// SPDX-License-Identifier: ISC +/* Copyright (C) 2021 MediaTek Inc. */ + +#include "mt7921.h" +#include "../dma.h" +#include "mac.h" + +static void +mt7921_write_hw_txp(struct mt7921_dev *dev, struct mt76_tx_info *tx_info, + void *txp_ptr, u32 id) +{ + struct mt7921_hw_txp *txp = txp_ptr; + struct mt7921_txp_ptr *ptr = &txp->ptr[0]; + int i, nbuf = tx_info->nbuf - 1; + + tx_info->buf[0].len = MT_TXD_SIZE + sizeof(*txp); + tx_info->nbuf = 1; + + txp->msdu_id[0] = cpu_to_le16(id | MT_MSDU_ID_VALID); + + for (i = 0; i < nbuf; i++) { + u16 len = tx_info->buf[i + 1].len & MT_TXD_LEN_MASK; + u32 addr = tx_info->buf[i + 1].addr; + + if (i == nbuf - 1) + len |= MT_TXD_LEN_LAST; + + if (i & 1) { + ptr->buf1 = cpu_to_le32(addr); + ptr->len1 = cpu_to_le16(len); + ptr++; + } else { + ptr->buf0 = cpu_to_le32(addr); + ptr->len0 = cpu_to_le16(len); + } + } +} + +int mt7921e_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, + enum mt76_txq_id qid, struct mt76_wcid *wcid, + struct ieee80211_sta *sta, + struct mt76_tx_info *tx_info) +{ + struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76); + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info->skb); + struct ieee80211_key_conf *key = info->control.hw_key; + struct mt76_txwi_cache *t; + struct mt7921_txp_common *txp; + int id, pid; + u8 *txwi = (u8 *)txwi_ptr; + + if (unlikely(tx_info->skb->len <= ETH_HLEN)) + return -EINVAL; + + if (!wcid) + wcid = &dev->mt76.global_wcid; + + t = (struct mt76_txwi_cache *)(txwi + mdev->drv->txwi_size); + t->skb = tx_info->skb; + + id = mt76_token_consume(mdev, &t); + if (id < 0) + return id; + + if (sta) { + struct mt7921_sta *msta = (struct mt7921_sta *)sta->drv_priv; + + if (time_after(jiffies, msta->last_txs + HZ / 4)) { + info->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS; + msta->last_txs = jiffies; + } + } + + pid = mt76_tx_status_skb_add(mdev, wcid, tx_info->skb); + mt7921_mac_write_txwi(dev, txwi_ptr, tx_info->skb, wcid, key, + pid, false); + + txp = (struct mt7921_txp_common *)(txwi + MT_TXD_SIZE); + memset(txp, 0, sizeof(struct mt7921_txp_common)); + mt7921_write_hw_txp(dev, tx_info, txp, id); + + tx_info->skb = DMA_DUMMY_DATA; + + return 0; +} + +static void +mt7921_txp_skb_unmap(struct mt76_dev *dev, struct mt76_txwi_cache *t) +{ + struct mt7921_txp_common *txp; + int i; + + txp = mt7921_txwi_to_txp(dev, t); + + for (i = 0; i < ARRAY_SIZE(txp->hw.ptr); i++) { + struct mt7921_txp_ptr *ptr = &txp->hw.ptr[i]; + bool last; + u16 len; + + len = le16_to_cpu(ptr->len0); + last = len & MT_TXD_LEN_LAST; + len &= MT_TXD_LEN_MASK; + dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf0), len, + DMA_TO_DEVICE); + if (last) + break; + + len = le16_to_cpu(ptr->len1); + last = len & MT_TXD_LEN_LAST; + len &= MT_TXD_LEN_MASK; + dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf1), len, + DMA_TO_DEVICE); + if (last) + break; + } +} + +static void +mt7921_txwi_free(struct mt7921_dev *dev, struct mt76_txwi_cache *t, + struct ieee80211_sta *sta, bool clear_status, + struct list_head *free_list) +{ + struct mt76_dev *mdev = &dev->mt76; + __le32 *txwi; + u16 wcid_idx; + + mt7921_txp_skb_unmap(mdev, t); + if (!t->skb) + goto out; + + txwi = (__le32 *)mt76_get_txwi_ptr(mdev, t); + if (sta) { + struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv; + + if (likely(t->skb->protocol != cpu_to_be16(ETH_P_PAE))) + mt7921_tx_check_aggr(sta, txwi); + + wcid_idx = wcid->idx; + } else { + wcid_idx = FIELD_GET(MT_TXD1_WLAN_IDX, le32_to_cpu(txwi[1])); + } + + __mt76_tx_complete_skb(mdev, wcid_idx, t->skb, free_list); + +out: + t->skb = NULL; + mt76_put_txwi(mdev, t); +} + +static void +mt7921_mac_tx_free(struct mt7921_dev *dev, struct sk_buff *skb) +{ + struct mt7921_tx_free *free = (struct mt7921_tx_free *)skb->data; + struct mt76_dev *mdev = &dev->mt76; + struct mt76_txwi_cache *txwi; + struct ieee80211_sta *sta = NULL; + LIST_HEAD(free_list); + struct sk_buff *tmp; + bool wake = false; + u8 i, count; + + /* clean DMA queues and unmap buffers first */ + mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_PSD], false); + mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_BE], false); + + /* TODO: MT_TX_FREE_LATENCY is msdu time from the TXD is queued into PLE, + * to the time ack is received or dropped by hw (air + hw queue time). + * Should avoid accessing WTBL to get Tx airtime, and use it instead. + */ + count = FIELD_GET(MT_TX_FREE_MSDU_CNT, le16_to_cpu(free->ctrl)); + for (i = 0; i < count; i++) { + u32 msdu, info = le32_to_cpu(free->info[i]); + u8 stat; + + /* 1'b1: new wcid pair. + * 1'b0: msdu_id with the same 'wcid pair' as above. + */ + if (info & MT_TX_FREE_PAIR) { + struct mt7921_sta *msta; + struct mt7921_phy *phy; + struct mt76_wcid *wcid; + u16 idx; + + count++; + idx = FIELD_GET(MT_TX_FREE_WLAN_ID, info); + wcid = rcu_dereference(dev->mt76.wcid[idx]); + sta = wcid_to_sta(wcid); + if (!sta) + continue; + + msta = container_of(wcid, struct mt7921_sta, wcid); + phy = msta->vif->phy; + spin_lock_bh(&dev->sta_poll_lock); + if (list_empty(&msta->poll_list)) + list_add_tail(&msta->poll_list, &dev->sta_poll_list); + spin_unlock_bh(&dev->sta_poll_lock); + continue; + } + + msdu = FIELD_GET(MT_TX_FREE_MSDU_ID, info); + stat = FIELD_GET(MT_TX_FREE_STATUS, info); + + txwi = mt76_token_release(mdev, msdu, &wake); + if (!txwi) + continue; + + mt7921_txwi_free(dev, txwi, sta, stat, &free_list); + } + + if (wake) + mt76_set_tx_blocked(&dev->mt76, false); + + napi_consume_skb(skb, 1); + + list_for_each_entry_safe(skb, tmp, &free_list, list) { + skb_list_del_init(skb); + napi_consume_skb(skb, 1); + } + + mt7921_mac_sta_poll(dev); + mt76_worker_schedule(&dev->mt76.tx_worker); +} + +void mt7921e_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q, + struct sk_buff *skb) +{ + struct mt7921_dev *dev = container_of(mdev, struct mt7921_dev, mt76); + __le32 *rxd = (__le32 *)skb->data; + enum rx_pkt_type type; + + type = FIELD_GET(MT_RXD0_PKT_TYPE, le32_to_cpu(rxd[0])); + + switch (type) { + case PKT_TYPE_TXRX_NOTIFY: + mt7921_mac_tx_free(dev, skb); + break; + default: + mt7921_queue_rx_skb(mdev, q, skb); + break; + } +} + +void mt7921e_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e) +{ + struct mt7921_dev *dev; + + if (!e->txwi) { + dev_kfree_skb_any(e->skb); + return; + } + + dev = container_of(mdev, struct mt7921_dev, mt76); + + /* error path */ + if (e->skb == DMA_DUMMY_DATA) { + struct mt76_txwi_cache *t; + struct mt7921_txp_common *txp; + u16 token; + + txp = mt7921_txwi_to_txp(mdev, e->txwi); + token = le16_to_cpu(txp->hw.msdu_id[0]) & ~MT_MSDU_ID_VALID; + t = mt76_token_put(mdev, token); + e->skb = t ? t->skb : NULL; + } + + if (e->skb) + mt76_tx_complete_skb(mdev, e->wcid, e->skb); +} + +void mt7921_tx_token_put(struct mt7921_dev *dev) +{ + struct mt76_txwi_cache *txwi; + int id; + + spin_lock_bh(&dev->mt76.token_lock); + idr_for_each_entry(&dev->mt76.token, txwi, id) { + mt7921_txwi_free(dev, txwi, NULL, false, NULL); + dev->mt76.token_count--; + } + spin_unlock_bh(&dev->mt76.token_lock); + idr_destroy(&dev->mt76.token); +} + +int +mt7921e_mac_reset(struct mt7921_dev *dev) +{ + int i, err; + + mt76_connac_free_pending_tx_skbs(&dev->pm, NULL); + + mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, 0); + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0x0); + + set_bit(MT76_RESET, &dev->mphy.state); + set_bit(MT76_MCU_RESET, &dev->mphy.state); + wake_up(&dev->mt76.mcu.wait); + skb_queue_purge(&dev->mt76.mcu.res_q); + + mt76_txq_schedule_all(&dev->mphy); + + mt76_worker_disable(&dev->mt76.tx_worker); + napi_disable(&dev->mt76.napi[MT_RXQ_MAIN]); + napi_disable(&dev->mt76.napi[MT_RXQ_MCU]); + napi_disable(&dev->mt76.napi[MT_RXQ_MCU_WA]); + napi_disable(&dev->mt76.tx_napi); + + mt7921_tx_token_put(dev); + idr_init(&dev->mt76.token); + + mt7921_wpdma_reset(dev, true); + + mt76_for_each_q_rx(&dev->mt76, i) { + napi_enable(&dev->mt76.napi[i]); + napi_schedule(&dev->mt76.napi[i]); + } + + clear_bit(MT76_MCU_RESET, &dev->mphy.state); + + mt76_wr(dev, MT_WFDMA0_HOST_INT_ENA, + MT_INT_RX_DONE_ALL | MT_INT_TX_DONE_ALL | + MT_INT_MCU_CMD); + mt76_wr(dev, MT_PCIE_MAC_INT_ENABLE, 0xff); + + err = mt7921_run_firmware(dev); + if (err) + goto out; + + err = mt7921_mcu_set_eeprom(dev); + if (err) + goto out; + + err = mt7921_mac_init(dev); + if (err) + goto out; + + err = __mt7921_start(&dev->phy); +out: + clear_bit(MT76_RESET, &dev->mphy.state); + + napi_enable(&dev->mt76.tx_napi); + napi_schedule(&dev->mt76.tx_napi); + mt76_worker_enable(&dev->mt76.tx_worker); + + return err; +}