Merge tag 'v4.0-rc2' into irq/core, to refresh the tree before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 54 insertions, 29 deletions

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 974ebe70f5b0..8428f4a95479 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -578,7 +578,7 @@ ieee80211_get_vif_queues(struct ieee80211_local *local,
 
 void __ieee80211_flush_queues(struct ieee80211_local *local,
                               struct ieee80211_sub_if_data *sdata,
-                              unsigned int queues)
+                              unsigned int queues, bool drop)
 {
         if (!local->ops->flush)
                 return;
@@ -594,7 +594,7 @@ void __ieee80211_flush_queues(struct ieee80211_local *local,
                                         IEEE80211_QUEUE_STOP_REASON_FLUSH,
                                         false);
 
-        drv_flush(local, sdata, queues, false);
+        drv_flush(local, sdata, queues, drop);
 
         ieee80211_wake_queues_by_reason(&local->hw, queues,
                                         IEEE80211_QUEUE_STOP_REASON_FLUSH,
@@ -602,9 +602,9 @@ void __ieee80211_flush_queues(struct ieee80211_local *local,
 }
 
 void ieee80211_flush_queues(struct ieee80211_local *local,
-                            struct ieee80211_sub_if_data *sdata)
+                            struct ieee80211_sub_if_data *sdata, bool drop)
 {
-        __ieee80211_flush_queues(local, sdata, 0);
+        __ieee80211_flush_queues(local, sdata, 0, drop);
 }
 
 void ieee80211_stop_vif_queues(struct ieee80211_local *local,
@@ -744,16 +744,19 @@ EXPORT_SYMBOL_GPL(wdev_to_ieee80211_vif);
 
 /*
  * Nothing should have been stuffed into the workqueue during
- * the suspend->resume cycle. If this WARN is seen then there
- * is a bug with either the driver suspend or something in
- * mac80211 stuffing into the workqueue which we haven't yet
- * cleared during mac80211's suspend cycle.
+ * the suspend->resume cycle. Since we can't check each caller
+ * of this function if we are already quiescing / suspended,
+ * check here and don't WARN since this can actually happen when
+ * the rx path (for example) is racing against __ieee80211_suspend
+ * and suspending / quiescing was set after the rx path checked
+ * them.
  */
 static bool ieee80211_can_queue_work(struct ieee80211_local *local)
 {
-        if (WARN(local->suspended && !local->resuming,
-                 "queueing ieee80211 work while going to suspend\n"))
+        if (local->quiescing || (local->suspended && !local->resuming)) {
+                pr_warn("queueing ieee80211 work while going to suspend\n");
                 return false;
+        }
 
         return true;
 }
@@ -1470,10 +1473,12 @@ static int ieee80211_build_preq_ies_band(struct ieee80211_local *local,
 
         /* Check if any channel in this sband supports at least 80 MHz */
         for (i = 0; i < sband->n_channels; i++) {
-                if (!(sband->channels[i].flags & IEEE80211_CHAN_NO_80MHZ)) {
-                        have_80mhz = true;
-                        break;
-                }
+                if (sband->channels[i].flags & (IEEE80211_CHAN_DISABLED |
+                                                IEEE80211_CHAN_NO_80MHZ))
+                        continue;
+
+                have_80mhz = true;
+                break;
         }
 
         if (sband->vht_cap.vht_supported && have_80mhz) {
@@ -1735,6 +1740,10 @@ int ieee80211_reconfig(struct ieee80211_local *local)
         struct cfg80211_sched_scan_request *sched_scan_req;
         bool sched_scan_stopped = false;
 
+        /* nothing to do if HW shouldn't run */
+        if (!local->open_count)
+                goto wake_up;
+
 #ifdef CONFIG_PM
         if (local->suspended)
                 local->resuming = true;
@@ -1756,9 +1765,6 @@ int ieee80211_reconfig(struct ieee80211_local *local)
                 reconfig_due_to_wowlan = true;
         }
 #endif
-        /* everything else happens only if HW was up & running */
-        if (!local->open_count)
-                goto wake_up;
 
         /*
          * Upon resume hardware can sometimes be goofy due to
@@ -2042,7 +2048,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
          * If this is for hw restart things are still running.
          * We may want to change that later, however.
          */
-        if (!local->suspended || reconfig_due_to_wowlan)
+        if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
                 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
 
         if (!local->suspended)
@@ -2054,7 +2060,19 @@ int ieee80211_reconfig(struct ieee80211_local *local)
         mb();
         local->resuming = false;
 
-        if (!reconfig_due_to_wowlan)
+        /* It's possible that we don't handle the scan completion in
+         * time during suspend, so if it's still marked as completed
+         * here, queue the work and flush it to clean things up.
+         * Instead of calling the worker function directly here, we
+         * really queue it to avoid potential races with other flows
+         * scheduling the same work.
+         */
+        if (test_bit(SCAN_COMPLETED, &local->scanning)) {
+                ieee80211_queue_delayed_work(&local->hw, &local->scan_work, 0);
+                flush_delayed_work(&local->scan_work);
+        }
+
+        if (local->open_count && !reconfig_due_to_wowlan)
                 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
 
         list_for_each_entry(sdata, &local->interfaces, list) {
@@ -2538,7 +2556,9 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
                 ri.mcs = status->rate_idx;
                 ri.flags |= RATE_INFO_FLAGS_MCS;
                 if (status->flag & RX_FLAG_40MHZ)
-                        ri.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
+                        ri.bw = RATE_INFO_BW_40;
+                else
+                        ri.bw = RATE_INFO_BW_20;
                 if (status->flag & RX_FLAG_SHORT_GI)
                         ri.flags |= RATE_INFO_FLAGS_SHORT_GI;
         } else if (status->flag & RX_FLAG_VHT) {
@@ -2546,13 +2566,13 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
                 ri.mcs = status->rate_idx;
                 ri.nss = status->vht_nss;
                 if (status->flag & RX_FLAG_40MHZ)
-                        ri.flags |= RATE_INFO_FLAGS_40_MHZ_WIDTH;
-                if (status->vht_flag & RX_VHT_FLAG_80MHZ)
-                        ri.flags |= RATE_INFO_FLAGS_80_MHZ_WIDTH;
-                if (status->vht_flag & RX_VHT_FLAG_80P80MHZ)
-                        ri.flags |= RATE_INFO_FLAGS_80P80_MHZ_WIDTH;
-                if (status->vht_flag & RX_VHT_FLAG_160MHZ)
-                        ri.flags |= RATE_INFO_FLAGS_160_MHZ_WIDTH;
+                        ri.bw = RATE_INFO_BW_40;
+                else if (status->vht_flag & RX_VHT_FLAG_80MHZ)
+                        ri.bw = RATE_INFO_BW_80;
+                else if (status->vht_flag & RX_VHT_FLAG_160MHZ)
+                        ri.bw = RATE_INFO_BW_160;
+                else
+                        ri.bw = RATE_INFO_BW_20;
                 if (status->flag & RX_FLAG_SHORT_GI)
                         ri.flags |= RATE_INFO_FLAGS_SHORT_GI;
         } else {
@@ -2560,10 +2580,15 @@ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
                 int shift = 0;
                 int bitrate;
 
-                if (status->flag & RX_FLAG_10MHZ)
+                if (status->flag & RX_FLAG_10MHZ) {
                         shift = 1;
-                if (status->flag & RX_FLAG_5MHZ)
+                        ri.bw = RATE_INFO_BW_10;
+                } else if (status->flag & RX_FLAG_5MHZ) {
                         shift = 2;
+                        ri.bw = RATE_INFO_BW_5;
+                } else {
+                        ri.bw = RATE_INFO_BW_20;
+                }
 
                 sband = local->hw.wiphy->bands[status->band];
                 bitrate = sband->bitrates[status->rate_idx].bitrate;