Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp4340501pxt; Wed, 11 Aug 2021 03:56:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3MV6kEh0UYk5gFcB0keA5LRl9R3dAlTreGdfRFQyScFMLfnClIR+N+tcAiVVJSKFdAOm4 X-Received: by 2002:a92:d70f:: with SMTP id m15mr209620iln.162.1628679396153; Wed, 11 Aug 2021 03:56:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628679396; cv=none; d=google.com; s=arc-20160816; b=XJaTiEkeB6YWnxU0QAEid+8QkC+CmbvXnKuNhFw4PFezEu6CPCgDZ04orGPEbQGCv/ FaCOlme6x0JZfaOkGswp6IVftrZ1nBwVYlgEs2rT8P0SwT6vQ/xFsd+5LY8BIx7Pc/Ha htExWOnyeVlBzjdx+pNE5DEjF5MkgeEq2k5CQsPFL+r7tRgasft8wJyTHQ0viZ+4ukGo 4rvjjUHydsLjfXd3P135427prTO0R38feKAT+9bJ9jFZvWxbEtwiVZNGjqbQQPYB8IS7 C2CmAZfT6KbhCG9X1XUS6bljRxEgBof19DOS+7412mLnY/T4QH3On+SRCOg8Zf40CHpA 672w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=Qj7jgwlwuvKMQHlibTqEnIvTMcO108fz0LeAENFehkM=; b=GORSfBSpDLh2Yb4FXd3vQY3yrBjDlDmEV7Twkx6+9NLzIa0N78ZVuaY2nKgGYMq3Xo Yt5ZoEj3mW+k4Mi1ANWGpkqyZt5iF0h3dqaVMptKddlfSHy7J4FgKrn4de+4R9RMuRXB jiMcji8M6c3dbYfiv16gD2JZQLA3r91jlrC4EclGpFIb2gO2uyCFDMYwvCtRZXqZrmEv mSpGf6kKTyDsQMqvczDqHptxrsAFnCxrRpQ5IKOFQyROHisR8AJTBuuN6ZwhZpNJ/FJJ xKPWpf1496mmC95BfYIBjOEcEzDSNuiyBx8BrQoBLmqrQg/yO8r5FN+mef0SXKk8jeC6 B/ng== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f31si7012695jav.78.2021.08.11.03.56.24; Wed, 11 Aug 2021 03:56:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237230AbhHKK4U (ORCPT + 99 others); Wed, 11 Aug 2021 06:56:20 -0400 Received: from mga17.intel.com ([192.55.52.151]:46893 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237216AbhHKK4T (ORCPT ); Wed, 11 Aug 2021 06:56:19 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10072"; a="195369037" X-IronPort-AV: E=Sophos;i="5.84,311,1620716400"; d="scan'208";a="195369037" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2021 03:55:56 -0700 X-IronPort-AV: E=Sophos;i="5.84,311,1620716400"; d="scan'208";a="516648171" Received: from kniesyn-mobl1.ger.corp.intel.com (HELO egrumbac-mobl1.lan) ([10.254.155.111]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Aug 2021 03:55:55 -0700 From: Emmanuel Grumbach To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org Subject: [PATCH v6 7/7] iwlwifi: mvm: read the rfkill state and feed it to iwlmei Date: Wed, 11 Aug 2021 13:55:41 +0300 Message-Id: <20210811105541.43426-7-emmanuel.grumbach@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210811105541.43426-1-emmanuel.grumbach@intel.com> References: <20210811105541.43426-1-emmanuel.grumbach@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Remove the corresponding vendor command as well. Read the rfkill state upon boot, mac start and mac stop. Reviewed-by: Luciano Coelho Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 ++++ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 8 ++++++-- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 3 +++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 463af179f439..48d3253a3f50 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -1147,6 +1147,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; } @@ -1264,6 +1266,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 402851ba9565..d33ff9ab71b0 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h @@ -2210,10 +2210,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 9898e1a72c7c..98ea986d75f5 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c @@ -753,6 +753,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; } -- 2.25.1