iwlwifi: mvm: read the rfkill state and feed it to iwlmei

Read the rfkill state upon boot, mac start and mac stop.

Reviewed-by: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20211112062814.7502-6-emmanuel.grumbach@intel.com

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 9a666cc259f4af05d45e44954d21231e94434082..20422e6400590db69c6ec16924b3e8b048df26fc 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -1148,6 +1148,8 @@ static int iwl_mvm_mac_start(struct ieee80211_hw *hw)
        ret = __iwl_mvm_mac_start(mvm);
        mutex_unlock(&mvm->mutex);
 
+       iwl_mvm_mei_set_sw_rfkill_state(mvm);
+
        return ret;
 }
 
@@ -1265,6 +1267,8 @@ static void iwl_mvm_mac_stop(struct ieee80211_hw *hw)
         */
        flush_work(&mvm->roc_done_wk);
 
+       iwl_mvm_mei_set_sw_rfkill_state(mvm);
+
        mutex_lock(&mvm->mutex);
        __iwl_mvm_mac_stop(mvm);
        mutex_unlock(&mvm->mutex);

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 34b4a280a293409d9cfa3e089a00ebfe454722f7..64ff2395800c326509b0faecf5fdee66d0bd45da 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -2218,10 +2218,14 @@ static inline void iwl_mvm_mei_device_down(struct iwl_mvm *mvm)
                iwl_mei_device_down();
 }
 
-static inline void iwl_mvm_mei_set_sw_rfkill_state(struct iwl_mvm *mvm, bool sw_rfkill)
+static inline void iwl_mvm_mei_set_sw_rfkill_state(struct iwl_mvm *mvm)
 {
+       bool sw_rfkill =
+               mvm->hw_registered ? rfkill_blocked(mvm->hw->wiphy->rfkill) : false;
+
        if (mvm->mei_registered)
-               iwl_mei_set_rfkill_state(iwl_mvm_is_radio_killed(mvm), sw_rfkill);
+               iwl_mei_set_rfkill_state(iwl_mvm_is_radio_killed(mvm),
+                                        sw_rfkill);
 }
 
 void iwl_mvm_send_roaming_forbidden_event(struct iwl_mvm *mvm,

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 82fea029d4d0cb6a7a7c9c1ddadcf694e35de287..3ab0217abeea2261f4b0dfe8ffb4fef4ab4c1933 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -756,6 +756,9 @@ static int iwl_mvm_start_post_nvm(struct iwl_mvm *mvm)
        wiphy_rfkill_set_hw_state_reason(mvm->hw->wiphy,
                                         mvm->mei_rfkill_blocked,
                                         RFKILL_HARD_BLOCK_NOT_OWNER);
+
+       iwl_mvm_mei_set_sw_rfkill_state(mvm);
+
        return 0;
 }