Commit 193e5f22 authored by YN Chen's avatar YN Chen Committed by Felix Fietkau
Browse files

mt76: connac: fix WoW with disconnetion and bitmap pattern 



Update MCU command usage to fix WoW configuration with disconnection
and bitmap pattern and to avoid magic number.

Fixes: ffa1bf97 ("mt76: mt7921: introduce PM support")
Reviewed-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarYN Chen <yn.chen@mediatek.com>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 7bf0a71e

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

+7 −4
Original line number Diff line number Diff line
@@ -1979,7 +1979,7 @@ mt76_connac_mcu_set_wow_pattern(struct mt76_dev *dev, 
	ptlv->index = index;



	memcpy(ptlv->pattern, pattern->pattern, pattern->pattern_len);

	memcpy(ptlv->mask, pattern->mask, pattern->pattern_len / 8);

	memcpy(ptlv->mask, pattern->mask, DIV_ROUND_UP(pattern->pattern_len, 8));



	return mt76_mcu_skb_send_msg(dev, skb, MCU_UNI_CMD_SUSPEND, true);

}
@@ -2014,14 +2014,17 @@ mt76_connac_mcu_set_wow_ctrl(struct mt76_phy *phy, struct ieee80211_vif *vif, 
	};



	if (wowlan->magic_pkt)

		req.wow_ctrl_tlv.trigger |= BIT(0);

		req.wow_ctrl_tlv.trigger |= UNI_WOW_DETECT_TYPE_MAGIC;

	if (wowlan->disconnect)

		req.wow_ctrl_tlv.trigger |= BIT(2);

		req.wow_ctrl_tlv.trigger |= (UNI_WOW_DETECT_TYPE_DISCONNECT |

					     UNI_WOW_DETECT_TYPE_BCN_LOST);

	if (wowlan->nd_config) {

		mt76_connac_mcu_sched_scan_req(phy, vif, wowlan->nd_config);

		req.wow_ctrl_tlv.trigger |= BIT(5);

		req.wow_ctrl_tlv.trigger |= UNI_WOW_DETECT_TYPE_SCH_SCAN_HIT;

		mt76_connac_mcu_sched_scan_enable(phy, vif, suspend);

	}

	if (wowlan->n_patterns)

		req.wow_ctrl_tlv.trigger |= UNI_WOW_DETECT_TYPE_BITMAP;



	if (mt76_is_mmio(dev))

		req.wow_ctrl_tlv.wakeup_hif = WOW_PCIE;

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h

+8 −0
Original line number Diff line number Diff line
@@ -590,6 +590,14 @@ enum { 
	UNI_OFFLOAD_OFFLOAD_BMC_RPY_DETECT,

};



#define UNI_WOW_DETECT_TYPE_MAGIC		BIT(0)

#define UNI_WOW_DETECT_TYPE_ANY			BIT(1)

#define UNI_WOW_DETECT_TYPE_DISCONNECT		BIT(2)

#define UNI_WOW_DETECT_TYPE_GTK_REKEY_FAIL	BIT(3)

#define UNI_WOW_DETECT_TYPE_BCN_LOST		BIT(4)

#define UNI_WOW_DETECT_TYPE_SCH_SCAN_HIT	BIT(5)

#define UNI_WOW_DETECT_TYPE_BITMAP		BIT(6)



enum {

	UNI_SUSPEND_MODE_SETTING,

	UNI_SUSPEND_WOW_CTRL,