wifi: mt76: disable HW AMSDU when using fixed rate
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/5 wifi: mt76: disable HW AMSDU when using fixed rate
From: Peter Chiu <[email protected]>
When using fixed rate, HW uses txd DW9 to store tx arrivial time if VTA is set. It would overwrite the msdu_id in txd and lead to token pending if amsdu is enable.
--- drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c +3 -1
@@ -544,7 +544,7 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi, val =FIELD_PREP (MT_TXD5_PID , pid);if (pid >=MT_PACKET_ID_FIRST ) { val |=MT_TXD5_TX_STATUS_HOST ; - amsdu_en = amsdu_en && !is_mt7921 (dev); + amsdu_en =0 ; } txwi[5 ] =cpu_to_le32 (val);
@@ -579,6 +579,8 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi, spe_idx =24 + phy_idx; txwi[7 ] |=cpu_to_le32 (FIELD_PREP (MT_TXD7_SPE_IDX , spe_idx)); } + + txwi[7 ] &= ~cpu_to_le32 (MT_TXD7_HW_AMSDU ); } }EXPORT_SYMBOL_GPL (mt76_connac2_mac_write_txwi);
Signature · 1 line
2.43.0
Felix Fietkau
maintainerPATCH 2/5 wifi: mt76: check txs format before getting skb by pid
From: Peter Chiu <[email protected]>
The PPDU TxS does not include the error bit so it cannot use to report status to mac80211.
--- drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h | 5 +++++ drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c | 3 +++ 2 files changed, 8 insertions(+)
drivers/net/wireless/mediatek/mt76/mt76_connac2_mac.h +5 -0
@@ -32,6 +32,11 @@ enum { MT_LMAC_PSMP0, }; +enum { +MT_TXS_MPDU_FMT =0 , +MT_TXS_PPDU_FMT =2 , +}; +#define MT_TX_FREE_MSDU_CNT GENMASK(9, 0)#define MT_TX_FREE_WLAN_ID GENMASK(23, 14)#define MT_TX_FREE_COUNT GENMASK(12, 0)
drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c +3 -0
@@ -716,6 +716,9 @@ bool mt76_connac2_mac_add_txs_skb(struct mt76_dev *dev, struct mt76_wcid *wcid,struct sk_buff_head list;struct sk_buff *skb; +if (le32_get_bits (txs_data[0 ],MT_TXS0_TXS_FORMAT ) ==MT_TXS_PPDU_FMT ) +return false; +mt76_tx_status_lock (dev, &list); skb =mt76_tx_status_skb_get (dev, wcid, pid, &list);if (skb) {
Signature · 1 line
2.43.0
Felix Fietkau
maintainerPATCH 3/5 wifi: mt76: mt7915: fix error recovery with WED enabled
In reply to Felix FietkauDo not clear the interrupt mask register on MT7915, since that prevents MCU_CMD interrupts from being reported, thus causing timeouts during the reset sequence. Defer stopping WED until tx/rx processing activity has stopped.
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +3 -6
@@ -1520,12 +1520,6 @@ void mt7915_mac_reset_work(struct work_struct *work)if (!(READ_ONCE (dev->recovery.state) &MT_MCU_CMD_STOP_DMA ))return ; -if (mtk_wed_device_active (&dev->mt76.mmio.wed)) { -mtk_wed_device_stop (&dev->mt76.mmio.wed); -if (!is_mt798x (&dev->mt76)) -mt76_wr (dev,MT_INT_WED_MASK_CSR ,0 ); - } -ieee80211_stop_queues (mt76_hw (dev));if (ext_phy)ieee80211_stop_queues (ext_phy->hw);
@@ -1545,6 +1539,9 @@ void mt7915_mac_reset_work(struct work_struct *work)mutex_lock (&dev->mt76.mutex); +if (mtk_wed_device_active (&dev->mt76.mmio.wed)) +mtk_wed_device_stop (&dev->mt76.mmio.wed); +mt76_wr (dev,MT_MCU_INT_EVENT ,MT_MCU_INT_EVENT_DMA_STOPPED );if (mt7915_wait_reset_state (dev,MT_MCU_CMD_RESET_DONE )) {
Signature · 1 line
2.43.0
Felix Fietkau
maintainerPATCH 4/5 wifi: mt76: mt7915: add locking for accessing mapped registers
In reply to Felix FietkauFrom: Shayne Chen <[email protected]>
Sicne the mapping is global, mapped register access needs to be protected against concurrent access, otherwise a race condition might cause the reads or writes to go towards the wrong register
--- .../net/wireless/mediatek/mt76/mt7915/mmio.c | 45 ++++++++++++++++--- .../wireless/mediatek/mt76/mt7915/mt7915.h | 1 + 2 files changed, 41 insertions(+), 5 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7915/mmio.c +40 -5
@@ -490,6 +490,11 @@ static u32 __mt7915_reg_addr(struct mt7915_dev *dev, u32 addr)return dev->reg.map[i].maps + ofs; } +return 0 ; +} + +static u32 __mt7915_reg_remap_addr (struct mt7915_dev *dev,u32 addr) +{if ((addr >=MT_INFRA_BASE && addr <MT_WFSYS0_PHY_START ) || (addr >=MT_WFSYS0_PHY_START && addr <MT_WFSYS1_PHY_START ) || (addr >=MT_WFSYS1_PHY_START && addr <=MT_WFSYS1_PHY_END ))
@@ -514,15 +519,30 @@ void mt7915_memcpy_fromio(struct mt7915_dev *dev, void *buf, u32 offset, {u32 addr =__mt7915_reg_addr (dev, offset); -memcpy_fromio (buf, dev->mt76.mmio.regs + addr, len); +if (addr) { +memcpy_fromio (buf, dev->mt76.mmio.regs + addr, len); +return ; + } + +spin_lock_bh (&dev->reg_lock); +memcpy_fromio (buf, dev->mt76.mmio.regs + +__mt7915_reg_remap_addr (dev, offset), len); +spin_unlock_bh (&dev->reg_lock); }static u32 mt7915_rr (struct mt76_dev *mdev,u32 offset) { struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76); -u32 addr =__mt7915_reg_addr (dev, offset); +u32 addr =__mt7915_reg_addr (dev, offset), val; -return dev->bus_ops->rr (mdev, addr); +if (addr) +return dev->bus_ops->rr (mdev, addr); + +spin_lock_bh (&dev->reg_lock); + val = dev->bus_ops->rr (mdev,__mt7915_reg_remap_addr (dev, offset)); +spin_unlock_bh (&dev->reg_lock); + +return val; }static void mt7915_wr (struct mt76_dev *mdev,u32 offset,u32 val)
@@ -530,7 +550,14 @@ static void mt7915_wr(struct mt76_dev *mdev, u32 offset, u32 val) struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);u32 addr =__mt7915_reg_addr (dev, offset); - dev->bus_ops->wr (mdev, addr, val); +if (addr) { + dev->bus_ops->wr (mdev, addr, val); +return ; + } + +spin_lock_bh (&dev->reg_lock); + dev->bus_ops->wr (mdev,__mt7915_reg_remap_addr (dev, offset), val); +spin_unlock_bh (&dev->reg_lock); }static u32 mt7915_rmw (struct mt76_dev *mdev,u32 offset,u32 mask,u32 val)
@@ -538,7 +565,14 @@ static u32 mt7915_rmw(struct mt76_dev *mdev, u32 offset, u32 mask, u32 val) struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76);u32 addr =__mt7915_reg_addr (dev, offset); -return dev->bus_ops->rmw (mdev, addr, mask, val); +if (addr) +return dev->bus_ops->rmw (mdev, addr, mask, val); + +spin_lock_bh (&dev->reg_lock); + val = dev->bus_ops->rmw (mdev,__mt7915_reg_remap_addr (dev, offset), mask, val); +spin_unlock_bh (&dev->reg_lock); + +return val; }#ifdef CONFIG_NET_MEDIATEK_SOC_WED
@@ -707,6 +741,7 @@ static int mt7915_mmio_init(struct mt76_dev *mdev, dev = container_of(mdev, struct mt7915_dev, mt76);mt76_mmio_init (&dev->mt76, mem_base); +spin_lock_init (&dev->reg_lock);switch (device_id) {case 0x7915 :
drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h +1 -0
@@ -287,6 +287,7 @@ struct mt7915_dev {struct list_head sta_rc_list;struct list_head twt_list; +spinlock_t reg_lock;u32 hw_pattern;
Signature · 1 line
2.43.0
Felix Fietkau
maintainerPATCH 5/5 wifi: mt76: mt7915: update mt798x_wmac_adie_patch_7976
In reply to Felix FietkauFrom: Peter Chiu <[email protected]>
Add support for a newer ADIE version
--- drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/soc.c +2 -1
@@ -516,7 +516,8 @@ static int mt798x_wmac_adie_patch_7976(struct mt7915_dev *dev, u8 adie)if (ret)return ret; -if (version ==0x8a00 || version ==0x8a10 || version ==0x8b00 ) { +if (version ==0x8a00 || version ==0x8a10 || + version ==0x8b00 || version ==0x8c10 ) { rg_xo_01 =0x1d59080f ; rg_xo_03 =0x34c00fe0 ; }else {
Signature · 1 line
2.43.0