Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c8b0a33 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: mt76x02: set MT_TXOP_HLDR_TX40M_BLK_EN for mt76x2 



It needs to be always enabled for 76x2 and conditionally enabled/disabled
for 76x0. Since mt76x2_mac_stop clears this bit, ensure that it is enabled
in mt76x02_edcca_init

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 2858f60a

drivers/net/wireless/mediatek/mt76/mt76x02_mac.c

+3 −3
Original line number Diff line number Diff line
@@ -905,14 +905,14 @@ void mt76x02_edcca_init(struct mt76x02_dev *dev, bool enable) 
		mt76_set(dev, MT_TXOP_CTRL_CFG, MT_TXOP_ED_CCA_EN);

		mt76_rmw(dev, MT_BBP(AGC, 2), GENMASK(15, 0),

			 ed_th << 8 | ed_th);

		if (!is_mt76x2(dev))

			mt76_set(dev, MT_TXOP_HLDR_ET,

				 MT_TXOP_HLDR_TX40M_BLK_EN);

		mt76_set(dev, MT_TXOP_HLDR_ET, MT_TXOP_HLDR_TX40M_BLK_EN);

	} else {

		mt76_set(dev, MT_TX_LINK_CFG, MT_TX_CFACK_EN);

		mt76_clear(dev, MT_TXOP_CTRL_CFG, MT_TXOP_ED_CCA_EN);

		if (is_mt76x2(dev)) {

			mt76_wr(dev, MT_BBP(AGC, 2), 0x00007070);

			mt76_set(dev, MT_TXOP_HLDR_ET,

				 MT_TXOP_HLDR_TX40M_BLK_EN);

		} else {

			mt76_wr(dev, MT_BBP(AGC, 2), 0x003a6464);

			mt76_clear(dev, MT_TXOP_HLDR_ET,