wlcore: support scan reports during periodic scan

FW API changed and now PERIODIC_SCAN_REPORT_EVENT is sent
in case results were found at the end of each sched scan
cycle. Previous FW was missing that and broke sched scan.

This API change is available from 18xx FW 8.5.0.0.27

[Arik - move changes to 18xx specific files, align FW structures to
latest for scan command]

Signed-off-by: Eyal Shapira <eyal@wizery.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>

5 files changed, 29 insertions, 3 deletions

diff --git a/drivers/net/wireless/ti/wl18xx/event.c b/drivers/net/wireless/ti/wl18xx/event.c
index 02ef5aa9da6b..c9199d7804c6 100644
--- a/drivers/net/wireless/ti/wl18xx/event.c
+++ b/drivers/net/wireless/ti/wl18xx/event.c
@@ -61,6 +61,14 @@ int wl18xx_process_mailbox_events(struct wl1271 *wl)
                         wl18xx_scan_completed(wl, wl->scan_wlvif);
         }
 
+        if (vector & PERIODIC_SCAN_REPORT_EVENT_ID) {
+                wl1271_debug(DEBUG_EVENT,
+                             "PERIODIC_SCAN_REPORT_EVENT (results %d)",
+                             mbox->number_of_sched_scan_results);
+
+                wlcore_scan_sched_scan_results(wl);
+        }
+
         if (vector & PERIODIC_SCAN_COMPLETE_EVENT_ID)
                 wlcore_event_sched_scan_completed(wl, 1);
 
diff --git a/drivers/net/wireless/ti/wl18xx/event.h b/drivers/net/wireless/ti/wl18xx/event.h
index b55fd31e471a..398f3d2c0a6c 100644
--- a/drivers/net/wireless/ti/wl18xx/event.h
+++ b/drivers/net/wireless/ti/wl18xx/event.h
@@ -37,6 +37,7 @@ enum {
         BA_SESSION_RX_CONSTRAINT_EVENT_ID        = BIT(17),
         REMAIN_ON_CHANNEL_COMPLETE_EVENT_ID      = BIT(18),
         DFS_CHANNELS_CONFIG_COMPLETE_EVENT       = BIT(19),
+        PERIODIC_SCAN_REPORT_EVENT_ID            = BIT(20),
 };
 
 struct wl18xx_event_mailbox {
diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index 0ff9bc7b1f33..ec331e9e0b74 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -890,6 +890,7 @@ static int wl18xx_boot(struct wl1271 *wl)
                 SCAN_COMPLETE_EVENT_ID |
                 RSSI_SNR_TRIGGER_0_EVENT_ID |
                 PERIODIC_SCAN_COMPLETE_EVENT_ID |
+                PERIODIC_SCAN_REPORT_EVENT_ID |
                 DUMMY_PACKET_EVENT_ID |
                 PEER_REMOVE_COMPLETE_EVENT_ID |
                 BA_SESSION_RX_CONSTRAINT_EVENT_ID |
diff --git a/drivers/net/wireless/ti/wl18xx/scan.c b/drivers/net/wireless/ti/wl18xx/scan.c
index 1df88d5336f3..09d944505ac0 100644
--- a/drivers/net/wireless/ti/wl18xx/scan.c
+++ b/drivers/net/wireless/ti/wl18xx/scan.c
@@ -227,6 +227,10 @@ int wl18xx_scan_sched_scan_config(struct wl1271 *wl,
 
         cmd->tag = WL1271_SCAN_DEFAULT_TAG;
 
+        /* create a PERIODIC_SCAN_REPORT_EVENT whenever we've got a match */
+        cmd->report_threshold = 1;
+        cmd->terminate_on_report = 0;
+
         if (cmd->active[0]) {
                 u8 band = IEEE80211_BAND_2GHZ;
                 ret = wl12xx_cmd_build_probe_req(wl, wlvif,
diff --git a/drivers/net/wireless/ti/wl18xx/scan.h b/drivers/net/wireless/ti/wl18xx/scan.h
index 5eb8c7fc1567..eadee42689d1 100644
--- a/drivers/net/wireless/ti/wl18xx/scan.h
+++ b/drivers/net/wireless/ti/wl18xx/scan.h
@@ -78,8 +78,7 @@ struct wl18xx_cmd_scan_params {
         __le16 long_cycles_sec;
         u8 short_cycles_count;
         u8 total_cycles; /* 0 - infinite */
-        u8 rate;
-        u8 padding[1];
+        u8 padding[2];
 
         union {
                 struct {
@@ -93,7 +92,20 @@ struct wl18xx_cmd_scan_params {
         u8 ssid[IEEE80211_MAX_SSID_LEN];
         u8 ssid_len;     /* For SCAN_SSID_FILTER_SPECIFIC */
         u8 tag;
-        u8 padding1[2];
+        u8 rate;
+
+        /* send SCAN_REPORT_EVENT in periodic scans after each cycle
+        * if number of results >= report_threshold. Must be 0 for
+        * non periodic scans
+        */
+        u8 report_threshold;
+
+        /* Should periodic scan stop after a report event was created.
+        * Must be 0 for non periodic scans.
+        */
+        u8 terminate_on_report;
+
+        u8 padding1[3];
 } __packed;
 
 struct wl18xx_cmd_scan_stop {