]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: ath12k: add WoW net-detect functionality
authorBaochen Qiang <quic_bqiang@quicinc.com>
Tue, 4 Jun 2024 05:54:03 +0000 (13:54 +0800)
committerKalle Valo <quic_kvalo@quicinc.com>
Mon, 24 Jun 2024 16:31:46 +0000 (19:31 +0300)
Implement net-detect feature by setting flag
WIPHY_WOWLAN_NET_DETECT if firmware supports this
feature. Driver sets the related PNO configuration
to firmware before entering WoW and firmware then
scans periodically and wakes up host if a specific
SSID is found.

Note that firmware crashes if we enable it for both
P2P vdev and station vdev simultaneously because
firmware can only support one vdev at a time. Since
there is rare scenario for a P2P vdev to do net-detect,
skip it for P2P vdevs.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4

Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://patch.msgid.link/20240604055407.12506-5-quic_bqiang@quicinc.com
drivers/net/wireless/ath/ath12k/core.h
drivers/net/wireless/ath/ath12k/mac.c
drivers/net/wireless/ath/ath12k/wmi.c
drivers/net/wireless/ath/ath12k/wmi.h
drivers/net/wireless/ath/ath12k/wow.c

index 2fd08648cef32358ec31ad61a41cf1b4a03a6aa5..81c4bfe7792fc4a036f323acd1d5c32b549df0bb 100644 (file)
@@ -630,6 +630,8 @@ struct ath12k {
 
        u32 freq_low;
        u32 freq_high;
+
+       bool nlo_enabled;
 };
 
 struct ath12k_hw {
index 59662ca241cad1fa057a245bdbf26e1f9a086b50..cd8fb3797eea0c3eb6c2f501c8e6eb86a2461699 100644 (file)
@@ -9108,6 +9108,18 @@ static int ath12k_mac_hw_register(struct ath12k_hw *ah)
                ieee80211_hw_set(hw, SUPPORT_FAST_XMIT);
        }
 
+       if (test_bit(WMI_TLV_SERVICE_NLO, ar->wmi->wmi_ab->svc_map)) {
+               wiphy->max_sched_scan_ssids = WMI_PNO_MAX_SUPP_NETWORKS;
+               wiphy->max_match_sets = WMI_PNO_MAX_SUPP_NETWORKS;
+               wiphy->max_sched_scan_ie_len = WMI_PNO_MAX_IE_LENGTH;
+               wiphy->max_sched_scan_plans = WMI_PNO_MAX_SCHED_SCAN_PLANS;
+               wiphy->max_sched_scan_plan_interval =
+                                       WMI_PNO_MAX_SCHED_SCAN_PLAN_INT;
+               wiphy->max_sched_scan_plan_iterations =
+                                       WMI_PNO_MAX_SCHED_SCAN_PLAN_ITRNS;
+               wiphy->features |= NL80211_FEATURE_ND_RANDOM_MAC_ADDR;
+       }
+
        ret = ath12k_wow_init(ar);
        if (ret) {
                ath12k_warn(ar->ab, "failed to init wow: %d\n", ret);
index f72ec153723ce578b3c2cad1acf7fdc74fa7db43..b69f20495ab4b5fe7bc23f6c67499b951e1baf4f 100644 (file)
@@ -7607,3 +7607,148 @@ int ath12k_wmi_wow_del_pattern(struct ath12k *ar, u32 vdev_id, u32 pattern_id)
 
        return ath12k_wmi_cmd_send(ar->wmi, skb, WMI_WOW_DEL_WAKE_PATTERN_CMDID);
 }
+
+static struct sk_buff *
+ath12k_wmi_op_gen_config_pno_start(struct ath12k *ar, u32 vdev_id,
+                                  struct wmi_pno_scan_req_arg *pno)
+{
+       struct nlo_configured_params *nlo_list;
+       size_t len, nlo_list_len, channel_list_len;
+       struct wmi_wow_nlo_config_cmd *cmd;
+       __le32 *channel_list;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+       void *ptr;
+       u32 i;
+
+       len = sizeof(*cmd) +
+             sizeof(*tlv) +
+             /* TLV place holder for array of structures
+              * nlo_configured_params(nlo_list)
+              */
+             sizeof(*tlv);
+             /* TLV place holder for array of uint32 channel_list */
+
+       channel_list_len = sizeof(u32) * pno->a_networks[0].channel_count;
+       len += channel_list_len;
+
+       nlo_list_len = sizeof(*nlo_list) * pno->uc_networks_count;
+       len += nlo_list_len;
+
+       skb = ath12k_wmi_alloc_skb(ar->wmi->wmi_ab, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ptr = skb->data;
+       cmd = ptr;
+       cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_NLO_CONFIG_CMD, sizeof(*cmd));
+
+       cmd->vdev_id = cpu_to_le32(pno->vdev_id);
+       cmd->flags = cpu_to_le32(WMI_NLO_CONFIG_START | WMI_NLO_CONFIG_SSID_HIDE_EN);
+
+       /* current FW does not support min-max range for dwell time */
+       cmd->active_dwell_time = cpu_to_le32(pno->active_max_time);
+       cmd->passive_dwell_time = cpu_to_le32(pno->passive_max_time);
+
+       if (pno->do_passive_scan)
+               cmd->flags |= cpu_to_le32(WMI_NLO_CONFIG_SCAN_PASSIVE);
+
+       cmd->fast_scan_period = cpu_to_le32(pno->fast_scan_period);
+       cmd->slow_scan_period = cpu_to_le32(pno->slow_scan_period);
+       cmd->fast_scan_max_cycles = cpu_to_le32(pno->fast_scan_max_cycles);
+       cmd->delay_start_time = cpu_to_le32(pno->delay_start_time);
+
+       if (pno->enable_pno_scan_randomization) {
+               cmd->flags |= cpu_to_le32(WMI_NLO_CONFIG_SPOOFED_MAC_IN_PROBE_REQ |
+                                         WMI_NLO_CONFIG_RANDOM_SEQ_NO_IN_PROBE_REQ);
+               ether_addr_copy(cmd->mac_addr.addr, pno->mac_addr);
+               ether_addr_copy(cmd->mac_mask.addr, pno->mac_addr_mask);
+       }
+
+       ptr += sizeof(*cmd);
+
+       /* nlo_configured_params(nlo_list) */
+       cmd->no_of_ssids = cpu_to_le32(pno->uc_networks_count);
+       tlv = ptr;
+       tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, nlo_list_len);
+
+       ptr += sizeof(*tlv);
+       nlo_list = ptr;
+       for (i = 0; i < pno->uc_networks_count; i++) {
+               tlv = (struct wmi_tlv *)(&nlo_list[i].tlv_header);
+               tlv->header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_ARRAY_BYTE,
+                                                    sizeof(*nlo_list));
+
+               nlo_list[i].ssid.valid = cpu_to_le32(1);
+               nlo_list[i].ssid.ssid.ssid_len =
+                       cpu_to_le32(pno->a_networks[i].ssid.ssid_len);
+               memcpy(nlo_list[i].ssid.ssid.ssid,
+                      pno->a_networks[i].ssid.ssid,
+                      le32_to_cpu(nlo_list[i].ssid.ssid.ssid_len));
+
+               if (pno->a_networks[i].rssi_threshold &&
+                   pno->a_networks[i].rssi_threshold > -300) {
+                       nlo_list[i].rssi_cond.valid = cpu_to_le32(1);
+                       nlo_list[i].rssi_cond.rssi =
+                                       cpu_to_le32(pno->a_networks[i].rssi_threshold);
+               }
+
+               nlo_list[i].bcast_nw_type.valid = cpu_to_le32(1);
+               nlo_list[i].bcast_nw_type.bcast_nw_type =
+                                       cpu_to_le32(pno->a_networks[i].bcast_nw_type);
+       }
+
+       ptr += nlo_list_len;
+       cmd->num_of_channels = cpu_to_le32(pno->a_networks[0].channel_count);
+       tlv = ptr;
+       tlv->header =  ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, channel_list_len);
+       ptr += sizeof(*tlv);
+       channel_list = ptr;
+
+       for (i = 0; i < pno->a_networks[0].channel_count; i++)
+               channel_list[i] = cpu_to_le32(pno->a_networks[0].channels[i]);
+
+       ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "wmi tlv start pno config vdev_id %d\n",
+                  vdev_id);
+
+       return skb;
+}
+
+static struct sk_buff *ath12k_wmi_op_gen_config_pno_stop(struct ath12k *ar,
+                                                        u32 vdev_id)
+{
+       struct wmi_wow_nlo_config_cmd *cmd;
+       struct sk_buff *skb;
+       size_t len;
+
+       len = sizeof(*cmd);
+       skb = ath12k_wmi_alloc_skb(ar->wmi->wmi_ab, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       cmd = (struct wmi_wow_nlo_config_cmd *)skb->data;
+       cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_NLO_CONFIG_CMD, len);
+
+       cmd->vdev_id = cpu_to_le32(vdev_id);
+       cmd->flags = cpu_to_le32(WMI_NLO_CONFIG_STOP);
+
+       ath12k_dbg(ar->ab, ATH12K_DBG_WMI,
+                  "wmi tlv stop pno config vdev_id %d\n", vdev_id);
+       return skb;
+}
+
+int ath12k_wmi_wow_config_pno(struct ath12k *ar, u32 vdev_id,
+                             struct wmi_pno_scan_req_arg  *pno_scan)
+{
+       struct sk_buff *skb;
+
+       if (pno_scan->enable)
+               skb = ath12k_wmi_op_gen_config_pno_start(ar, vdev_id, pno_scan);
+       else
+               skb = ath12k_wmi_op_gen_config_pno_stop(ar, vdev_id);
+
+       if (IS_ERR_OR_NULL(skb))
+               return -ENOMEM;
+
+       return ath12k_wmi_cmd_send(ar->wmi, skb, WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID);
+}
index 6cb06f6f7df45c38056f4c0bd2d85daf02be9d49..0842ab760f2b258461607eeddbc22b4687774351 100644 (file)
@@ -5130,6 +5130,170 @@ struct wmi_wow_ev_arg {
        enum wmi_wow_wake_reason wake_reason;
 };
 
+#define WMI_PNO_MAX_SCHED_SCAN_PLANS      2
+#define WMI_PNO_MAX_SCHED_SCAN_PLAN_INT   7200
+#define WMI_PNO_MAX_SCHED_SCAN_PLAN_ITRNS 100
+#define WMI_PNO_MAX_NETW_CHANNELS         26
+#define WMI_PNO_MAX_NETW_CHANNELS_EX      60
+#define WMI_PNO_MAX_SUPP_NETWORKS         WLAN_SCAN_PARAMS_MAX_SSID
+#define WMI_PNO_MAX_IE_LENGTH             WLAN_SCAN_PARAMS_MAX_IE_LEN
+
+/* size based of dot11 declaration without extra IEs as we will not carry those for PNO */
+#define WMI_PNO_MAX_PB_REQ_SIZE    450
+
+#define WMI_PNO_24GHZ_DEFAULT_CH     1
+#define WMI_PNO_5GHZ_DEFAULT_CH      36
+
+#define WMI_ACTIVE_MAX_CHANNEL_TIME 40
+#define WMI_PASSIVE_MAX_CHANNEL_TIME   110
+
+/* SSID broadcast type */
+enum wmi_ssid_bcast_type {
+       BCAST_UNKNOWN      = 0,
+       BCAST_NORMAL       = 1,
+       BCAST_HIDDEN       = 2,
+};
+
+#define WMI_NLO_MAX_SSIDS    16
+#define WMI_NLO_MAX_CHAN     48
+
+#define WMI_NLO_CONFIG_STOP                             BIT(0)
+#define WMI_NLO_CONFIG_START                            BIT(1)
+#define WMI_NLO_CONFIG_RESET                            BIT(2)
+#define WMI_NLO_CONFIG_SLOW_SCAN                        BIT(4)
+#define WMI_NLO_CONFIG_FAST_SCAN                        BIT(5)
+#define WMI_NLO_CONFIG_SSID_HIDE_EN                     BIT(6)
+
+/* This bit is used to indicate if EPNO or supplicant PNO is enabled.
+ * Only one of them can be enabled at a given time
+ */
+#define WMI_NLO_CONFIG_ENLO                             BIT(7)
+#define WMI_NLO_CONFIG_SCAN_PASSIVE                     BIT(8)
+#define WMI_NLO_CONFIG_ENLO_RESET                       BIT(9)
+#define WMI_NLO_CONFIG_SPOOFED_MAC_IN_PROBE_REQ         BIT(10)
+#define WMI_NLO_CONFIG_RANDOM_SEQ_NO_IN_PROBE_REQ       BIT(11)
+#define WMI_NLO_CONFIG_ENABLE_IE_WHITELIST_IN_PROBE_REQ BIT(12)
+#define WMI_NLO_CONFIG_ENABLE_CNLO_RSSI_CONFIG          BIT(13)
+
+struct wmi_nlo_ssid_params {
+       __le32 valid;
+       struct ath12k_wmi_ssid_params ssid;
+} __packed;
+
+struct wmi_nlo_enc_params {
+       __le32 valid;
+       __le32 enc_type;
+} __packed;
+
+struct wmi_nlo_auth_params {
+       __le32 valid;
+       __le32 auth_type;
+} __packed;
+
+struct wmi_nlo_bcast_nw_params {
+       __le32 valid;
+       __le32 bcast_nw_type;
+} __packed;
+
+struct wmi_nlo_rssi_params {
+       __le32 valid;
+       __le32 rssi;
+} __packed;
+
+struct nlo_configured_params {
+       /* TLV tag and len;*/
+       __le32 tlv_header;
+       struct wmi_nlo_ssid_params ssid;
+       struct wmi_nlo_enc_params enc_type;
+       struct wmi_nlo_auth_params auth_type;
+       struct wmi_nlo_rssi_params rssi_cond;
+
+       /* indicates if the SSID is hidden or not */
+       struct wmi_nlo_bcast_nw_params bcast_nw_type;
+} __packed;
+
+struct wmi_network_type_arg {
+       struct cfg80211_ssid ssid;
+       u32 authentication;
+       u32 encryption;
+       u32 bcast_nw_type;
+       u8 channel_count;
+       u16 channels[WMI_PNO_MAX_NETW_CHANNELS_EX];
+       s32 rssi_threshold;
+};
+
+struct wmi_pno_scan_req_arg {
+       u8 enable;
+       u8 vdev_id;
+       u8 uc_networks_count;
+       struct wmi_network_type_arg a_networks[WMI_PNO_MAX_SUPP_NETWORKS];
+       u32 fast_scan_period;
+       u32 slow_scan_period;
+       u8 fast_scan_max_cycles;
+
+       bool do_passive_scan;
+
+       u32 delay_start_time;
+       u32 active_min_time;
+       u32 active_max_time;
+       u32 passive_min_time;
+       u32 passive_max_time;
+
+       /* mac address randomization attributes */
+       u32 enable_pno_scan_randomization;
+       u8 mac_addr[ETH_ALEN];
+       u8 mac_addr_mask[ETH_ALEN];
+};
+
+struct wmi_wow_nlo_config_cmd {
+       __le32 tlv_header;
+       __le32 flags;
+       __le32 vdev_id;
+       __le32 fast_scan_max_cycles;
+       __le32 active_dwell_time;
+       __le32 passive_dwell_time;
+       __le32 probe_bundle_size;
+
+       /* ART = IRT */
+       __le32 rest_time;
+
+       /* max value that can be reached after scan_backoff_multiplier */
+       __le32 max_rest_time;
+
+       __le32 scan_backoff_multiplier;
+       __le32 fast_scan_period;
+
+       /* specific to windows */
+       __le32 slow_scan_period;
+
+       __le32 no_of_ssids;
+
+       __le32 num_of_channels;
+
+       /* NLO scan start delay time in milliseconds */
+       __le32 delay_start_time;
+
+       /* MAC Address to use in Probe Req as SA */
+       struct ath12k_wmi_mac_addr_params mac_addr;
+
+       /* Mask on which MAC has to be randomized */
+       struct ath12k_wmi_mac_addr_params mac_mask;
+
+       /* IE bitmap to use in Probe Req */
+       __le32 ie_bitmap[8];
+
+       /* Number of vendor OUIs. In the TLV vendor_oui[] */
+       __le32 num_vendor_oui;
+
+       /* Number of connected NLO band preferences */
+       __le32 num_cnlo_band_pref;
+
+       /* The TLVs will follow.
+        * nlo_configured_params nlo_list[];
+        * u32 channel_list[num_of_channels];
+        */
+} __packed;
+
 void ath12k_wmi_init_qcn9274(struct ath12k_base *ab,
                             struct ath12k_wmi_resource_config_arg *config);
 void ath12k_wmi_init_wcn7850(struct ath12k_base *ab,
@@ -5291,4 +5455,6 @@ int ath12k_wmi_wow_add_pattern(struct ath12k *ar, u32 vdev_id, u32 pattern_id,
 int ath12k_wmi_wow_add_wakeup_event(struct ath12k *ar, u32 vdev_id,
                                    enum wmi_wow_wakeup_event event,
                                    u32 enable);
+int ath12k_wmi_wow_config_pno(struct ath12k *ar, u32 vdev_id,
+                             struct wmi_pno_scan_req_arg  *pno_scan);
 #endif
index 648e7cb970ea3eb8105d8756a08e91a81c675263..5d4f11028403f62810874e8912eecae7edb3538b 100644 (file)
@@ -23,6 +23,13 @@ static const struct wiphy_wowlan_support ath12k_wowlan_support = {
        .max_pkt_offset = WOW_MAX_PKT_OFFSET,
 };
 
+static inline bool ath12k_wow_is_p2p_vdev(struct ath12k_vif *arvif)
+{
+       return (arvif->vdev_subtype == WMI_VDEV_SUBTYPE_P2P_DEVICE ||
+               arvif->vdev_subtype == WMI_VDEV_SUBTYPE_P2P_CLIENT ||
+               arvif->vdev_subtype == WMI_VDEV_SUBTYPE_P2P_GO);
+}
+
 int ath12k_wow_enable(struct ath12k *ar)
 {
        struct ath12k_base *ab = ar->ab;
@@ -247,7 +254,101 @@ ath12k_wow_convert_8023_to_80211(struct ath12k *ar,
        i80211_pattern->pkt_offset = pkt_ofs;
 }
 
-static int ath12k_vif_wow_set_wakeups(struct ath12k_vif *arvif,
+static int
+ath12k_wow_pno_check_and_convert(struct ath12k *ar, u32 vdev_id,
+                                const struct cfg80211_sched_scan_request *nd_config,
+                                struct wmi_pno_scan_req_arg *pno)
+{
+       int i, j;
+       u8 ssid_len;
+
+       pno->enable = 1;
+       pno->vdev_id = vdev_id;
+       pno->uc_networks_count = nd_config->n_match_sets;
+
+       if (!pno->uc_networks_count ||
+           pno->uc_networks_count > WMI_PNO_MAX_SUPP_NETWORKS)
+               return -EINVAL;
+
+       if (nd_config->n_channels > WMI_PNO_MAX_NETW_CHANNELS_EX)
+               return -EINVAL;
+
+       /* Filling per profile params */
+       for (i = 0; i < pno->uc_networks_count; i++) {
+               ssid_len = nd_config->match_sets[i].ssid.ssid_len;
+
+               if (ssid_len == 0 || ssid_len > 32)
+                       return -EINVAL;
+
+               pno->a_networks[i].ssid.ssid_len = ssid_len;
+
+               memcpy(pno->a_networks[i].ssid.ssid,
+                      nd_config->match_sets[i].ssid.ssid,
+                      ssid_len);
+               pno->a_networks[i].authentication = 0;
+               pno->a_networks[i].encryption     = 0;
+               pno->a_networks[i].bcast_nw_type  = 0;
+
+               /* Copying list of valid channel into request */
+               pno->a_networks[i].channel_count = nd_config->n_channels;
+               pno->a_networks[i].rssi_threshold = nd_config->match_sets[i].rssi_thold;
+
+               for (j = 0; j < nd_config->n_channels; j++) {
+                       pno->a_networks[i].channels[j] =
+                                       nd_config->channels[j]->center_freq;
+               }
+       }
+
+       /* set scan to passive if no SSIDs are specified in the request */
+       if (nd_config->n_ssids == 0)
+               pno->do_passive_scan = true;
+       else
+               pno->do_passive_scan = false;
+
+       for (i = 0; i < nd_config->n_ssids; i++) {
+               for (j = 0; j < pno->uc_networks_count; j++) {
+                       if (pno->a_networks[j].ssid.ssid_len ==
+                               nd_config->ssids[i].ssid_len &&
+                           !memcmp(pno->a_networks[j].ssid.ssid,
+                                   nd_config->ssids[i].ssid,
+                                   pno->a_networks[j].ssid.ssid_len)) {
+                               pno->a_networks[j].bcast_nw_type = BCAST_HIDDEN;
+                               break;
+                       }
+               }
+       }
+
+       if (nd_config->n_scan_plans == 2) {
+               pno->fast_scan_period = nd_config->scan_plans[0].interval * MSEC_PER_SEC;
+               pno->fast_scan_max_cycles = nd_config->scan_plans[0].iterations;
+               pno->slow_scan_period =
+                       nd_config->scan_plans[1].interval * MSEC_PER_SEC;
+       } else if (nd_config->n_scan_plans == 1) {
+               pno->fast_scan_period = nd_config->scan_plans[0].interval * MSEC_PER_SEC;
+               pno->fast_scan_max_cycles = 1;
+               pno->slow_scan_period = nd_config->scan_plans[0].interval * MSEC_PER_SEC;
+       } else {
+               ath12k_warn(ar->ab, "Invalid number of PNO scan plans: %d",
+                           nd_config->n_scan_plans);
+       }
+
+       if (nd_config->flags & NL80211_SCAN_FLAG_RANDOM_ADDR) {
+               /* enable mac randomization */
+               pno->enable_pno_scan_randomization = 1;
+               memcpy(pno->mac_addr, nd_config->mac_addr, ETH_ALEN);
+               memcpy(pno->mac_addr_mask, nd_config->mac_addr_mask, ETH_ALEN);
+       }
+
+       pno->delay_start_time = nd_config->delay;
+
+       /* Current FW does not support min-max range for dwell time */
+       pno->active_max_time = WMI_ACTIVE_MAX_CHANNEL_TIME;
+       pno->passive_max_time = WMI_PASSIVE_MAX_CHANNEL_TIME;
+
+       return 0;
+}
+
+static int ath12k_wow_vif_set_wakeups(struct ath12k_vif *arvif,
                                      struct cfg80211_wowlan *wowlan)
 {
        const struct cfg80211_pkt_pattern *patterns = wowlan->patterns;
@@ -280,6 +381,26 @@ static int ath12k_vif_wow_set_wakeups(struct ath12k_vif *arvif,
 
                if (wowlan->magic_pkt)
                        __set_bit(WOW_MAGIC_PKT_RECVD_EVENT, &wow_mask);
+
+               if (wowlan->nd_config) {
+                       struct wmi_pno_scan_req_arg *pno;
+                       int ret;
+
+                       pno = kzalloc(sizeof(*pno), GFP_KERNEL);
+                       if (!pno)
+                               return -ENOMEM;
+
+                       ar->nlo_enabled = true;
+
+                       ret = ath12k_wow_pno_check_and_convert(ar, arvif->vdev_id,
+                                                              wowlan->nd_config, pno);
+                       if (!ret) {
+                               ath12k_wmi_wow_config_pno(ar, arvif->vdev_id, pno);
+                               __set_bit(WOW_NLO_DETECTED_EVENT, &wow_mask);
+                       }
+
+                       kfree(pno);
+               }
                break;
        default:
                break;
@@ -352,7 +473,9 @@ static int ath12k_wow_set_wakeups(struct ath12k *ar,
        lockdep_assert_held(&ar->conf_mutex);
 
        list_for_each_entry(arvif, &ar->arvifs, list) {
-               ret = ath12k_vif_wow_set_wakeups(arvif, wowlan);
+               if (ath12k_wow_is_p2p_vdev(arvif))
+                       continue;
+               ret = ath12k_wow_vif_set_wakeups(arvif, wowlan);
                if (ret) {
                        ath12k_warn(ar->ab, "failed to set wow wakeups on vdev %i: %d\n",
                                    arvif->vdev_id, ret);
@@ -363,6 +486,66 @@ static int ath12k_wow_set_wakeups(struct ath12k *ar,
        return 0;
 }
 
+static int ath12k_wow_vdev_clean_nlo(struct ath12k *ar, u32 vdev_id)
+{
+       struct wmi_pno_scan_req_arg *pno;
+       int ret;
+
+       if (!ar->nlo_enabled)
+               return 0;
+
+       pno = kzalloc(sizeof(*pno), GFP_KERNEL);
+       if (!pno)
+               return -ENOMEM;
+
+       pno->enable = 0;
+       ret = ath12k_wmi_wow_config_pno(ar, vdev_id, pno);
+       if (ret) {
+               ath12k_warn(ar->ab, "failed to disable PNO: %d", ret);
+               goto out;
+       }
+
+       ar->nlo_enabled = false;
+
+out:
+       kfree(pno);
+       return ret;
+}
+
+static int ath12k_wow_vif_clean_nlo(struct ath12k_vif *arvif)
+{
+       struct ath12k *ar = arvif->ar;
+
+       switch (arvif->vdev_type) {
+       case WMI_VDEV_TYPE_STA:
+               return ath12k_wow_vdev_clean_nlo(ar, arvif->vdev_id);
+       default:
+               return 0;
+       }
+}
+
+static int ath12k_wow_nlo_cleanup(struct ath12k *ar)
+{
+       struct ath12k_vif *arvif;
+       int ret;
+
+       lockdep_assert_held(&ar->conf_mutex);
+
+       list_for_each_entry(arvif, &ar->arvifs, list) {
+               if (ath12k_wow_is_p2p_vdev(arvif))
+                       continue;
+
+               ret = ath12k_wow_vif_clean_nlo(arvif);
+               if (ret) {
+                       ath12k_warn(ar->ab, "failed to clean nlo settings on vdev %i: %d\n",
+                                   arvif->vdev_id, ret);
+                       return ret;
+               }
+       }
+
+       return 0;
+}
+
 int ath12k_wow_op_suspend(struct ieee80211_hw *hw,
                          struct cfg80211_wowlan *wowlan)
 {
@@ -448,8 +631,16 @@ int ath12k_wow_op_resume(struct ieee80211_hw *hw)
        ath12k_hif_irq_enable(ar->ab);
 
        ret = ath12k_wow_wakeup(ar);
-       if (ret)
+       if (ret) {
                ath12k_warn(ar->ab, "failed to wakeup from wow: %d\n", ret);
+               goto exit;
+       }
+
+       ret = ath12k_wow_nlo_cleanup(ar);
+       if (ret) {
+               ath12k_warn(ar->ab, "failed to cleanup nlo: %d\n", ret);
+               goto exit;
+       }
 
 exit:
        if (ret) {
@@ -485,6 +676,11 @@ int ath12k_wow_init(struct ath12k *ar)
                ar->wow.wowlan_support.max_pkt_offset -= WOW_MAX_REDUCE;
        }
 
+       if (test_bit(WMI_TLV_SERVICE_NLO, ar->wmi->wmi_ab->svc_map)) {
+               ar->wow.wowlan_support.flags |= WIPHY_WOWLAN_NET_DETECT;
+               ar->wow.wowlan_support.max_nd_match_sets = WMI_PNO_MAX_SUPP_NETWORKS;
+       }
+
        ar->wow.max_num_patterns = ATH12K_WOW_PATTERNS;
        ar->wow.wowlan_support.n_patterns = ar->wow.max_num_patterns;
        ar->ah->hw->wiphy->wowlan = &ar->wow.wowlan_support;