mt76: mt7915: switch proper tx arbiter mode in testmode
Subsystems (3)
Shayne Chen
reviewerPATCH 1/2 mt76: mt7915: switch proper tx arbiter mode in testmode
Switch proper tx arbiter mode during testmode tx to prevent from entering the flow of normal tx in FW.
Also, testmode SU and MU tx need to use different arbiter mode.
Signed-off-by Shayne Chen <[email protected]>
--- .../net/wireless/mediatek/mt76/mt7915/mcu.h | 1 + .../wireless/mediatek/mt76/mt7915/testmode.c | 29 +++++++++++++++++++ .../wireless/mediatek/mt76/mt7915/testmode.h | 10 +++++++ 3 files changed, 40 insertions(+)
drivers/net/wireless/mediatek/mt76/mt7915/mcu.h +1 -0
@@ -278,6 +278,7 @@ enum {MCU_EXT_CMD_SCS_CTRL =0x82 ,MCU_EXT_CMD_FW_DBG_CTRL =0x95 ,MCU_EXT_CMD_SET_RDD_TH =0x9d , +MCU_EXT_CMD_MURU_CTRL =0x9f ,MCU_EXT_CMD_SET_SPR =0xa8 ,MCU_EXT_CMD_GROUP_PRE_CAL_INFO =0xab , MCU_EXT_CMD_DPD_PRE_CAL_INFO = 0xac,
drivers/net/wireless/mediatek/mt76/mt7915/testmode.c +29 -0
@@ -165,6 +165,28 @@ mt7915_tm_set_slot_time(struct mt7915_phy *phy, u8 slot_time, u8 sifs) sizeof(req), false); } +static int +mt7915_tm_set_tam_arb (struct mt7915_phy *phy,bool enable,bool mu) +{ +struct mt7915_dev *dev = phy->dev; +struct { +__le32 cmd; +u8 op_mode; + } __packed req = { + .cmd =cpu_to_le32 (MURU_SET_ARB_OP_MODE ), + }; + +if (!enable) + req.op_mode =TAM_ARB_OP_MODE_NORMAL ; +else if (mu) + req.op_mode =TAM_ARB_OP_MODE_TEST ; +else + req.op_mode =TAM_ARB_OP_MODE_FORCE_SU ; + +return mt76_mcu_send_msg (&dev->mt76,MCU_EXT_CMD (MURU_CTRL ), &req, +sizeof (req), false); +} +static int mt7915_tm_set_wmm_qid (struct mt7915_dev *dev,u8 qid,u8 aifs,u8 cw_min,u16 cw_max,u16 txop)
@@ -397,6 +419,10 @@ mt7915_tm_init(struct mt7915_phy *phy, bool en)mt7915_tm_set_trx (phy,TM_MAC_TXRX , !en);mt7915_mcu_add_bss_info (phy, phy->monitor_vif, en); +mt7915_mcu_add_sta (dev, phy->monitor_vif,NULL , en); + +if (!en) +mt7915_tm_set_tam_arb (phy, en,0 ); } static void
@@ -438,6 +464,9 @@ mt7915_tm_set_tx_frames(struct mt7915_phy *phy, bool en) } } +mt7915_tm_set_tam_arb (phy, en, + td->tx_rate_mode ==MT76_TM_TX_MODE_HE_MU ); +/* if all three params are set, duty_cycle will be ignored */ if (duty_cycle && tx_time && !ipg) { ipg = tx_time *100 / duty_cycle - tx_time;
drivers/net/wireless/mediatek/mt76/mt7915/testmode.h +10 -0
@@ -96,4 +96,14 @@ enum { RF_OPER_WIFI_SPECTRUM, }; +enum { +TAM_ARB_OP_MODE_NORMAL =1 , +TAM_ARB_OP_MODE_TEST , +TAM_ARB_OP_MODE_FORCE_SU =5 , +}; + +enum { +MURU_SET_ARB_OP_MODE =14 , +}; +#endif
Signature · 1 line
2.25.1
Shayne Chen
reviewerPATCH 2/2 mt76: mt7915: fix bit fields for HT rate idx
The bit fields of tx rate idx should be 6 bits, otherwise it might be incorrect in HT mode.
For VHT/HE rates, only 4 bits are actually used by rate idx, the other 2 bits are used for other functions.
Fixes c31d94af1843 ("mt76: mt7915: fix tx rate related fields in tx descriptor")
Signed-off-by Shayne Chen <[email protected]>
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7915/mac.h +2 -1
@@ -283,7 +283,8 @@ enum tx_mcu_port_q_idx {#define MT_TX_RATE_MODE GENMASK(9, 6)#define MT_TX_RATE_SU_EXT_TONE BIT(5)#define MT_TX_RATE_DCM BIT(4) -#define MT_TX_RATE_IDX GENMASK(3, 0) +/* VHT/HE only use bits 0-3 */ +#define MT_TX_RATE_IDX GENMASK(5, 0)#define MT_TXP_MAX_BUF_NUM 6
Signature · 1 line
2.25.1