Skip to content

Commit

Permalink
mt76: mt7915: clean hw queue before starting new testmode tx
Browse files Browse the repository at this point in the history
Add a testmode mcu command to clean up hw tx queue before a new
testmode tx starts.

Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
Shayne Chen authored and Felix Fietkau committed Jan 26, 2021
1 parent c46df37 commit 8efe387
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 0 deletions.
1 change: 1 addition & 0 deletions drivers/net/wireless/mediatek/mt76/mt7915/mcu.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ enum {
MCU_ATE_SET_TRX = 0x1,
MCU_ATE_SET_FREQ_OFFSET = 0xa,
MCU_ATE_SET_SLOT_TIME = 0x13,
MCU_ATE_CLEAN_TXQUEUE = 0x1c,
};

struct mt7915_mcu_rxd {
Expand Down
16 changes: 16 additions & 0 deletions drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,21 @@ mt7915_tm_set_trx(struct mt7915_phy *phy, int type, bool en)
sizeof(req), false);
}

static int
mt7915_tm_clean_hwq(struct mt7915_phy *phy, u8 wcid)
{
struct mt7915_dev *dev = phy->dev;
struct mt7915_tm_cmd req = {
.testmode_en = 1,
.param_idx = MCU_ATE_CLEAN_TXQUEUE,
.param.clean.wcid = wcid,
.param.clean.band = phy != &dev->phy,
};

return mt76_mcu_send_msg(&dev->mt76, MCU_EXT_CMD_ATE_CTRL, &req,
sizeof(req), false);
}

static int
mt7915_tm_set_slot_time(struct mt7915_phy *phy, u8 slot_time, u8 sifs)
{
Expand Down Expand Up @@ -408,6 +423,7 @@ mt7915_tm_set_tx_frames(struct mt7915_phy *phy, bool en)
u32 ipg = td->tx_ipg;

mt7915_tm_set_trx(phy, TM_MAC_RX_RXV, false);
mt7915_tm_clean_hwq(phy, dev->mt76.global_wcid.idx);

if (en) {
mutex_unlock(&dev->mt76.mutex);
Expand Down
8 changes: 8 additions & 0 deletions drivers/net/wireless/mediatek/mt76/mt7915/testmode.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,13 @@ struct mt7915_tm_slot_time {
u8 _rsv1[5];
};

struct mt7915_tm_clean_txq {
bool sta_pause;
u8 wcid; /* 256 sta */
u8 band;
u8 rsv;
};

struct mt7915_tm_cmd {
u8 testmode_en;
u8 param_idx;
Expand All @@ -35,6 +42,7 @@ struct mt7915_tm_cmd {
struct mt7915_tm_trx trx;
struct mt7915_tm_freq_offset freq;
struct mt7915_tm_slot_time slot;
struct mt7915_tm_clean_txq clean;
u8 test[72];
} param;
} __packed;
Expand Down

0 comments on commit 8efe387

Please sign in to comment.