ath11k: Add WoW net-detect functionality
authorCarl Huang <quic_cjhuang@quicinc.com>
Mon, 14 Mar 2022 05:18:16 +0000 (07:18 +0200)
committerKalle Valo <quic_kvalo@quicinc.com>
Fri, 18 Mar 2022 15:34:59 +0000 (17:34 +0200)
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.

Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1

Signed-off-by: Carl Huang <quic_cjhuang@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/1644308006-22784-3-git-send-email-quic_cjhuang@quicinc.com
drivers/net/wireless/ath/ath11k/core.h
drivers/net/wireless/ath/ath11k/mac.c
drivers/net/wireless/ath/ath11k/wmi.c
drivers/net/wireless/ath/ath11k/wmi.h
drivers/net/wireless/ath/ath11k/wow.c

index 7b658d4c7d19205990af4a737650b7260a10f20d..1f5e977aa97699da19730650d29ca2b4a8efb0d8 100644 (file)
@@ -617,6 +617,7 @@ struct ath11k {
        bool regdom_set_by_user;
        int hw_rate_code;
        u8 twt_enabled;
+       bool nlo_enabled;
 };
 
 struct ath11k_band_cap {
index a58e56ca9a99d72b995edd7c09be90ad6b9c7e08..7a6c758b8e459cb72cdefe2a978138ca5acd84af 100644 (file)
@@ -8498,6 +8498,18 @@ static int __ath11k_mac_register(struct ath11k *ar)
                        NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR;
        }
 
+       if (test_bit(WMI_TLV_SERVICE_NLO, ar->wmi->wmi_ab->svc_map)) {
+               ar->hw->wiphy->max_sched_scan_ssids = WMI_PNO_MAX_SUPP_NETWORKS;
+               ar->hw->wiphy->max_match_sets = WMI_PNO_MAX_SUPP_NETWORKS;
+               ar->hw->wiphy->max_sched_scan_ie_len = WMI_PNO_MAX_IE_LENGTH;
+               ar->hw->wiphy->max_sched_scan_plans = WMI_PNO_MAX_SCHED_SCAN_PLANS;
+               ar->hw->wiphy->max_sched_scan_plan_interval =
+                       WMI_PNO_MAX_SCHED_SCAN_PLAN_INT;
+               ar->hw->wiphy->max_sched_scan_plan_iterations =
+                       WMI_PNO_MAX_SCHED_SCAN_PLAN_ITRNS;
+               ar->hw->wiphy->features |= NL80211_FEATURE_ND_RANDOM_MAC_ADDR;
+       }
+
        ret = ath11k_wow_init(ar);
        if (ret) {
                ath11k_warn(ar->ab, "failed to init wow: %d\n", ret);
index 25222293f162e6b15993e93d562d2e930cc9ccbb..d4d34b932e0bb4d4dc26ddacf8a044bcdbfb5eaa 100644 (file)
@@ -8393,3 +8393,157 @@ int ath11k_wmi_wow_del_pattern(struct ath11k *ar, u32 vdev_id, u32 pattern_id)
 
        return ath11k_wmi_cmd_send(ar->wmi, skb, WMI_WOW_DEL_WAKE_PATTERN_CMDID);
 }
+
+static struct sk_buff *
+ath11k_wmi_op_gen_config_pno_start(struct ath11k *ar,
+                                  u32 vdev_id,
+                                      struct wmi_pno_scan_req *pno)
+{
+       struct nlo_configured_parameters *nlo_list;
+       struct wmi_wow_nlo_config_cmd *cmd;
+       struct wmi_tlv *tlv;
+       struct sk_buff *skb;
+       u32 *channel_list;
+       size_t len, nlo_list_len, channel_list_len;
+       u8 *ptr;
+       u32 i;
+
+       len = sizeof(*cmd) +
+             sizeof(*tlv) +
+             /* TLV place holder for array of structures
+              * nlo_configured_parameters(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 = ath11k_wmi_alloc_skb(ar->wmi->wmi_ab, len);
+       if (!skb)
+               return ERR_PTR(-ENOMEM);
+
+       ptr = (u8 *)skb->data;
+       cmd = (struct wmi_wow_nlo_config_cmd *)ptr;
+       cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_NLO_CONFIG_CMD) |
+                         FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE);
+
+       cmd->vdev_id = pno->vdev_id;
+       cmd->flags = 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 = pno->active_max_time;
+       cmd->passive_dwell_time = pno->passive_max_time;
+
+       if (pno->do_passive_scan)
+               cmd->flags |= WMI_NLO_CONFIG_SCAN_PASSIVE;
+
+       cmd->fast_scan_period = pno->fast_scan_period;
+       cmd->slow_scan_period = pno->slow_scan_period;
+       cmd->fast_scan_max_cycles = pno->fast_scan_max_cycles;
+       cmd->delay_start_time = pno->delay_start_time;
+
+       if (pno->enable_pno_scan_randomization) {
+               cmd->flags |= 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);
+               ath11k_ce_byte_swap(cmd->mac_addr.addr, 8);
+               ath11k_ce_byte_swap(cmd->mac_mask.addr, 8);
+       }
+
+       ptr += sizeof(*cmd);
+
+       /* nlo_configured_parameters(nlo_list) */
+       cmd->no_of_ssids = pno->uc_networks_count;
+       tlv = (struct wmi_tlv *)ptr;
+       tlv->header = FIELD_PREP(WMI_TLV_TAG,
+                                WMI_TAG_ARRAY_STRUCT) |
+                     FIELD_PREP(WMI_TLV_LEN, nlo_list_len);
+
+       ptr += sizeof(*tlv);
+       nlo_list = (struct nlo_configured_parameters *)ptr;
+       for (i = 0; i < cmd->no_of_ssids; i++) {
+               tlv = (struct wmi_tlv *)(&nlo_list[i].tlv_header);
+               tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) |
+                             FIELD_PREP(WMI_TLV_LEN, sizeof(*nlo_list) - sizeof(*tlv));
+
+               nlo_list[i].ssid.valid = true;
+               nlo_list[i].ssid.ssid.ssid_len = pno->a_networks[i].ssid.ssid_len;
+               memcpy(nlo_list[i].ssid.ssid.ssid,
+                      pno->a_networks[i].ssid.ssid,
+                      nlo_list[i].ssid.ssid.ssid_len);
+               ath11k_ce_byte_swap(nlo_list[i].ssid.ssid.ssid,
+                                   roundup(nlo_list[i].ssid.ssid.ssid_len, 4));
+
+               if (pno->a_networks[i].rssi_threshold &&
+                   pno->a_networks[i].rssi_threshold > -300) {
+                       nlo_list[i].rssi_cond.valid = true;
+                       nlo_list[i].rssi_cond.rssi =
+                               pno->a_networks[i].rssi_threshold;
+               }
+
+               nlo_list[i].bcast_nw_type.valid = true;
+               nlo_list[i].bcast_nw_type.bcast_nw_type =
+                       pno->a_networks[i].bcast_nw_type;
+       }
+
+       ptr += nlo_list_len;
+       cmd->num_of_channels = pno->a_networks[0].channel_count;
+       tlv = (struct wmi_tlv *)ptr;
+       tlv->header =  FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_UINT32) |
+                      FIELD_PREP(WMI_TLV_LEN, channel_list_len);
+       ptr += sizeof(*tlv);
+       channel_list = (u32 *)ptr;
+       for (i = 0; i < cmd->num_of_channels; i++)
+               channel_list[i] = pno->a_networks[0].channels[i];
+
+       ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "wmi tlv start pno config vdev_id %d\n",
+                  vdev_id);
+
+       return skb;
+}
+
+static struct sk_buff *ath11k_wmi_op_gen_config_pno_stop(struct ath11k *ar,
+                                                        u32 vdev_id)
+{
+       struct wmi_wow_nlo_config_cmd *cmd;
+       struct sk_buff *skb;
+       size_t len;
+
+       len = sizeof(*cmd);
+       skb = ath11k_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 = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_NLO_CONFIG_CMD) |
+                         FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE);
+
+       cmd->vdev_id = vdev_id;
+       cmd->flags = WMI_NLO_CONFIG_STOP;
+
+       ath11k_dbg(ar->ab, ATH11K_DBG_WMI,
+                  "wmi tlv stop pno config vdev_id %d\n", vdev_id);
+       return skb;
+}
+
+int ath11k_wmi_wow_config_pno(struct ath11k *ar, u32 vdev_id,
+                             struct wmi_pno_scan_req  *pno_scan)
+{
+       struct sk_buff *skb;
+
+       if (pno_scan->enable)
+               skb = ath11k_wmi_op_gen_config_pno_start(ar, vdev_id, pno_scan);
+       else
+               skb = ath11k_wmi_op_gen_config_pno_stop(ar, vdev_id);
+
+       if (IS_ERR_OR_NULL(skb))
+               return -ENOMEM;
+
+       return ath11k_wmi_cmd_send(ar->wmi, skb, WMI_NETWORK_LIST_OFFLOAD_CONFIG_CMDID);
+}
+
index b82f432a3d951c4cb3f299bd9967224076657fdf..9150e0555c6d9c290e423efd4d3387c4c3c47ce3 100644 (file)
@@ -5616,6 +5616,173 @@ struct wmi_wow_del_pattern_cmd {
        u32 pattern_type;
 } __packed;
 
+#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_24G_DEFAULT_CH     1
+#define WMI_PNO_5G_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_param {
+       u32 valid;
+       struct wmi_ssid ssid;
+} __packed;
+
+struct wmi_nlo_enc_param {
+       u32 valid;
+       u32 enc_type;
+} __packed;
+
+struct wmi_nlo_auth_param {
+       u32 valid;
+       u32 auth_type;
+} __packed;
+
+struct wmi_nlo_bcast_nw_param {
+       u32 valid;
+       u32 bcast_nw_type;
+} __packed;
+
+struct wmi_nlo_rssi_param {
+       u32 valid;
+       s32 rssi;
+} __packed;
+
+struct nlo_configured_parameters {
+       /* TLV tag and len;*/
+       u32 tlv_header;
+       struct wmi_nlo_ssid_param ssid;
+       struct wmi_nlo_enc_param enc_type;
+       struct wmi_nlo_auth_param auth_type;
+       struct wmi_nlo_rssi_param rssi_cond;
+
+       /* indicates if the SSID is hidden or not */
+       struct wmi_nlo_bcast_nw_param bcast_nw_type;
+} __packed;
+
+struct wmi_network_type {
+       struct wmi_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 {
+       u8 enable;
+       u8 vdev_id;
+       u8 uc_networks_count;
+       struct wmi_network_type 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 {
+       u32 tlv_header;
+       u32 flags;
+       u32 vdev_id;
+       u32 fast_scan_max_cycles;
+       u32 active_dwell_time;
+       u32 passive_dwell_time;
+       u32 probe_bundle_size;
+
+       /* ART = IRT */
+       u32 rest_time;
+
+       /* Max value that can be reached after SBM */
+       u32 max_rest_time;
+
+       /* SBM */
+       u32 scan_backoff_multiplier;
+
+       /* SCBM */
+       u32 fast_scan_period;
+
+       /* specific to windows */
+       u32 slow_scan_period;
+
+       u32 no_of_ssids;
+
+       u32 num_of_channels;
+
+       /* NLO scan start delay time in milliseconds */
+       u32 delay_start_time;
+
+       /* MAC Address to use in Probe Req as SA */
+       struct wmi_mac_addr mac_addr;
+
+       /* Mask on which MAC has to be randomized */
+       struct wmi_mac_addr mac_mask;
+
+       /* IE bitmap to use in Probe Req */
+       u32 ie_bitmap[8];
+
+       /* Number of vendor OUIs. In the TLV vendor_oui[] */
+       u32 num_vendor_oui;
+
+       /* Number of connected NLO band preferences */
+       u32 num_cnlo_band_pref;
+
+       /* The TLVs will follow.
+        * nlo_configured_parameters nlo_list[];
+        * u32 channel_list[num_of_channels];
+        */
+} __packed;
+
 int ath11k_wmi_cmd_send(struct ath11k_pdev_wmi *wmi, struct sk_buff *skb,
                        u32 cmd_id);
 struct sk_buff *ath11k_wmi_alloc_skb(struct ath11k_wmi_base *wmi_sc, u32 len);
@@ -5777,6 +5944,8 @@ int ath11k_wmi_scan_prob_req_oui(struct ath11k *ar,
                                 const u8 mac_addr[ETH_ALEN]);
 int ath11k_wmi_fw_dbglog_cfg(struct ath11k *ar, u32 *module_id_bitmap,
                             struct ath11k_fw_dbglog *dbglog);
+int ath11k_wmi_wow_config_pno(struct ath11k *ar, u32 vdev_id,
+                             struct wmi_pno_scan_req  *pno_scan);
 int ath11k_wmi_wow_del_pattern(struct ath11k *ar, u32 vdev_id, u32 pattern_id);
 int ath11k_wmi_wow_add_pattern(struct ath11k *ar, u32 vdev_id, u32 pattern_id,
                               const u8 *pattern, const u8 *mask,
index 837dab469ab2931b60324e4be9f51f7746a15dd5..5f3aa0b7eb9bd8cf307d89ea4151493e5d8f8e16 100644 (file)
@@ -228,6 +228,101 @@ static void ath11k_wow_convert_8023_to_80211(struct cfg80211_pkt_pattern *new,
        }
 }
 
+static int ath11k_wmi_pno_check_and_convert(struct ath11k *ar, u32 vdev_id,
+                                           struct cfg80211_sched_scan_request *nd_config,
+                                           struct wmi_pno_scan_req *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,
+                      nd_config->match_sets[i].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++) {
+               j = 0;
+               while (j < pno->uc_networks_count) {
+                       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) == 0)) {
+                               pno->a_networks[j].bcast_nw_type = BCAST_HIDDEN;
+                               break;
+                       }
+                       j++;
+               }
+       }
+
+       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 {
+               ath11k_warn(ar->ab, "Invalid number of 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 ath11k_vif_wow_set_wakeups(struct ath11k_vif *arvif,
                                      struct cfg80211_wowlan *wowlan)
 {
@@ -261,6 +356,26 @@ static int ath11k_vif_wow_set_wakeups(struct ath11k_vif *arvif,
 
                if (wowlan->magic_pkt)
                        __set_bit(WOW_MAGIC_PKT_RECVD_EVENT, &wow_mask);
+
+               if (wowlan->nd_config) {
+                       struct wmi_pno_scan_req *pno;
+                       int ret;
+
+                       pno = kzalloc(sizeof(*pno), GFP_KERNEL);
+                       if (!pno)
+                               return -ENOMEM;
+
+                       ar->nlo_enabled = true;
+
+                       ret = ath11k_wmi_pno_check_and_convert(ar, arvif->vdev_id,
+                                                              wowlan->nd_config, pno);
+                       if (!ret) {
+                               ath11k_wmi_wow_config_pno(ar, arvif->vdev_id, pno);
+                               __set_bit(WOW_NLO_DETECTED_EVENT, &wow_mask);
+                       }
+
+                       kfree(pno);
+               }
                break;
        default:
                break;
@@ -354,6 +469,51 @@ static int ath11k_wow_set_wakeups(struct ath11k *ar,
        return 0;
 }
 
+static int ath11k_vif_wow_clean_nlo(struct ath11k_vif *arvif)
+{
+       int ret = 0;
+       struct ath11k *ar = arvif->ar;
+
+       switch (arvif->vdev_type) {
+       case WMI_VDEV_TYPE_STA:
+               if (ar->nlo_enabled) {
+                       struct wmi_pno_scan_req *pno;
+
+                       pno = kzalloc(sizeof(*pno), GFP_KERNEL);
+                       if (!pno)
+                               return -ENOMEM;
+
+                       pno->enable = 0;
+                       ar->nlo_enabled = false;
+                       ret = ath11k_wmi_wow_config_pno(ar, arvif->vdev_id, pno);
+                       kfree(pno);
+               }
+               break;
+       default:
+               break;
+       }
+       return ret;
+}
+
+static int ath11k_wow_nlo_cleanup(struct ath11k *ar)
+{
+       struct ath11k_vif *arvif;
+       int ret;
+
+       lockdep_assert_held(&ar->conf_mutex);
+
+       list_for_each_entry(arvif, &ar->arvifs, list) {
+               ret = ath11k_vif_wow_clean_nlo(arvif);
+               if (ret) {
+                       ath11k_warn(ar->ab, "failed to clean nlo settings on vdev %i: %d\n",
+                                   arvif->vdev_id, ret);
+                       return ret;
+               }
+       }
+
+       return 0;
+}
+
 int ath11k_wow_op_suspend(struct ieee80211_hw *hw,
                          struct cfg80211_wowlan *wowlan)
 {
@@ -439,8 +599,16 @@ int ath11k_wow_op_resume(struct ieee80211_hw *hw)
        ath11k_hif_irq_enable(ar->ab);
 
        ret = ath11k_wow_wakeup(ar->ab);
-       if (ret)
+       if (ret) {
                ath11k_warn(ar->ab, "failed to wakeup from wow: %d\n", ret);
+               goto exit;
+       }
+
+       ret = ath11k_wow_nlo_cleanup(ar);
+       if (ret) {
+               ath11k_warn(ar->ab, "failed to cleanup nlo: %d\n", ret);
+               goto exit;
+       }
 
 exit:
        if (ret) {
@@ -477,6 +645,11 @@ int ath11k_wow_init(struct ath11k *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 = ATH11K_WOW_PATTERNS;
        ar->wow.wowlan_support.n_patterns = ar->wow.max_num_patterns;
        ar->hw->wiphy->wowlan = &ar->wow.wowlan_support;