From patchwork Thu Mar 6 11:48:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871501 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DA50B20AF69 for ; Thu, 6 Mar 2025 11:49:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261753; cv=none; b=eXOH4e6PhG9pMsl9B42Vz1SV2lzp9F+j7iHRXiSGWagvje4kKDINTGGZ6yoPiZ+dEbDJctrok4FKyyNRIwJ+KCKeHYqNZ83Sc7MAuleGtIbyVF5VElJJwcshkp9mkfuZ2Jp1bzHyLtpZqkQhcFIL9dvkuvzeEezUTZaiRnZnulU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261753; c=relaxed/simple; bh=iKg7xnPuy40w1VC5Z9rTJh4qis2fv4uTp7BLYhhiWfM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oLXxAmJqo0ALjw4/109Okvahj/LGz/WxPTpUsyQZ7gHeybtgjTp0PC28vaRFe6zmqrY8yoV98H5QsIHc1w1PC/fbbZ2Qd1r3X4YhSsVCFF8aUHUEpvZOh1HilG1Ay+VyByclNBQjl929GLg4vlL37HFwIjoKhqlNxW5WyvM+sPU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=ShRfr7Z6; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="ShRfr7Z6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261752; x=1772797752; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iKg7xnPuy40w1VC5Z9rTJh4qis2fv4uTp7BLYhhiWfM=; b=ShRfr7Z6WNK6Va/oAYlV40LfxyyaBLQthictHFHzVdXXBBoXBMOLDULC RUR97zlyc8Fy3quItI2wS/NMPg8rKUqW4a4uOh3eI0IYTYPqY5ZyMDHcE p62fmipwEAi1hNTkvPmxPFmbpvtyh7zJlNAjCuN/cjdlcvGddP4aoVqBa 6TUqfX/AfK66FJKgFVqCOnRhu5dk7CJkjGa32psIdeNjD6l7T44nmgPgZ bNs3efMxwT8/ZKwYG98W6Rw4LuYHf9sha/xCwvz7rLUqffEeDdqJKPkbn 3H2FIN1adzX9NRYK2YxHQjAPhqEqyZWC8QE9vsVFBMHz010Vp/Bb8GRnf A==; X-CSE-ConnectionGUID: qVGMY9+kROKuBJ5jv0gxwQ== X-CSE-MsgGUID: DnT4MH98QgqtAlB9btZHew== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474500" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474500" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:10 -0800 X-CSE-ConnectionGUID: EsvbQirZRT++bEBtdZ6J2A== X-CSE-MsgGUID: f2RF6cxYR/iuuYISAVT/jw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915510" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:08 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org Subject: [PATCH wireless-next 01/19] wifi: iwlwifi: bump FW API to 97 for BZ/SC/DC devices Date: Thu, 6 Mar 2025 13:48:37 +0200 Message-Id: <20250306134558.003982747060.Iee3bbd245e7bc750b92624f7085afef02e7dbdc6@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited Start supporting API version 97 for new devices. Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 2 +- drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 2 +- drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c index 64a5bbb45c83..e0ec9d6337e4 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c @@ -10,7 +10,7 @@ #include "fw/api/txq.h" /* Highest firmware API version supported */ -#define IWL_BZ_UCODE_API_MAX 96 +#define IWL_BZ_UCODE_API_MAX 97 /* Lowest firmware API version supported */ #define IWL_BZ_UCODE_API_MIN 92 diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c index 69176b59b4de..e58fe8210988 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c @@ -9,7 +9,7 @@ #include "fw/api/txq.h" /* Highest firmware API version supported */ -#define IWL_DR_UCODE_API_MAX 96 +#define IWL_DR_UCODE_API_MAX 97 /* Lowest firmware API version supported */ #define IWL_DR_UCODE_API_MIN 96 diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c index eb56af9a8411..e5c01ae87699 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c @@ -10,7 +10,7 @@ #include "fw/api/txq.h" /* Highest firmware API version supported */ -#define IWL_SC_UCODE_API_MAX 96 +#define IWL_SC_UCODE_API_MAX 97 /* Lowest firmware API version supported */ #define IWL_SC_UCODE_API_MIN 92 From patchwork Thu Mar 6 11:48:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871129 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 13AAA2040BF for ; Thu, 6 Mar 2025 11:49:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261752; cv=none; b=DCkZuLHJ1+gsu32EGJ6hvyh3FFcQAbIsPZ/qAQangYbj38np6mNOgFxtPk59fPPgC3f6LlUwjKef03B1Ll6BIIDq4LbU5lHDutB5pC7K6wEaNotgG/Fy8y8b7U5ctcHWniwOw0JifNxxMKcLvMO+UFTBjeH4AKOeUU6xxUW/C3A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261752; c=relaxed/simple; bh=xACJd1vmpEBKooE0D3HFij6eW8BkyvDrSkBDkYTvhVQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ieUZJyx08WB8CmTyvPCNl9IQTugYa6aGmmY6IXGXkA9slev/TW68GWvBZNbvQmQ3HX3S5l17/Osu/0PXLgQQYtijH8DaxG0aT6rXeyUrPfvLzY9l8tKlMqAGVohcVptbZsK3Ndo3f7bH4NPXDI91hY/e6QdrWxb+V96oNNWzgrQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=LwAxn54c; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="LwAxn54c" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261751; x=1772797751; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xACJd1vmpEBKooE0D3HFij6eW8BkyvDrSkBDkYTvhVQ=; b=LwAxn54cPC9O5xAHj1pmDwrxh3Uwbk6DUiAgXwdbM+jfUJZNYWklbtJj Syr1C56p7sOKOQhzFH00lmns9oKm6vycPAzMim7Qiwols99/dIQo3SGev ERvQGcP5nQbfQ2oxPEAzLfc4Qw7xpq36XbRFJ6QjpCMJR5jiwd0agFDro F60qdkJuyVmhjhTTEG0hocCL1d1tGVnhZ+abskah01y8O7/sqIhRqints OQ8W76vpbOfplhnqnAwlI+rmDwnjYfn5qZO7e9uYO+LfgnDEz0lAjaG0H MThoZMqu9SWkV4ebQFNAlyhRJFKzqyympQSGocBnQV2T1YxEtjMyiE/Ys A==; X-CSE-ConnectionGUID: OwqvmOS1QXqqsF+YAhrPzg== X-CSE-MsgGUID: U+z2RU0iQe2a7NQl9u02Rw== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474505" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474505" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:11 -0800 X-CSE-ConnectionGUID: r7MbW5XjTmuj2U0DDRQO/w== X-CSE-MsgGUID: 59012f7LTkyJ8OFCUCaMOw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915522" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:09 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Emmanuel Grumbach Subject: [PATCH wireless-next 02/19] wifi: iwlwifi: add support for BE213 Date: Thu, 6 Mar 2025 13:48:38 +0200 Message-Id: <20250306134558.cc2df19a2a1b.Idaf000dd311358e3b50a511f4efc1cc720abd58b@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Emmanuel Grumbach Add the BE213 device. This is just like BE211 but with a limitation on the bandwidth. Signed-off-by: Emmanuel Grumbach Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 2 ++ .../net/wireless/intel/iwlwifi/iwl-config.h | 1 + .../wireless/intel/iwlwifi/iwl-nvm-parse.c | 12 +++++++---- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 21 ++++++++++++++++--- 4 files changed, 29 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c index e5c01ae87699..46c2f3f105ee 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c @@ -142,6 +142,8 @@ const struct iwl_cfg_trans_params iwl_sc_trans_cfg = { .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, }; +const char iwl_sp_name[] = "Intel(R) Wi-Fi 7 BE213 160MHz"; + const struct iwl_cfg iwl_cfg_sc = { .fw_name_mac = "sc", IWL_DEVICE_SC, diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h index 5fc9ce2b350e..d27aabea3814 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h @@ -550,6 +550,7 @@ extern const char iwl_ax231_name[]; extern const char iwl_ax411_name[]; extern const char iwl_fm_name[]; extern const char iwl_wh_name[]; +extern const char iwl_sp_name[]; extern const char iwl_gl_name[]; extern const char iwl_mtp_name[]; extern const char iwl_dr_name[]; diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index 08269168b2fa..cd1b0048bb6d 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -944,7 +944,8 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans, IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_MASK); break; case NL80211_BAND_6GHZ: - if (!trans->reduced_cap_sku) { + if (!trans->reduced_cap_sku && + trans->bw_limit >= 320) { iftype_data->eht_cap.eht_cap_elem.phy_cap_info[0] |= IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ; iftype_data->eht_cap.eht_cap_elem.phy_cap_info[1] |= @@ -1098,15 +1099,18 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans, iftype_data->he_cap.he_cap_elem.phy_cap_info[0] &= ~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G; - if (trans->reduced_cap_sku) { + if (trans->bw_limit < 320 || trans->reduced_cap_sku) { memset(&iftype_data->eht_cap.eht_mcs_nss_supp.bw._320, 0, sizeof(iftype_data->eht_cap.eht_mcs_nss_supp.bw._320)); + iftype_data->eht_cap.eht_cap_elem.phy_cap_info[2] &= + ~IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK; + } + + if (trans->reduced_cap_sku) { iftype_data->eht_cap.eht_mcs_nss_supp.bw._80.rx_tx_mcs13_max_nss = 0; iftype_data->eht_cap.eht_mcs_nss_supp.bw._160.rx_tx_mcs13_max_nss = 0; iftype_data->eht_cap.eht_cap_elem.phy_cap_info[8] &= ~IEEE80211_EHT_PHY_CAP8_RX_4096QAM_WIDER_BW_DL_OFDMA; - iftype_data->eht_cap.eht_cap_elem.phy_cap_info[2] &= - ~IEEE80211_EHT_PHY_CAP2_SOUNDING_DIM_320MHZ_MASK; } } diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c index cd347cd8176a..88b999886c2a 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -1184,8 +1184,13 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = { _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_MAC_TYPE_SC, IWL_CFG_ANY, IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY, - IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_BW_NO_LIM, IWL_CFG_ANY, IWL_CFG_ANY, iwl_cfg_sc, iwl_wh_name), + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_MAC_TYPE_SC, IWL_CFG_ANY, + IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY, + 160, IWL_CFG_ANY, IWL_CFG_ANY, + iwl_cfg_sc, iwl_sp_name), _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_MAC_TYPE_SC2, IWL_CFG_ANY, IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY, @@ -1199,8 +1204,13 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = { _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_MAC_TYPE_SC2, IWL_CFG_ANY, IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY, - IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_BW_NO_LIM, IWL_CFG_ANY, IWL_CFG_ANY, iwl_cfg_sc2, iwl_wh_name), + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_MAC_TYPE_SC2, IWL_CFG_ANY, + IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY, + 160, IWL_CFG_ANY, IWL_CFG_ANY, + iwl_cfg_sc2, iwl_sp_name), _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_MAC_TYPE_SC2F, IWL_CFG_ANY, IWL_CFG_RF_TYPE_GF, IWL_CFG_ANY, IWL_CFG_ANY, @@ -1214,8 +1224,13 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = { _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, IWL_CFG_MAC_TYPE_SC2F, IWL_CFG_ANY, IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY, - IWL_CFG_BW_ANY, IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_BW_NO_LIM, IWL_CFG_ANY, IWL_CFG_ANY, iwl_cfg_sc2f, iwl_wh_name), + _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, + IWL_CFG_MAC_TYPE_SC2F, IWL_CFG_ANY, + IWL_CFG_RF_TYPE_WH, IWL_CFG_ANY, IWL_CFG_ANY, + 160, IWL_CFG_ANY, IWL_CFG_ANY, + iwl_cfg_sc2f, iwl_sp_name), /* Dr */ _IWL_DEV_INFO(IWL_CFG_ANY, IWL_CFG_ANY, From patchwork Thu Mar 6 11:48:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871128 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02E1B20AF8D for ; Thu, 6 Mar 2025 11:49:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261754; cv=none; b=uTmRMQF+GuD9ej6BbpOzZEDXfbNn9DtQUqy99e0D75qoNOgujqId5jngoE6sn6LrYPI2fGzMHcrFTj5HtMJaizcbdiz9iOZKBG7sGXrCfFwjjlTrEG3Jy1HABQJFWqN9XjEmOqt2UXXu1yXFcDokbxuRp0qyF3weh3IYB4eAUTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261754; c=relaxed/simple; bh=fJEr3aww8jhIlGGUZnSWrFYY4mHTE0hyHSsWOgAwZRg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sGoGSrJF97GIEqQJGXyfaRUqtPl1nyZ3abTQ20CAwnpY8jnyAz4PfsfNGIrtxwSFIvUdw0rsyd/KYfN24yfNwXtWzcV8gtaZzmVGETK7XV8btho6kAuDkDuLAcmKfmN5fv3FfkOcEWZ+3m2ascEHbvZ3uV7qV62N6Xf5NprygCc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=a04chZsu; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="a04chZsu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261753; x=1772797753; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fJEr3aww8jhIlGGUZnSWrFYY4mHTE0hyHSsWOgAwZRg=; b=a04chZsuYCqiENQtz7sr0lVibRrp009+RrgrJ5o9P7mUa27Ci7iF9B9b Ou6WNf0jOF2+3WYAajJ2xq+jtOTNTpBAkhZ1WW4m6EKZuqW1ozg9KvMLD /xe1VWnZGUoGm6zp9T6wwCB5rgwkGqFnhRI8NRfKCBM2JcmjrEUDjCIyJ 478sXlFP/Wcf86M9fj4sS03nZdMMrpQ3GQ+TiIWC8YxWdQ57EhTsgT5Pw +ylC0o1EE7cjNVkAt9qrf78LVYPOMQ5toZElE83gelFgwdTuIjUhx3JL+ rQSquOU3YijVgqbV2NGOBgxIcr6/FQ1N7sqQI3ubEsJ5BU+Fp/bmhZ6tR g==; X-CSE-ConnectionGUID: 0rOQKa6qTkS6OIlGKFOeVw== X-CSE-MsgGUID: ddNhCtp9StODWmtOs0shdA== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474513" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474513" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:13 -0800 X-CSE-ConnectionGUID: 50fm+7zhSNOXqU4LxVkQDQ== X-CSE-MsgGUID: TEbJRFZ+R22MNbatk+mN1Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915530" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:11 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Emmanuel Grumbach Subject: [PATCH wireless-next 03/19] wifi: iwlwifi: fix the ECKV UEFI variable name Date: Thu, 6 Mar 2025 13:48:39 +0200 Message-Id: <20250306134558.f1ca48767a2a.I2bc9d72c1dc2c4d7028f0265634a940c2fadbbb5@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Emmanuel Grumbach This UEFI variable name was badly named. Fix its name and also use the right GUID to find it: we need to use the BT_WIFI (a.k.a. Common) GUID. Signed-off-by: Emmanuel Grumbach Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 8 +++++--- drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/uefi.c b/drivers/net/wireless/intel/iwlwifi/fw/uefi.c index 78bd0eb7aa92..b4438b1f8dad 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/uefi.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/uefi.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright(c) 2021-2024 Intel Corporation + * Copyright(c) 2021-2025 Intel Corporation */ #include "iwl-drv.h" @@ -681,8 +681,10 @@ int iwl_uefi_get_eckv(struct iwl_fw_runtime *fwrt, u32 *extl_clk) struct uefi_cnv_var_eckv *data; int ret = 0; - data = iwl_uefi_get_verified_variable(fwrt->trans, IWL_UEFI_ECKV_NAME, - "ECKV", sizeof(*data), NULL); + data = iwl_uefi_get_verified_variable_guid(fwrt->trans, + &IWL_EFI_WIFI_BT_GUID, + IWL_UEFI_ECKV_NAME, + "ECKV", sizeof(*data), NULL); if (IS_ERR(data)) return -EINVAL; diff --git a/drivers/net/wireless/intel/iwlwifi/fw/uefi.h b/drivers/net/wireless/intel/iwlwifi/fw/uefi.h index 0c8943a8bd01..eb3c05417da3 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/uefi.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/uefi.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* - * Copyright(c) 2021-2024 Intel Corporation + * Copyright(c) 2021-2025 Intel Corporation */ #ifndef __iwl_fw_uefi__ #define __iwl_fw_uefi__ @@ -19,7 +19,7 @@ #define IWL_UEFI_WTAS_NAME L"UefiCnvWlanWTAS" #define IWL_UEFI_SPLC_NAME L"UefiCnvWlanSPLC" #define IWL_UEFI_WRDD_NAME L"UefiCnvWlanWRDD" -#define IWL_UEFI_ECKV_NAME L"UefiCnvWlanECKV" +#define IWL_UEFI_ECKV_NAME L"UefiCnvCommonECKV" #define IWL_UEFI_DSM_NAME L"UefiCnvWlanGeneralCfg" #define IWL_UEFI_WBEM_NAME L"UefiCnvWlanWBEM" #define IWL_UEFI_PUNCTURING_NAME L"UefiCnvWlanPuncturing" From patchwork Thu Mar 6 11:48:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871500 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5686204590 for ; Thu, 6 Mar 2025 11:49:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261756; cv=none; b=c4s1Qa+5zxgIe6CgPRaSISRLN4BarIlIDVcd75BC3mI7FpR7z/O3eKnnrRfs2HIl6ddbsArg60qVPsuke4tS07YdDEWtXY4lRXmF4L1xnKpsJfy5TTcAb4/6E2cYf6baj7uRMa4Fv7aw1RGAX+g3Og+nIHIc1CLHZN87xeE+vfM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261756; c=relaxed/simple; bh=jOSPCYdHjY3mmUmNQsjMfcaCD0ekcqINe9k3tizI2lk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nww6GYYlKrtXEusXA0+ShAPD+vD2k9/eRwb0uBu//DxcHDO5ipwtcFCg5KUNy6Ub85LU9yrJGcZBmEYClxb9vIqGPp7OtDrloZ3DmPU3yfEQ/b7ZkX1e/y91cDYQd+s+muoMcteyWfsHV9X9UpvPdjLkfja50PCKcYdbm0INUx8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=kD+luDmr; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="kD+luDmr" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261755; x=1772797755; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jOSPCYdHjY3mmUmNQsjMfcaCD0ekcqINe9k3tizI2lk=; b=kD+luDmrDLqdrn+HsfabT4aL3ZT5C0nQyyf4QFMMcuPnwxLp4z4ofz4a Dd0JsaqRdmXqLBqQQwsNxi/NdnkQZAIHgxdAJx+C7e/ZBxuv5JCa2Ona4 sGYJwJNp4y0F+dOp41lQcvlH446QeB7WYCYDU4OiUW3M6hE6VvN+nbIXK mmryr6f99H3XXAaezKzI2jk+Q7vLAnzeLqV/Be/4QjEXLhSglZW1avc3f qnOo5hRW+yKej+nptkWtpxTRnWI8o8Uqeq1ukPAQ+VcwYDFcaTNgpgjKI NK0e6+tEzu7PJV7Z0TwDlaTSeG7YpYz5zYAMvUrbiym0MFyVI6wjuLwpy Q==; X-CSE-ConnectionGUID: ux40NAogSw6NFCQQqCvTtg== X-CSE-MsgGUID: DgwRDWY/SbKrv8D16ZChfQ== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474517" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474517" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:15 -0800 X-CSE-ConnectionGUID: hB6r4LO6RHaYjic/ZO8eYA== X-CSE-MsgGUID: RZoTj7XQRGWpWZ4gP3v1rQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915534" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:12 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Emmanuel Grumbach Subject: [PATCH wireless-next 04/19] wifi: iwlwifi: fix print for ECKV Date: Thu, 6 Mar 2025 13:48:40 +0200 Message-Id: <20250306134558.f713ab5f35b9.I318fed724709f9ee7a0c369e1cf5e1038ddd546a@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Emmanuel Grumbach The print was obviously wrong. We are handling ECKV and not WRDD in this function. Signed-off-by: Emmanuel Grumbach Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/uefi.c b/drivers/net/wireless/intel/iwlwifi/fw/uefi.c index b4438b1f8dad..386aadbce2a2 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/uefi.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/uefi.c @@ -690,7 +690,7 @@ int iwl_uefi_get_eckv(struct iwl_fw_runtime *fwrt, u32 *extl_clk) if (data->revision != IWL_UEFI_ECKV_REVISION) { ret = -EINVAL; - IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI WRDD revision:%d\n", + IWL_DEBUG_RADIO(fwrt, "Unsupported UEFI ECKV revision:%d\n", data->revision); goto out; } From patchwork Thu Mar 6 11:48:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871127 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52F6C20B1F2 for ; Thu, 6 Mar 2025 11:49:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261758; cv=none; b=a/zb10Clt1dfBeruQqDcyJBgIguYjzBxZYpHWXvv2bME9LKMbWdc/bblmIBrj1RgTPadSOJpODatzsJ94qygClJuMqCxEL1GwGnCqbzFF+rG+OlgWAye2xE3LGOx1PsHrBMGTFSuCrn8GZ0YRbuREP0DsPGO6lYTddoPl+YeN2k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261758; c=relaxed/simple; bh=9R/p5e27pnoiAY42Zg51kvE3IwL5/rlJmnxIW0GQFG4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=p3gEkNlBbBMuRJV1duQ70I0WEUZoK0+Y9cofg3cs/k9UShJYHjLWbocKkUUA6ekM2YgG+26PGgni9RACUi6z4fpnJMZaROeHo/xyxQV0qPfKt8kNzeLOHS0l0m+Can/KObXuCL7wq2KKcrnlB7bszvLKvpPuazyOX1njlTml09w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=eG+XXV/2; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="eG+XXV/2" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261757; x=1772797757; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9R/p5e27pnoiAY42Zg51kvE3IwL5/rlJmnxIW0GQFG4=; b=eG+XXV/2q3dvRlHiKJLF9BDvvNDFiSSHTVcy/OwwfoaMWA6wr7dulSVk uld7ue3aEoCO9ORtggzZ0eeJPVXZvCfZJAUvMJxB8DIdzD6BTatTI3ThY GeyzU66sQNSWTJEHNIlGEMr+Zr/Tq516h1OnAEXX00XwocImthGl/+C4V 7P8EueExZv/PfVzZvQ9qLF3QLSlUAw0gOItfAz1fyk+MB/KXf1Np8dQIu GkW+8ymBf6ClP0uiRWi7mtxDskbfvaLgFWHqVGVgiNVm+AJ2qyWz/dhb1 3+Uoni8u4zPzqF/O/zRPq/PqJNKrCVDVQ1Rf0FoUeI4P8OcMaB90BWPmT Q==; X-CSE-ConnectionGUID: 5gw4D+kySzK6fyu0BW/kmw== X-CSE-MsgGUID: JFgJeKR4TkmEnfvyKV2xjw== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474520" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474520" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:17 -0800 X-CSE-ConnectionGUID: lnwdsGYbQfuvpPy3pvUT2A== X-CSE-MsgGUID: KIFmAmYVQcOgBeaKCZY5YA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915538" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:14 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Anjaneyulu , Somashekhar Puttagangaiah Subject: [PATCH wireless-next 05/19] wifi: iwlwifi: parse active and 20 MHz AP NVM channel flag Date: Thu, 6 Mar 2025 13:48:41 +0200 Message-Id: <20250306134559.fa17d6e2f19a.I1f7f84f4485ed3928070c97a031110ccb608bda8@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Anjaneyulu Configure 20 MHz AP mode based on NVM settings, set the NL80211_RRF_ALLOW_20MHZ_ACTIVITY flag, when the NVM indicates that an access point can operate in 20 MHz only. Signed-off-by: Somashekhar Puttagangaiah Signed-off-by: Pagadala Yesu Anjaneyulu Signed-off-by: Miri Korenblit --- Depends on commit: "wifi: cfg80211: allow AP operations in 20 MHz configuration" --- .../wireless/intel/iwlwifi/iwl-nvm-parse.c | 36 +++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index cd1b0048bb6d..018752b8c4d8 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -143,6 +143,9 @@ static struct ieee80211_rate iwl_cfg80211_rates[] = { * @NVM_CHANNEL_VALID: channel is usable for this SKU/geo * @NVM_CHANNEL_IBSS: usable as an IBSS channel and deprecated * when %IWL_NVM_SBANDS_FLAGS_LAR enabled. + * @NVM_CHANNEL_ALLOW_20MHZ_ACTIVITY: active scanning allowed and + * AP allowed only in 20 MHz. Valid only + * when %IWL_NVM_SBANDS_FLAGS_LAR enabled. * @NVM_CHANNEL_ACTIVE: active scanning allowed and allows IBSS * when %IWL_NVM_SBANDS_FLAGS_LAR enabled. * @NVM_CHANNEL_RADAR: radar detection required @@ -159,20 +162,21 @@ static struct ieee80211_rate iwl_cfg80211_rates[] = { * @NVM_CHANNEL_AFC: client support connection to UHB AFC AP */ enum iwl_nvm_channel_flags { - NVM_CHANNEL_VALID = BIT(0), - NVM_CHANNEL_IBSS = BIT(1), - NVM_CHANNEL_ACTIVE = BIT(3), - NVM_CHANNEL_RADAR = BIT(4), - NVM_CHANNEL_INDOOR_ONLY = BIT(5), - NVM_CHANNEL_GO_CONCURRENT = BIT(6), - NVM_CHANNEL_UNIFORM = BIT(7), - NVM_CHANNEL_20MHZ = BIT(8), - NVM_CHANNEL_40MHZ = BIT(9), - NVM_CHANNEL_80MHZ = BIT(10), - NVM_CHANNEL_160MHZ = BIT(11), - NVM_CHANNEL_DC_HIGH = BIT(12), - NVM_CHANNEL_VLP = BIT(13), - NVM_CHANNEL_AFC = BIT(14), + NVM_CHANNEL_VALID = BIT(0), + NVM_CHANNEL_IBSS = BIT(1), + NVM_CHANNEL_ALLOW_20MHZ_ACTIVITY = BIT(2), + NVM_CHANNEL_ACTIVE = BIT(3), + NVM_CHANNEL_RADAR = BIT(4), + NVM_CHANNEL_INDOOR_ONLY = BIT(5), + NVM_CHANNEL_GO_CONCURRENT = BIT(6), + NVM_CHANNEL_UNIFORM = BIT(7), + NVM_CHANNEL_20MHZ = BIT(8), + NVM_CHANNEL_40MHZ = BIT(9), + NVM_CHANNEL_80MHZ = BIT(10), + NVM_CHANNEL_160MHZ = BIT(11), + NVM_CHANNEL_DC_HIGH = BIT(12), + NVM_CHANNEL_VLP = BIT(13), + NVM_CHANNEL_AFC = BIT(14), }; /** @@ -1659,6 +1663,10 @@ static u32 iwl_nvm_get_regdom_bw_flags(const u16 *nvm_chan, if (nvm_flags & NVM_CHANNEL_INDOOR_ONLY) flags |= NL80211_RRF_NO_OUTDOOR; + if (nvm_flags & NVM_CHANNEL_ALLOW_20MHZ_ACTIVITY && + flags & NL80211_RRF_NO_IR) + flags |= NL80211_RRF_ALLOW_20MHZ_ACTIVITY; + /* Set the GO concurrent flag only in case that NO_IR is set. * Otherwise it is meaningless */ From patchwork Thu Mar 6 11:48:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871499 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 991B720AF96 for ; Thu, 6 Mar 2025 11:49:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261761; cv=none; b=RAO92qlRKH5ufoTiNQnjfquBeNr1fS6IdH/fQVFnoB95h+xyUk/FOhecGk7Cdcwjk19BQdnCZQe43jDFW/7ecQMQK1PhP/Q9s/nF8aJ8AzyaaVsihunh1JabPa2Ad2ZpWQoL+0RfajJqD+lsj7YwnelZVqnXYsiHXCM9MbnSnNs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261761; c=relaxed/simple; bh=Fdhe8LOAuCkCUmDReNXyM/ZFsBgc8ZmpMHkeGbiRBxk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HkdWd9ZPLufwMrHZKwsWoaW71az4RK5U0skfqYvLYRwS6+o1LyT1RhvNOOE7HUZPYkxuX5dJbzyXjjwO4zOGNBmVnujIVluOjDFVcz7zkGXOXnwLV8uMEJvzBVkhVl64yjYGACfpzgA5ENEIz6OBPoZBKLeJNfuhV5L7xTzI5lo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=PCmyLxRe; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="PCmyLxRe" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261760; x=1772797760; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Fdhe8LOAuCkCUmDReNXyM/ZFsBgc8ZmpMHkeGbiRBxk=; b=PCmyLxReQHZpgEIfdOTuTngceGJd24onRJxOqJI+SJ3tLktw9e2SrKZR GjYWvRklwWHZB7El2DQRjN8OopoaQiWpCpd8krs4KMAyXcp2wtQbszf4M tr3YlBJeDxncktr/KALbvlxtS4o2FKeFyeDfzG9NrOSbO13k0FrpEYHkG 55e3+1JpsjTfKJUStcBwgd0/4Rm504AR8NnRM+sldsFQxAO88JEw084LO A7BjjOU11AsSt45glZZYW519hybgYe643pvPLnRiyEKbsO5Q0QhDDrgG3 1wIlLbUEoG7GwVVN2isnUQNoRz4I+uQOEcN/sepnFg2XfG3X0sNNuDTI2 g==; X-CSE-ConnectionGUID: WE+bO3uUSxWZpYNmsJ4Jpw== X-CSE-MsgGUID: Ry0oWuQ8Sge/FcI1koT/og== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474524" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474524" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:18 -0800 X-CSE-ConnectionGUID: Xf0O8owHSGqdLKqSDlPOpQ== X-CSE-MsgGUID: glsG06E9THyZMsFYp4dxWg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915543" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:16 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Pagadala Yesu Anjaneyulu Subject: [PATCH wireless-next 06/19] wifi: iwlwifi: mvm: cleanup of TAS structure and enums Date: Thu, 6 Mar 2025 13:48:42 +0200 Message-Id: <20250306134559.7e3f50cc412c.Ic2678dcb5afdacc2ca234d4aa4901e7e1f6e8dbb@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Pagadala Yesu Anjaneyulu Removed mvm prefix from the following structures and enum names: 1. struct iwl_tas_status_per_mac 2. struct iwl_tas_status_resp 3. enum iwl_tas_dyna_status 4. enum iwl_tas_statically_disabled_reason As these structures and enums are not specific to mvm. Replaced TAS_LMAC_BAND_LB, TAS_LMAC_BAND_HB, and TAS_LMAC_BAND_UHB macros with a generic BAND macro, as these macros are not specific to TAS. Signed-off-by: Pagadala Yesu Anjaneyulu Signed-off-by: Miri Korenblit --- .../net/wireless/intel/iwlwifi/fw/api/debug.h | 39 ++++++++----------- .../net/wireless/intel/iwlwifi/mvm/debugfs.c | 28 +++++-------- 2 files changed, 27 insertions(+), 40 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h b/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h index aa88e91d117e..e1b6795c1f64 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* - * Copyright (C) 2005-2014, 2018-2024 Intel Corporation + * Copyright (C) 2005-2014, 2018-2025 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ @@ -51,7 +51,7 @@ enum iwl_debug_cmds { /** * @GET_TAS_STATUS: * sends command to fw to get TAS status - * the response is &struct iwl_mvm_tas_status_resp + * the response is &struct iwl_tas_status_resp */ GET_TAS_STATUS = 0xA, /** @@ -439,25 +439,20 @@ struct iwl_dbg_dump_complete_cmd { __le32 tp_data; } __packed; /* FW_DUMP_COMPLETE_CMD_API_S_VER_1 */ -#define TAS_LMAC_BAND_HB 0 -#define TAS_LMAC_BAND_LB 1 -#define TAS_LMAC_BAND_UHB 2 -#define TAS_LMAC_BAND_INVALID 3 - /** - * struct iwl_mvm_tas_status_per_mac - tas status per lmac + * struct iwl_tas_status_per_mac - tas status per lmac * @static_status: tas statically enabled or disabled per lmac - TRUE/FALSE * @static_dis_reason: TAS static disable reason, uses - * &enum iwl_mvm_tas_statically_disabled_reason + * &enum iwl_tas_statically_disabled_reason * @dynamic_status: Current TAS status. uses - * &enum iwl_mvm_tas_dyna_status + * &enum iwl_tas_dyna_status * @near_disconnection: is TAS currently near disconnection per lmac? - TRUE/FALSE * @max_reg_pwr_limit: Regulatory power limits in dBm * @sar_limit: SAR limits per lmac in dBm * @band: Band per lmac * @reserved: reserved */ -struct iwl_mvm_tas_status_per_mac { +struct iwl_tas_status_per_mac { u8 static_status; u8 static_dis_reason; u8 dynamic_status; @@ -466,35 +461,35 @@ struct iwl_mvm_tas_status_per_mac { __le16 sar_limit; u8 band; u8 reserved[3]; -} __packed; /*DEBUG_GET_TAS_STATUS_PER_MAC_S_VER_1*/ +} __packed; /* DEBUG_GET_TAS_STATUS_PER_MAC_S_VER_1 */ /** - * struct iwl_mvm_tas_status_resp - Response to GET_TAS_STATUS + * struct iwl_tas_status_resp - Response to GET_TAS_STATUS * @tas_fw_version: TAS FW version * @is_uhb_for_usa_enable: is UHB enabled in USA? - TRUE/FALSE * @curr_mcc: current mcc * @block_list: country block list * @tas_status_mac: TAS status per lmac, uses - * &struct iwl_mvm_tas_status_per_mac + * &struct iwl_tas_status_per_mac * @in_dual_radio: is TAS in dual radio? - TRUE/FALSE * @uhb_allowed_flags: see &enum iwl_tas_uhb_allowed_flags. * This member is valid only when fw has * %IWL_UCODE_TLV_CAPA_UHB_CANADA_TAS_SUPPORT capability. * @reserved: reserved */ -struct iwl_mvm_tas_status_resp { +struct iwl_tas_status_resp { u8 tas_fw_version; u8 is_uhb_for_usa_enable; __le16 curr_mcc; __le16 block_list[16]; - struct iwl_mvm_tas_status_per_mac tas_status_mac[2]; + struct iwl_tas_status_per_mac tas_status_mac[2]; u8 in_dual_radio; u8 uhb_allowed_flags; u8 reserved[2]; -} __packed; /*DEBUG_GET_TAS_STATUS_RSP_API_S_VER_3*/ +} __packed; /* DEBUG_GET_TAS_STATUS_RSP_API_S_VER_3 */ /** - * enum iwl_mvm_tas_dyna_status - TAS current running status + * enum iwl_tas_dyna_status - TAS current running status * @TAS_DYNA_INACTIVE: TAS status is inactive * @TAS_DYNA_INACTIVE_MVM_MODE: TAS is disabled due because FW is in MVM mode * or is in softap mode. @@ -507,7 +502,7 @@ struct iwl_mvm_tas_status_resp { * @TAS_DYNA_ACTIVE: TAS is currently active * @TAS_DYNA_STATUS_MAX: TAS status max value */ -enum iwl_mvm_tas_dyna_status { +enum iwl_tas_dyna_status { TAS_DYNA_INACTIVE, TAS_DYNA_INACTIVE_MVM_MODE, TAS_DYNA_INACTIVE_TRIGGER_MODE, @@ -516,16 +511,16 @@ enum iwl_mvm_tas_dyna_status { TAS_DYNA_ACTIVE, TAS_DYNA_STATUS_MAX, -}; /*_TAS_DYNA_STATUS_E*/ +}; /** - * enum iwl_mvm_tas_statically_disabled_reason - TAS statically disabled reason + * enum iwl_tas_statically_disabled_reason - TAS statically disabled reason * @TAS_DISABLED_DUE_TO_BIOS: TAS is disabled because TAS is disabled in BIOS * @TAS_DISABLED_DUE_TO_SAR_6DBM: TAS is disabled because SAR limit is less than 6 Dbm * @TAS_DISABLED_REASON_INVALID: TAS disable reason is invalid * @TAS_DISABLED_REASON_MAX: TAS disable reason max value */ -enum iwl_mvm_tas_statically_disabled_reason { +enum iwl_tas_statically_disabled_reason { TAS_DISABLED_DUE_TO_BIOS, TAS_DISABLED_DUE_TO_SAR_6DBM, TAS_DISABLED_REASON_INVALID, diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c index 83e3c1160362..b453ad0000c8 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2012-2014, 2018-2023 Intel Corporation + * Copyright (C) 2012-2014, 2018-2023, 2025 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ @@ -542,7 +542,7 @@ static ssize_t iwl_dbgfs_tas_get_status_read(struct file *file, size_t count, loff_t *ppos) { struct iwl_mvm *mvm = file->private_data; - struct iwl_mvm_tas_status_resp *rsp = NULL; + struct iwl_tas_status_resp *rsp = NULL; static const size_t bufsz = 1024; char *buff, *pos, *endpos; const char * const tas_dis_reason[TAS_DISABLED_REASON_MAX] = { @@ -598,23 +598,19 @@ static ssize_t iwl_dbgfs_tas_get_status_read(struct file *file, pos += scnprintf(pos, endpos - pos, "TAS Conclusion:\n"); for (i = 0; i < rsp->in_dual_radio + 1; i++) { - if (rsp->tas_status_mac[i].band != TAS_LMAC_BAND_INVALID && - rsp->tas_status_mac[i].dynamic_status & BIT(TAS_DYNA_ACTIVE)) { + if (rsp->tas_status_mac[i].dynamic_status & + BIT(TAS_DYNA_ACTIVE)) { pos += scnprintf(pos, endpos - pos, "\tON for "); switch (rsp->tas_status_mac[i].band) { - case TAS_LMAC_BAND_HB: + case PHY_BAND_5: pos += scnprintf(pos, endpos - pos, "HB\n"); break; - case TAS_LMAC_BAND_LB: + case PHY_BAND_24: pos += scnprintf(pos, endpos - pos, "LB\n"); break; - case TAS_LMAC_BAND_UHB: + case PHY_BAND_6: pos += scnprintf(pos, endpos - pos, "UHB\n"); break; - case TAS_LMAC_BAND_INVALID: - pos += scnprintf(pos, endpos - pos, - "INVALID BAND\n"); - break; default: pos += scnprintf(pos, endpos - pos, "Unsupported band (%d)\n", @@ -668,20 +664,16 @@ static ssize_t iwl_dbgfs_tas_get_status_read(struct file *file, pos += scnprintf(pos, endpos - pos, "TAS status for "); switch (rsp->tas_status_mac[i].band) { - case TAS_LMAC_BAND_HB: + case PHY_BAND_5: pos += scnprintf(pos, endpos - pos, "High band\n"); break; - case TAS_LMAC_BAND_LB: + case PHY_BAND_24: pos += scnprintf(pos, endpos - pos, "Low band\n"); break; - case TAS_LMAC_BAND_UHB: + case PHY_BAND_6: pos += scnprintf(pos, endpos - pos, "Ultra high band\n"); break; - case TAS_LMAC_BAND_INVALID: - pos += scnprintf(pos, endpos - pos, - "INVALID band\n"); - break; default: pos += scnprintf(pos, endpos - pos, "Unsupported band (%d)\n", From patchwork Thu Mar 6 11:48:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871126 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84F2720B7E2 for ; Thu, 6 Mar 2025 11:49:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261762; cv=none; b=hSNjuHSpKejl8nEDRg14H3N+x6soK9lfTED8ZB9jngV1leFqAtWFiDSvT7VvlV3E2U1wttxzRVTBprhMnBnjSZvoNawX5/4HwuWm9EgXH3uFIgBvh3CYvzBfmTiDb3RVUV1hfzKThOWZeb92FIf+GI/qG0rrdv7UxsN3AA1w6w4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261762; c=relaxed/simple; bh=kzX5tu+ew83PjbPqBkcMUrtdK5UVT24DkjBm499PVt0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PTAcgcxVIdGJotr+lLSawGTQXnoXVmsNXbauLRR4nLo0yvZZyg1z50s8VGJRTcS2bkqMMFnqlpJoSv83XE+fyOpahK4gYI4N3v1nLn7VvsqVG5eJ1kH9cMyebzrOPRgYRQ2rW80awwCC/YJqwUfH9CwdjycZpXz/t2sBvxLhMOA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=FhFbpuRk; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="FhFbpuRk" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261761; x=1772797761; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kzX5tu+ew83PjbPqBkcMUrtdK5UVT24DkjBm499PVt0=; b=FhFbpuRkZ7uWn4kMMubOYFwvymuFrZe96zxV/cnz4rcRD0jexHWgxmmu W+XVCJVl82G+6bEWzANQOHPKcsmyGziVSQIIxl1kzo8ruZcK7Y72gD7v0 tYmNMPZFWVMRVEnf/fUjvKlT1XaZi/PmKOpPNLGGNdy5GgyuVQpPKMshU BGNwQpM+4M5RBsefxVjDq3GgTIyV5uL+Buwrn2Kx38003fxHUZQDSi2U/ yXzNCf+4gOASepODtdzc9sEbOAnKSNhoyzR0UVqMr8wWIxurSeBgtbzl5 o1gp1V9XmP/fx10URaTwV+oqfSyc58DYFVp7dRB0QaESxaC3jldPhelII g==; X-CSE-ConnectionGUID: zLfp839qSkyK4CdRSm1I4A== X-CSE-MsgGUID: Enenj+pZTWmY3nsCBE3rGw== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474527" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474527" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:20 -0800 X-CSE-ConnectionGUID: 025eNmD2TtWy2tVd+HUaDg== X-CSE-MsgGUID: sbMCaQIfQmqFIJLkTk4b2w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915556" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:18 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Pagadala Yesu Anjaneyulu Subject: [PATCH wireless-next 07/19] wifi: iwlwifi: Add new TAS disable reason for invalid table source Date: Thu, 6 Mar 2025 13:48:43 +0200 Message-Id: <20250306134559.6aadeaeaaeb7.I24f668ae716bee20cba15fdc73c3363693bbaf73@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Pagadala Yesu Anjaneyulu The new reason is added to the iwl_tas_statically_disabled_reason enum and the corresponding message is updated in the iwl_dbgfs_tas_get_status_read(). Signed-off-by: Pagadala Yesu Anjaneyulu Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 3 +++ drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h b/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h index e1b6795c1f64..0cf1e5124fba 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/debug.h @@ -518,12 +518,15 @@ enum iwl_tas_dyna_status { * @TAS_DISABLED_DUE_TO_BIOS: TAS is disabled because TAS is disabled in BIOS * @TAS_DISABLED_DUE_TO_SAR_6DBM: TAS is disabled because SAR limit is less than 6 Dbm * @TAS_DISABLED_REASON_INVALID: TAS disable reason is invalid + * @TAS_DISABLED_DUE_TO_TABLE_SOURCE_INVALID: TAS is disabled due to + * table source invalid * @TAS_DISABLED_REASON_MAX: TAS disable reason max value */ enum iwl_tas_statically_disabled_reason { TAS_DISABLED_DUE_TO_BIOS, TAS_DISABLED_DUE_TO_SAR_6DBM, TAS_DISABLED_REASON_INVALID, + TAS_DISABLED_DUE_TO_TABLE_SOURCE_INVALID, TAS_DISABLED_REASON_MAX, }; /*_TAS_STATICALLY_DISABLED_REASON_E*/ diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c index b453ad0000c8..6ffc04a23c6c 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c @@ -552,6 +552,8 @@ static ssize_t iwl_dbgfs_tas_get_status_read(struct file *file, "Due To SAR Limit Less Than 6 dBm", [TAS_DISABLED_REASON_INVALID] = "N/A", + [TAS_DISABLED_DUE_TO_TABLE_SOURCE_INVALID] = + "Due to table source invalid", }; const char * const tas_current_status[TAS_DYNA_STATUS_MAX] = { [TAS_DYNA_INACTIVE] = "INACTIVE", From patchwork Thu Mar 6 11:48:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871498 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7880F1EDA1F for ; Thu, 6 Mar 2025 11:49:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261762; cv=none; b=LUrb9pka5fecTYIqPFuNUoBEpzlR152FTT5kfcz+7yZsx6rDKiEj7rKzjpbpyhrHXNwW0MBuLewD41/4j62bWHAigQ4C4MNZk27eW9gAV7PDS7QEpxkLdSXvSOZZQOHdPd5NP9iADUuz0GRDJsH0yHfo7FetPdChEV0/RKfJAHg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261762; c=relaxed/simple; bh=bcd4UQWMKvC6bmrmjeZmoG55v00e9DSiCKaXv8YO56g=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=a0AEH4vhw9EmKDx0rWha+0QrGu9MZXn4+pZVr6tuhwWHarH7L4GkgwZZkrv1Mmx/WxPk0QJRg2uxAMX6LzGsDJkGtFmnjVVUVIbTVlkgBALCBCqdx9nCdn8Gy5eFCYoWZcOP66xcaom1N04XDOnMeWRBuF41h0TUQw02ZNiedDw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=CbyaM/DE; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="CbyaM/DE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261762; x=1772797762; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bcd4UQWMKvC6bmrmjeZmoG55v00e9DSiCKaXv8YO56g=; b=CbyaM/DEyRyDLQx/CtJo6wpewa9KvqaHwo/1yvww8y+vG4SSmXTPNEs9 sLjvSIgtRq5Wcp9XvjCrN8zdxVMzYGnR8WO5w8bajii18u6yEBfVBllqL EQ+e2xuxw6efjY1joGS6lqR+VkNW0DJ2WXAAM1K40d4iJfIg+sgkh1vvt QukNGLQMqxuZxURfCZ+FUsI4wREzzpRNgzWnhCk86E1pgvOnQHMUK8G3T vjBowZ8iWWyfEee1CaY6yKGUwUcBWVYd7tXR3IXTa0lIdiXvGupkh5ia8 b7um1VVztZ8AfiT462jOQ19oGi4xlakSoWSiI95p65ufurgupyaLo22xu w==; X-CSE-ConnectionGUID: upO8kwCTQUqM7uimU4xkzg== X-CSE-MsgGUID: bijYXTipS8+2vBt3Qk0qow== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474530" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474530" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:22 -0800 X-CSE-ConnectionGUID: fbgROyBUSTe3RLQzicVA2g== X-CSE-MsgGUID: z7/JX8vjST6vJGAPtuEiVw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915562" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:19 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg Subject: [PATCH wireless-next 08/19] wifi: iwlwifi: mark Br device not integrated Date: Thu, 6 Mar 2025 13:48:44 +0200 Message-Id: <20250306134559.0a9c43f2f74d.I197129383e5441c8139cbb0e810ae0b71198a37c@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Johannes Berg This is a discrete device, don't mark it as integrated. This also means we cannot set the LTR delay. Signed-off-by: Johannes Berg Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c index e58fe8210988..09df9037c91d 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c @@ -148,11 +148,9 @@ const struct iwl_cfg_trans_params iwl_br_trans_cfg = { .mq_rx_supported = true, .rf_id = true, .gen2 = true, - .integrated = true, .umac_prph_offset = 0x300000, .xtal_latency = 12000, .low_latency_xtal = true, - .ltr_delay = IWL_CFG_TRANS_LTR_DELAY_2500US, }; const char iwl_br_name[] = "Intel(R) TBD Br device"; From patchwork Thu Mar 6 11:48:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871125 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 871D320B1E3 for ; Thu, 6 Mar 2025 11:49:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261765; cv=none; b=ZTvuW3YowxTh2uzeem5/RS5X2GVYEwqZHk9nfJygZIe6pmXYla8jzZEuNaC+qwZ/mzw7s1NfeNwec5NcNTE1fWSck6tnNlO3DdK4ZiuunzBAk67lwwaFV++bDdxIr/8Ce0Fr8PLM5WEvNrKuIdQSUyqNHQ6FjKtjVnPVgBRNf0g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261765; c=relaxed/simple; bh=sa7vOZzSkawInADUnsvelr4iWp2BgINI7uEkWPmoFzE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PxV5l1v712J2k2qGQie6PC/kwS4JPX9S0uG4fwZX9Z7IWflKTQ0LdKYS6+bG+gfEDNRLGocBHUVLjaPj8ONxlJwF6PQZk57IiuWejzvRdGpyxMQ53G9cjfzKqB9s6VKFHldpzWHjeMNAQ8HQJ/xAlPfg1J/GJcFFtx8LbWxK3GQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=BSorfeh1; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="BSorfeh1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261764; x=1772797764; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sa7vOZzSkawInADUnsvelr4iWp2BgINI7uEkWPmoFzE=; b=BSorfeh1Kh28KDaHwfzxAMXk+BOM7GiXHSut068+LaQJMnQ9qb/5rgOp 90SebU8NEpTPrQ20+ZUdk9E3WYe3wLI03R3ofHmmnbkD7+uuednJ8sk9t KHdTCecZmhYL0cPOEuQ0OOlD84/Q+F2Ivrwsx+8gAW1P9zJnlonhZKzgi SeRErm4pgsyqKLXxT3QfvMYwSdDVnicSYO4x/FLZRmhg696Pd3pGz2EsN 97uD84qUZKBbRWsiZ28fUXwFEQKyTi1r/gFPLs466YY2zactpEdm0pPFI WHFP/zRS4M2p/9RrvEemJzq+d3mvqNU2YcMKydwDIPNVUO8ZQv6GOztTz w==; X-CSE-ConnectionGUID: QCVl99T6SUa9LqIB7yJFnA== X-CSE-MsgGUID: K/Z6Id/CSUuaVzqDBX2xrg== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474533" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474533" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:23 -0800 X-CSE-ConnectionGUID: 5saN9s3BQVScvwiTsDSxWQ== X-CSE-MsgGUID: rhPU0mmYTZiFkrG6lzwaTw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915565" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:21 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg Subject: [PATCH wireless-next 09/19] wifi: iwlwifi: fix debug actions order Date: Thu, 6 Mar 2025 13:48:45 +0200 Message-Id: <20250306134559.030293ebd899.I40632c48e2a67a8aca05def572a934b88ce7934b@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Johannes Berg The order of actions taken for debug was implemented incorrectly. Now we implemented the dump split and do the FW reset only in the middle of the dump (rather than the FW killing itself on error.) As a result, some of the actions taken when applying the config will now crash the device, so we need to fix the order. Signed-off-by: Johannes Berg Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c index 08d990ba8a79..ce787326aa69 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation */ #include #include "iwl-drv.h" @@ -1372,15 +1372,15 @@ void _iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt, switch (tp_id) { case IWL_FW_INI_TIME_POINT_EARLY: iwl_dbg_tlv_init_cfg(fwrt); - iwl_dbg_tlv_apply_config(fwrt, conf_list); iwl_dbg_tlv_update_drams(fwrt); iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, NULL); + iwl_dbg_tlv_apply_config(fwrt, conf_list); break; case IWL_FW_INI_TIME_POINT_AFTER_ALIVE: iwl_dbg_tlv_apply_buffers(fwrt); iwl_dbg_tlv_send_hcmds(fwrt, hcmd_list); - iwl_dbg_tlv_apply_config(fwrt, conf_list); iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, NULL); + iwl_dbg_tlv_apply_config(fwrt, conf_list); break; case IWL_FW_INI_TIME_POINT_PERIODIC: iwl_dbg_tlv_set_periodic_trigs(fwrt); @@ -1390,14 +1390,14 @@ void _iwl_dbg_tlv_time_point(struct iwl_fw_runtime *fwrt, case IWL_FW_INI_TIME_POINT_MISSED_BEACONS: case IWL_FW_INI_TIME_POINT_FW_DHC_NOTIFICATION: iwl_dbg_tlv_send_hcmds(fwrt, hcmd_list); - iwl_dbg_tlv_apply_config(fwrt, conf_list); iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, iwl_dbg_tlv_check_fw_pkt); + iwl_dbg_tlv_apply_config(fwrt, conf_list); break; default: iwl_dbg_tlv_send_hcmds(fwrt, hcmd_list); - iwl_dbg_tlv_apply_config(fwrt, conf_list); iwl_dbg_tlv_tp_trigger(fwrt, sync, trig_list, tp_data, NULL); + iwl_dbg_tlv_apply_config(fwrt, conf_list); break; } } From patchwork Thu Mar 6 11:48:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871497 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 41A8820AF6D for ; Thu, 6 Mar 2025 11:49:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261766; cv=none; b=Kn8Bd+fZCSVH1BbPxN0MftpxV/DgKA7Ijv56XxHS1zDGzb7pzO9VvgQt+D/j/6qnKNz5oFSUwceLb246QKNZG6HL/qRPiVlBrYrfxkoamtb6hB8T5s3DUNWkSAo6zNarwokVPGIQWQrmr545dj5nMAUplU+1w8PO5w4G7t2V4zI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261766; c=relaxed/simple; bh=Pj0p2paligLz2ZvpOs3SXHK7UYAOvX5cSNksAWAn4lM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=s0VW8bI9yAQjJjS+Y3ma+Z47J1s0qxQYGHLrs7L3pZShw3P2f8meZvsAqR/D5qbgzXPv4DwRkQPn97/eJYE8A84gsnrMKY+If/JMb1BoDafT83Xoi4mV7HTsIOP0Y51OKGdusR4uA5TtJKwHY3LXjWqhlcn2yHHDOc+S1lSUb48= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=EMLFZn0a; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="EMLFZn0a" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261766; x=1772797766; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Pj0p2paligLz2ZvpOs3SXHK7UYAOvX5cSNksAWAn4lM=; b=EMLFZn0aEIQXWctNtj1s8cC3ofLSVjEytBuuXbEQl2bS9xHIUzSKppWD q8Y0TOKXOHsPn3sAB0/zTqtXh5VP1OFnpf+3lWw3PXYkfembMzkOCMQqP DAnzTkgw3TemyCk8i9Q/Y2d8mvSLraptHSSJr3obB9sprNpdJKU4mP5ki 8rvSvMklvFGV7OhTyVNg4BU+JxRBFATxtgV5LzImj5nO13LrfyksOM3EO /EM071QN/Gt7N9yyvzCy8KgJvbVxdxZzut8qZkv3ixbGOBSlkRIagm+iW 8Ve6DpxKpx/fT7KhXcoFIYhBfvDz/NODI6zRTwEoRQjIWYDTOvUXQIAy2 g==; X-CSE-ConnectionGUID: julyHMzPSj2l5FcqHGUTJQ== X-CSE-MsgGUID: ta6Nj5rURL26lj77+eK+1g== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474539" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474539" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:25 -0800 X-CSE-ConnectionGUID: Eht/x97oRGKiMYDed5DEZA== X-CSE-MsgGUID: GByS5J5lSLSskFTfokW/7A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915568" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:23 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Daniel Gabay Subject: [PATCH wireless-next 10/19] wifi: iwlwifi: w/a FW SMPS mode selection Date: Thu, 6 Mar 2025 13:48:46 +0200 Message-Id: <20250306134559.048692d86327.I2c793ff1fc2a6779a95faaee1ded348100fd97f1@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Daniel Gabay The FW is now responsible of determining the SMPS mode. If the user disabled power save in a certain vif, we send the vif-level power command to clear out the POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK bit for that vif. But erroneously, the FW checks DEVICE_POWER_FLAGS_POWER_SAVE_ENA_MSK in the device-level command to determine the SMPS mode. To W/A this, send also the device-level command when the power save of a vif changes, and disable power save if there is any vif that has power save disabled. Signed-off-by: Daniel Gabay Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 15 +++++++++++++++ .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 3 ++- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 +++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 20aaef913e3f..1e916a0ce082 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -4100,6 +4100,20 @@ iwl_mvm_sta_state_authorized_to_assoc(struct iwl_mvm *mvm, return 0; } +void iwl_mvm_smps_workaround(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + bool update) +{ + struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); + + if (!iwl_mvm_has_rlc_offload(mvm)) + return; + + mvmvif->ps_disabled = !vif->cfg.ps; + + if (update) + iwl_mvm_power_update_mac(mvm); +} + /* Common part for MLD and non-MLD modes */ int iwl_mvm_mac_sta_state_common(struct ieee80211_hw *hw, struct ieee80211_vif *vif, @@ -4192,6 +4206,7 @@ int iwl_mvm_mac_sta_state_common(struct ieee80211_hw *hw, new_state == IEEE80211_STA_AUTHORIZED) { ret = iwl_mvm_sta_state_assoc_to_authorized(mvm, vif, sta, callbacks); + iwl_mvm_smps_workaround(mvm, vif, true); } else if (old_state == IEEE80211_STA_AUTHORIZED && new_state == IEEE80211_STA_ASSOC) { ret = iwl_mvm_sta_state_authorized_to_assoc(mvm, vif, sta, diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c index 341a2a7a49ec..78d7153a0cfc 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-mac80211.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2022-2024 Intel Corporation + * Copyright (C) 2022-2025 Intel Corporation */ #include "mvm.h" @@ -887,6 +887,7 @@ static void iwl_mvm_mld_vif_cfg_changed_station(struct iwl_mvm *mvm, } if (changes & BSS_CHANGED_PS) { + iwl_mvm_smps_workaround(mvm, vif, false); ret = iwl_mvm_power_update_mac(mvm); if (ret) IWL_ERR(mvm, "failed to update power mode\n"); diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h index b6e0b63cbd3c..f6391c7a3e29 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h @@ -3031,4 +3031,7 @@ iwl_mvm_send_ap_tx_power_constraint_cmd(struct iwl_mvm *mvm, struct ieee80211_vif *vif, struct ieee80211_bss_conf *bss_conf, bool is_ap); + +void iwl_mvm_smps_workaround(struct iwl_mvm *mvm, struct ieee80211_vif *vif, + bool update); #endif /* __IWL_MVM_H__ */ From patchwork Thu Mar 6 11:48:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871124 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 75FFF1A0711 for ; Thu, 6 Mar 2025 11:49:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261768; cv=none; b=GTtuyer/XZEmniXKddf6TwT+rlUboZjtA1McFSybxftRjxl+lrMDnTFGCLkqnzmF35d3hk8wtiTJ3ToCW0MrWSHYZChSjBAsnkxbNWpJLhmBr+2e0I2jNbg9ppQonpYwtglfQxoYLgmnPTBKsD6jotitJibLs69qkw6/87hEPks= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261768; c=relaxed/simple; bh=Lvi7BfNv2bRCFi4MHBrGC8IskUYwUo2kII2i6+tJ10A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PWC45k+65UR7765L+gDbt4ckC9SE9V7MULBTkesVwc1qaaEvRJd59OsUEhnJOAVMqXVriQq5JCDMBsmmBA8pzal9OxMpDTs+ReGiBPeV0wfTFjRmFUb3g6dwOdKHSW0DsT7A99jutkaf5a9X+fnP2ttlpS689Vl0j25kOefCNlY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=n4Z7pium; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="n4Z7pium" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261767; x=1772797767; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Lvi7BfNv2bRCFi4MHBrGC8IskUYwUo2kII2i6+tJ10A=; b=n4Z7piumru24r39Mv9cKw4/eFHnsS9K3HI2r/7V2FLfzGBunFbE7jlo5 Rmkrr3FI+s05YtKzpmdwA0bLyYQERkn7qTorHLVj8z6PkyFM/QPbOV4Tx Azi17jvdKXdQmW2nlshHHYnSAeV1OKQYCfMyNyvMAd4KYn/2g/SD3daAQ lgW3z9Fqzyi00iXs9G1H/yzhKleHhlpdhBpQsvBESVEVsVwDPKOyB6pav 9SCQ/nz8vuDWNtgiXmXL8ZXBoiq1nT9ph5lGGRvF44VcED0YxPhNwa2xN c+dHSZQPJveDDzWx2tERSr9mSMpm/WSn5Qwgr47krCaYOBvFhsI1b09HW A==; X-CSE-ConnectionGUID: YONWPvgkQzemfaS+14xwJQ== X-CSE-MsgGUID: GE5l7o3yQviNAWLsdAlEow== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474541" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474541" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:27 -0800 X-CSE-ConnectionGUID: 4BrJMTU4TXmU+EIm5UQplQ== X-CSE-MsgGUID: 1Jo0zl1kRtCUQSgwyBLvXg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915572" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:24 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Pagadala Yesu Anjaneyulu Subject: [PATCH wireless-next 11/19] wifi: iwlwifi: mvm: Fix bit size calculation in iwl_dbgfs_tas_get_status_read Date: Thu, 6 Mar 2025 13:48:47 +0200 Message-Id: <20250306134559.6894035de050.If2cea63035333b07849e5a2c2a4f5dc5c5239595@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Pagadala Yesu Anjaneyulu Corrected the bit size calculation in the for_each_set_bit macro in the iwl_dbgfs_tas_get_status_read(). The previous implementation used sizeof(dyn_status), which only accounts for the number of bytes. This has been updated to TAS_DYNA_STATUS_MAX to ensure the loop iterates over the correct number of valid bits in dyn_status. Signed-off-by: Pagadala Yesu Anjaneyulu Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c index 6ffc04a23c6c..1289ff3ab162 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c @@ -698,11 +698,9 @@ static ssize_t iwl_dbgfs_tas_get_status_read(struct file *file, pos += scnprintf(pos, endpos - pos, "Dynamic status:\n"); dyn_status = (rsp->tas_status_mac[i].dynamic_status); - for_each_set_bit(tmp, &dyn_status, sizeof(dyn_status)) { - if (tmp >= 0 && tmp < TAS_DYNA_STATUS_MAX) - pos += scnprintf(pos, endpos - pos, - "\t%s (%d)\n", - tas_current_status[tmp], tmp); + for_each_set_bit(tmp, &dyn_status, TAS_DYNA_STATUS_MAX) { + pos += scnprintf(pos, endpos - pos, "\t%s (%d)\n", + tas_current_status[tmp], tmp); } pos += scnprintf(pos, endpos - pos, From patchwork Thu Mar 6 11:48:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871496 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C1D4B20C00C for ; Thu, 6 Mar 2025 11:49:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261769; cv=none; b=LtHE94/2pZDUhrmp+czVXnQOWl7tNNkjzmV1HuTbbGGIdNoDCEiEaYpMiw+Nh6M4nVMBiDXq1glEyDWJZHVECD8LNv1FPae7ezDmW4zNJdP4+kS8SdwV8JV4KklNHlZyYmatVP1XryQBXDuNzjxC7F4QN8cJFn5p5nTg7qMPpjA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261769; c=relaxed/simple; bh=dFoIkK4Zq5SfnobMXIBldKnjGlGvNU0JEJa612kG4Vw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jJc+wh79FXHvPRI65G8BQnc7uzVyVSJwnb6jjCDE517E4yIKRP3EdP72QBqhtz4e8Qs0PJwBi/K7n0WCV6AUiNCl0QqP+2Qv4paLlM9TwrWaP9K9j4WFI3cfQcd530JtT3RljWWdTIkgJ5QGPrzSl3Z59uc39ldAX9hRA1RCzLs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=P8Hxx1ur; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="P8Hxx1ur" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261768; x=1772797768; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dFoIkK4Zq5SfnobMXIBldKnjGlGvNU0JEJa612kG4Vw=; b=P8Hxx1urfv+N0bvHg8PfS9KZ3NLa+4qugkfu5x+LuoTrwn0nytzs647C i1B3WFP7VzGSBlEUsoQMIV1zZV7hfJaeovdsVnnrnthF3tp5gKTXa1dTN xCuYJoRuQELjMrM6/PAH9o9oDGPHdVCBKC/cBFpzBvO0QRQifYlCBTLgA PZFUoqOE7NKi4fn2HPLLRAY9stSR3F0OnK/t3p/Svdrq1pQhl50D2/Rej VBncpzCTit05IHIj9ETV9L7WDS3ua3LklV31cjy+K+hEFZektVgOS4XcC kagJ4v+TjBSeqxYVJtDBONE1Iov6eie54KDTxhnGUyu0Yq6sBYaDcCz28 g==; X-CSE-ConnectionGUID: CeE4rGnAQhqwWcPMnne9+Q== X-CSE-MsgGUID: Xe12nBhiSuuizXINy2YyYg== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474543" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474543" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:28 -0800 X-CSE-ConnectionGUID: 7WQG1clxTt20gjDcF2Jd/g== X-CSE-MsgGUID: BUJtmMwyQnKm7iZFytppcw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915573" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:26 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org Subject: [PATCH wireless-next 12/19] wifi: iwlwifi: bump FW API to 98 for BZ/SC/DR devices Date: Thu, 6 Mar 2025 13:48:48 +0200 Message-Id: <20250306134559.9bfec241c554.I333f1e7fa31f9da1d40f668660c1e25b93ff469e@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited Start supporting API version 98 for those devices. Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 4 ++-- drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 4 ++-- drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c index e0ec9d6337e4..d7636f817b01 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation */ #include #include @@ -10,7 +10,7 @@ #include "fw/api/txq.h" /* Highest firmware API version supported */ -#define IWL_BZ_UCODE_API_MAX 97 +#define IWL_BZ_UCODE_API_MAX 98 /* Lowest firmware API version supported */ #define IWL_BZ_UCODE_API_MIN 92 diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c index 09df9037c91d..282b9b846c3a 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2024 Intel Corporation + * Copyright (C) 2024-2025 Intel Corporation */ #include #include @@ -9,7 +9,7 @@ #include "fw/api/txq.h" /* Highest firmware API version supported */ -#define IWL_DR_UCODE_API_MAX 97 +#define IWL_DR_UCODE_API_MAX 98 /* Lowest firmware API version supported */ #define IWL_DR_UCODE_API_MIN 96 diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c index 46c2f3f105ee..a9fc9e8ec431 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation */ #include #include @@ -10,7 +10,7 @@ #include "fw/api/txq.h" /* Highest firmware API version supported */ -#define IWL_SC_UCODE_API_MAX 97 +#define IWL_SC_UCODE_API_MAX 98 /* Lowest firmware API version supported */ #define IWL_SC_UCODE_API_MIN 92 From patchwork Thu Mar 6 11:48:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871123 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5FD961A0711 for ; Thu, 6 Mar 2025 11:49:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261770; cv=none; b=iqIwJ5jxLMWOpyzJr4U8Rlui/mbfw8jCVA9+CmZZZi0HsGUV/bHhBS5XPKcYOpDeCaYaBYSQVpPAtcLK2ObfOFBAr3pXQ9NY7RBS3J/j00VC0gMQSDdVt1zwdcbNT5P6/gfKM2hG+pnT2zz25XMs/d9dwQ69d3lgEurcyVDtH4Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261770; c=relaxed/simple; bh=aECVySNzn2V3AsKAmU1Lsz6ZK6tSpZELmMu9+FYa1SA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Fsk1R0iwFMlZL5JRYuLZLIvQVAJ+BWbZvNROGTusW1pHUJUmyS6fwIEc9ULY4ueZ+i6F7ywmpY2PUWeHUxxisbjXg78WJHdYkKqiigU3VrbNWQbg956go2cPUcV08kU9igfLhitxvJzdxf2a8nkVoZVx5HO9vczlvvMg9oU6ddA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=eAA/pTTw; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="eAA/pTTw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261770; x=1772797770; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aECVySNzn2V3AsKAmU1Lsz6ZK6tSpZELmMu9+FYa1SA=; b=eAA/pTTwd2lAc6lMZ6qbO31ssQ36DjTRueainkjj3k5qLn9N21VXCQLu 5o4SIzijDpdypSxoNLnu3g1Rgtpwa/aDNlSHYQw/Xp/2aNOXo2HXH29js JA8aAC1xqvJQ85+jUgq2WKSTZnmS3EtNFvToJmolJ11vGrlXHVy9vzkiv 3ehyfJrRchA2iBLOj+1SnK4PYGWiN7u8mV7SCeOUBczIy1LJLY089tK+N mjwAbmoPP0f8eR9aS7zXoM1hbae9EDIj0nwUJIJItS3Ps/FI1OM0u/saN Kkg/hLXCz90lOBk3NFKhKLFMS1hR+/GucFIyFEtrb3Q9908GSQV7dl9EB A==; X-CSE-ConnectionGUID: dw0K3mVNSgGzfBPjbpDb/Q== X-CSE-MsgGUID: BDZ14ezTT/ax1rweBMJJow== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474547" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474547" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:30 -0800 X-CSE-ConnectionGUID: cNuI64zUSiueYx34n5Q74g== X-CSE-MsgGUID: nM6MfQmrQJKOz9UnxtFZkg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915575" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:28 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org Subject: [PATCH wireless-next 13/19] wifi: iwlwifi: bump minimum API version in BZ/SC to 93 Date: Thu, 6 Mar 2025 13:48:49 +0200 Message-Id: <20250306134559.e6b7fb55e44d.I942fa8cafc1791b9330ad18e2599fae11d7b3336@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited Stop supporting older FWs. Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 2 +- drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c index d7636f817b01..50be8ee8a637 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c @@ -13,7 +13,7 @@ #define IWL_BZ_UCODE_API_MAX 98 /* Lowest firmware API version supported */ -#define IWL_BZ_UCODE_API_MIN 92 +#define IWL_BZ_UCODE_API_MIN 93 /* NVM versions */ #define IWL_BZ_NVM_VERSION 0x0a1d diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c index a9fc9e8ec431..670031fd60dc 100644 --- a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c +++ b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c @@ -13,7 +13,7 @@ #define IWL_SC_UCODE_API_MAX 98 /* Lowest firmware API version supported */ -#define IWL_SC_UCODE_API_MIN 92 +#define IWL_SC_UCODE_API_MIN 93 /* NVM versions */ #define IWL_SC_NVM_VERSION 0x0a1d From patchwork Thu Mar 6 11:48:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871495 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A2ABF20C00C for ; Thu, 6 Mar 2025 11:49:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261772; cv=none; b=Fb5jQth79WyijVneQvomKJ9riPpN5ZN7xeB7ZW1ZpZqbRxi3Kz5z0QwJlikcN5rGPNPhbp6X12tAWlZel/1FssvOY/BRTCfNkZ3P/I8UkgPOZ3tJ0IKvsPZmcI7YbURriVfspBfcQ17WdP0Zu9Gtc96AXmY4UHU/brAq3FbXXmg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261772; c=relaxed/simple; bh=+syhqyEU7ZeN3xxAqNsIFIuAmJpnrWfr6M2cgkxY0gQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cH9NybJeg0jET6GaDuDbhe6hGxB3o5nBBuZvgU/Lmyu+HpFPi/GQ1V+nQAtfcqKQxp2zEMfYZjOic5R1hp360b2ko27JCoC3iNcWSLj/udVgkVAusxLbVhfK1G3kgCbxg55pSUF3P2KMmFjqJlg6qAUaDYTuc9FX3xqJVDiZNTg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=GlpGOM+E; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="GlpGOM+E" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261771; x=1772797771; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+syhqyEU7ZeN3xxAqNsIFIuAmJpnrWfr6M2cgkxY0gQ=; b=GlpGOM+EUo+VxH77eeDd4Gs0CzqC9kErT3um73SITEFPROhYaubcANpA B1cfviIUdWCGN865YLv9GHII2WFCHIpJyHayBX4/XPfYS14+MiYy2xdg/ qQ0QPCGT4rFqXgdpYQm/cxFs2OlGFsnhZuCyYtoGsN8FYs8gVcZSUtjn/ yPIiiLXlPOsDeldLQZfnnMBHG1hpn6JWjTPPCcEW73yPTsIT2MgWV3sHG /Cg5hdhaJIR/2s7gVbcIM1WNI7zxdkVhyHVRUexiL1r0IVQRRSUFkSprO Yr5RKFsVXQWTi4yrye8VIltICoNZU8b9k5b7jZsR4Kl/e+n2daWaNE+I5 A==; X-CSE-ConnectionGUID: 5QLf+yMnT0WWta8X4mjL4w== X-CSE-MsgGUID: AqreYuUDT4SQ4d+s/arnPQ== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474552" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474552" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:31 -0800 X-CSE-ConnectionGUID: aktLbxJ9SVeF+4mXOGzmYg== X-CSE-MsgGUID: s8ukZ/BzQpCEVKy316AYOQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915578" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:29 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org Subject: [PATCH wireless-next 14/19] wifi: iwlwifi: don't warn when if there is a FW error Date: Thu, 6 Mar 2025 13:48:50 +0200 Message-Id: <20250306134559.9c109c8b31e1.I9332506af1997faefcf0bdb51d98d5e874051722@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited iwl_trans_reclaim is warning if it is called when the FW is not alive. But if it is called when there is a pending restart, i.e. after a FW error, there is no need to warn, instead - return silently. Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c index 1632ab20a23f..ea67df09fc01 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c @@ -2,7 +2,7 @@ /* * Copyright (C) 2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH - * Copyright (C) 2019-2021, 2023-2024 Intel Corporation + * Copyright (C) 2019-2021, 2023-2025 Intel Corporation */ #include #include @@ -639,6 +639,9 @@ IWL_EXPORT_SYMBOL(iwl_trans_tx); void iwl_trans_reclaim(struct iwl_trans *trans, int queue, int ssn, struct sk_buff_head *skbs, bool is_flush) { + if (unlikely(test_bit(STATUS_FW_ERROR, &trans->status))) + return; + if (WARN_ONCE(trans->state != IWL_TRANS_FW_ALIVE, "bad state = %d\n", trans->state)) return; From patchwork Thu Mar 6 11:48:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871122 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8D08220C02D for ; Thu, 6 Mar 2025 11:49:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261774; cv=none; b=ck9YIwMm9kBGDCAeBGFJk3c/EM8tGmXEjXdL2Q+XbfcZox2iFX+KagmeFvPuxOPjkAQ5XdTOWjRykpNV4DCI0iP8O/FdLvXii0azG/wA1KsWYPqU1v/u/boZ6rIm+KtVNy26kk6SHA675U2eOAZHfT+tBW9hpp61czA2R5AEwMk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261774; c=relaxed/simple; bh=Ftz9yaIImFok3saQwRb8ogCHQwoS/w1X7gQUJqAsBmI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dESuOGxVl43Ct4Oox7Eh3Ifm/hQ6SqX6d4VW7g2Z+06KHooudXeoRt9mbXpGLP2KnoXnG7NBawz/E2apF5q6EVsuZIvWHR07IWELe2g0C4kmrLJDoDsf37IyyNcCT5fuW8gJyMcs3TJpPoOIVepIao80+euqmMVr1ZSCFqfVEFA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=LNTCGGhx; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="LNTCGGhx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261773; x=1772797773; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ftz9yaIImFok3saQwRb8ogCHQwoS/w1X7gQUJqAsBmI=; b=LNTCGGhxQ0gU5uUYBcoBxekQCeAkuJl6KPg6UGJbYXThaY6rzEbpdklJ EvrhPmpTEhlJwsegCKXF5+RHR0t9YYnIEIfXN0ayNKIBdtjUIXflpHOyP 6LqNb9/WjbMyiYCoGaglKjBGPYSK+gEXHT65ePpxHrN2dZIQSX+JqmJtF rCK4E88DWOcemuoJtnHJZV5G/kU74EKMZ0bvou7m6ZRNuhsTPq1e73791 ejCHQvqGiE2y2/b53EmgsFno2YyKYN0YKlgcXqQO2NPx6wdzypnCLff/k z11TFETOF0p69JkXxCBVJYB1KR1yt5qhd2KjrTEX5J97upoNQmuifhMz6 A==; X-CSE-ConnectionGUID: pMjCjHrkT7+0otWHgOuRDg== X-CSE-MsgGUID: fdF7Gf2PSSqKvcpceKetaA== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474559" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474559" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:33 -0800 X-CSE-ConnectionGUID: PzI7Uf+QRT+W3pThc2wGHw== X-CSE-MsgGUID: i+BzfEtjQIOdmenuIg57jw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915584" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:30 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, nerrera Subject: [PATCH wireless-next 15/19] wifi: iwlwifi: add restricted TWT capability Date: Thu, 6 Mar 2025 13:48:51 +0200 Message-Id: <20250306134559.1435681da109.I08ecc8ead59e0869445b5802c13002dae99f68fd@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: nerrera Set the restricted TWT capability bit if FW supports it. Signed-off-by: nerrera Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/fw/file.h | 4 +++- drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h index 9860903ecd3f..770991d0c60b 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/file.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* - * Copyright (C) 2008-2014, 2018-2024 Intel Corporation + * Copyright (C) 2008-2014, 2018-2025 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ @@ -404,6 +404,7 @@ typedef unsigned int __bitwise iwl_ucode_tlv_capa_t; * @IWL_UCODE_TLV_CAPA_UHB_CANADA_TAS_SUPPORT: supports %TAS_UHB_ALLOWED_CANADA * * @NUM_IWL_UCODE_TLV_CAPA: number of bits used + * @IWL_UCODE_TLV_CAPA_RESTRICTED_TWT_SUPPORT: Supports restricted TWT operation */ enum iwl_ucode_tlv_capa { /* set 0 */ @@ -504,6 +505,7 @@ enum iwl_ucode_tlv_capa { IWL_UCODE_TLV_CAPA_MONITOR_PASSIVE_CHANS = (__force iwl_ucode_tlv_capa_t)122, IWL_UCODE_TLV_CAPA_BIOS_OVERRIDE_5G9_FOR_CA = (__force iwl_ucode_tlv_capa_t)123, IWL_UCODE_TLV_CAPA_UHB_CANADA_TAS_SUPPORT = (__force iwl_ucode_tlv_capa_t)124, + IWL_UCODE_TLV_CAPA_RESTRICTED_TWT_SUPPORT = (__force iwl_ucode_tlv_capa_t)126, NUM_IWL_UCODE_TLV_CAPA /* * This construction make both sparse (which cannot increment the previous diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index 018752b8c4d8..d3d95153a671 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -11,6 +11,7 @@ #include #include +#include "fw/file.h" #include "iwl-drv.h" #include "iwl-modparams.h" #include "iwl-nvm-parse.h" @@ -1116,6 +1117,10 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans, iftype_data->eht_cap.eht_cap_elem.phy_cap_info[8] &= ~IEEE80211_EHT_PHY_CAP8_RX_4096QAM_WIDER_BW_DL_OFDMA; } + + if (fw_has_capa(&fw->ucode_capa, IWL_UCODE_TLV_CAPA_RESTRICTED_TWT_SUPPORT)) + iftype_data->eht_cap.eht_cap_elem.mac_cap_info[0] |= + IEEE80211_EHT_MAC_CAP0_RESTRICTED_TWT; } static void iwl_init_he_hw_capab(struct iwl_trans *trans, From patchwork Thu Mar 6 11:48:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871494 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E2EC20C48B for ; Thu, 6 Mar 2025 11:49:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261775; cv=none; b=iAx7y4ghhL7lXbk8V0ZDEnMqsXCUBttVNvwX3h2FzBBMM2M8ZgYTNzJeJW9oXOrvDyDYeLe28mzjqcLwmi7F37JNRcJtjsL6T86By97miM+jCSAW6eDKnrBGKgxbQcWPf5eh08NH1sPM58/KwN7gnTNc1J/N58IddzmgwyJjaRw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261775; c=relaxed/simple; bh=Fs0s/aimuoS/iHurGf8VxnMtc9mb6hXdFm4hTzV0Yuw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QU+PFRNyrxorWtNIiTUFflzYfYPIE4CMHYhdWRyVuFT31ST/KWDhZifvYLvFmCcbbo8/7XXlWWwRWnclR1S99DA15duuLV29Wuvw6eqMLSEAxaObkdWuFW+B0G94SgAKDNiBxG4V2XtU9M73L+ebTKVbMQtK8dlfP9tbzpgXhs4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=Zv3uvsg9; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Zv3uvsg9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261775; x=1772797775; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Fs0s/aimuoS/iHurGf8VxnMtc9mb6hXdFm4hTzV0Yuw=; b=Zv3uvsg9RnIj4mUjKEbhkyrSGJ4BBJlhNeHLIcHy7CdT9DdQpyqdre5J muNRMfcfLpy+ahwKhK6myzG6pxuNH9zwopw3yKGtwO5BwjAgN0DIqQDgu /Iq2qaTUwe5Eq0mSS5DtZsr1sDp7TeArdFpnhSWQbml5y1e/dsr77mJDT TTHI51+nDgLiwee6VwUb6OKVBAF9SJOtvAWpr2d0/amkXzVEPaJgspXdd Xbf53wiUh43emQ+3nxdmtpnGz54Tv6b4n5nBrsl2oZqX7yyj3W5D4wF6W XhiVrdPlO8PQOX6VFDpIQgg3LMKqSZFGU061QvNRe9aidL2rawxsM+wxD Q==; X-CSE-ConnectionGUID: qFI7WWWgQLivqjyHhnDWvQ== X-CSE-MsgGUID: tQ2WknUtR3GmXI7cI0MDyg== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474561" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474561" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:34 -0800 X-CSE-ConnectionGUID: kqXdlb0oTgqyeF67Xh4GsA== X-CSE-MsgGUID: dqf7GA6zRNeMrPGGfvFI0w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915587" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:32 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Avraham Stern Subject: [PATCH wireless-next 16/19] wifi: iwlwifi: mvm: fix setting the TK when associated Date: Thu, 6 Mar 2025 13:48:52 +0200 Message-Id: <20250306134559.136afdbf19fd.Icd19d797e56483c08dd22c55b96fee481c4d2f3d@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Avraham Stern When running secured ranging and the initiator is associated with the responder, the TK was not set in the range request command. Fix it. Signed-off-by: Avraham Stern Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c index dfb25b964f0e..a493ef6bedc3 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c @@ -672,7 +672,11 @@ iwl_mvm_ftm_set_secured_ranging(struct iwl_mvm *mvm, struct ieee80211_vif *vif, target.bssid = bssid; target.cipher = cipher; + target.tk = NULL; ieee80211_iter_keys(mvm->hw, vif, iter, &target); + + if (!WARN_ON(!target.tk)) + memcpy(tk, target.tk, TK_11AZ_LEN); } else { memcpy(tk, entry->tk, sizeof(entry->tk)); } From patchwork Thu Mar 6 11:48:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871121 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C582920CCD2 for ; Thu, 6 Mar 2025 11:49:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261777; cv=none; b=QTYCwNoiPMu1aNQtePDOk4tCGr2B5wkMs49NBxpguZBhIJWX/G6oOWAzGw3dFQcwgaSqSlNfjypTnLklrkiwb/YdK+TJ5sujcofXkHSg5gLSnTsL7wh7Vn+J8I8Ggsg2FShGNqp340LAWcR/avVo+aruKhUiPsjJt/VCVvPUIoQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261777; c=relaxed/simple; bh=JjWMqa+PLxdUGrCT7fLZo+1F/pQQ3ynROXEYgLdn02Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OC7+pCbT+0nZ+IoBTTiSLIGfeWUyjmWzvvO1U3pzVybZAVnwUNZpy5mXF2BN9Cbv2DXpFJQAD5mpAhlHLE0tLS8odAv5tVfI4SEtqWu8mb2UfoqHdS6TvnXmv52lisc5hlVDEQwA85O929nlomuaLrBsl5vGhJ38aKnhzvdYqsg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=m4kvM9Yc; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="m4kvM9Yc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261776; x=1772797776; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JjWMqa+PLxdUGrCT7fLZo+1F/pQQ3ynROXEYgLdn02Y=; b=m4kvM9YcCvaVnJuLEazE4hcL3xkwpm1AUmHPLDAW6wqPMa9hoq+HMxdl VjY60m4vFJgVb8gg0V2pO8bKSl96iPJmiN3DNXJFIN3RV89DXIA7mx6cb LpEpFGqyOEqHOcHLjhXtfIvdBO42GzbziGDbdVdvDT6HZe8HOfVLfIvUQ IciTrXj0cBcktSeTr26a+OCkmIrJNwpryhr8FEoAFo4n7lqcYCyLz/8cE L01sEV9BhMQ/Pvpy6BmXm02tmA64izbyj/bnb1dsaAggGIT4w3HQLx/TC 83RGKMQV+zNb6YoOopFdbzLFcN8hUezacDhlfAHilW4obvmEUgmnmojwj A==; X-CSE-ConnectionGUID: TT6WaamtRnu+h3HfYp5Lhg== X-CSE-MsgGUID: CbiIexa/Sb+I9TXg8XSfnw== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474568" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474568" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:36 -0800 X-CSE-ConnectionGUID: ol2AZJtRQ1mMBjT9pjjNlQ== X-CSE-MsgGUID: eYU8UeVfS82ECiemV/0leA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915593" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:34 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg Subject: [PATCH wireless-next 17/19] wifi: iwlwifi: mvm: remove IWL_EMPTYING_HW_QUEUE_DELBA state Date: Thu, 6 Mar 2025 13:48:53 +0200 Message-Id: <20250306134559.b1e93424803e.I9cd41a15148c90e953335e7020405103ba3fc7f0@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Johannes Berg This state can never be entered, since the last place using it was removed with non-DQA mode in commit c8f54701bdbf ("iwlwifi: mvm: remove non-DQA mode"). Clean up this code too. Signed-off-by: Johannes Berg Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 5 +---- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 14 ++------------ 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h index 19c905b641e2..af62c7f7c834 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */ /* - * Copyright (C) 2012-2014, 2018-2024 Intel Corporation + * Copyright (C) 2012-2014, 2018-2025 Intel Corporation * Copyright (C) 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015-2016 Intel Deutschland GmbH */ @@ -225,8 +225,6 @@ struct iwl_mvm_vif; * @IWL_AGG_ON: aggregation session is up * @IWL_EMPTYING_HW_QUEUE_ADDBA: establishing a BA session - waiting for the * HW queue to be empty from packets for this RA /TID. - * @IWL_EMPTYING_HW_QUEUE_DELBA: tearing down a BA session - waiting for the - * HW queue to be empty from packets for this RA /TID. */ enum iwl_mvm_agg_state { IWL_AGG_OFF = 0, @@ -234,7 +232,6 @@ enum iwl_mvm_agg_state { IWL_AGG_STARTING, IWL_AGG_ON, IWL_EMPTYING_HW_QUEUE_ADDBA, - IWL_EMPTYING_HW_QUEUE_DELBA, }; /** diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c index f67afb66ef2b..91f6945f3f98 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* - * Copyright (C) 2012-2014, 2018-2024 Intel Corporation + * Copyright (C) 2012-2014, 2018-2025 Intel Corporation * Copyright (C) 2013-2015 Intel Mobile Communications GmbH * Copyright (C) 2016-2017 Intel Deutschland GmbH */ @@ -1372,8 +1372,7 @@ static void iwl_mvm_check_ratid_empty(struct iwl_mvm *mvm, lockdep_assert_held(&mvmsta->lock); - if ((tid_data->state == IWL_AGG_ON || - tid_data->state == IWL_EMPTYING_HW_QUEUE_DELBA) && + if (tid_data->state == IWL_AGG_ON && iwl_mvm_tid_queued(mvm, tid_data) == 0) { /* * Now that this aggregation or DQA queue is empty tell @@ -1402,15 +1401,6 @@ static void iwl_mvm_check_ratid_empty(struct iwl_mvm *mvm, tid_data->state = IWL_AGG_STARTING; ieee80211_start_tx_ba_cb_irqsafe(vif, sta->addr, tid); break; - - case IWL_EMPTYING_HW_QUEUE_DELBA: - IWL_DEBUG_TX_QUEUES(mvm, - "Can continue DELBA flow ssn = next_recl = %d\n", - tid_data->next_reclaimed); - tid_data->state = IWL_AGG_OFF; - ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid); - break; - default: break; } From patchwork Thu Mar 6 11:48:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871493 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 98E5620CCF8 for ; Thu, 6 Mar 2025 11:49:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261779; cv=none; b=b0AoUwuFJTU/Oav82xNlGO+6+QLFToSsTNtKv64Jc/C8wxMWfMO/FwDxzOK3Hy2HJC6HqAEmT8WIntdJ7KHXEWlXYJ3bkWFGpIUZOeVntADJoP3a74aO7myY1VXcDB0UAIQ+JzZOtomX1OP7BmzZQFaI1xgKCts1j+lnKQ+FfhQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261779; c=relaxed/simple; bh=a8n+wcgwUCPOXqWmRX7S3Jlr+gBdORqLt/DhnXqN9wM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Si2NUsiLmcZP9PCFnGvEkDLlAlRIvN+R6W5pqy0Ylk6FyycVOE47xcm53B551z6WFcqk5tzgh3Q7RJHsaDeP6ZCxy53kLgyz/7C4Q4r74jouYsFOMGII3dVTbcq8uQp/T8xe3QPUXw/13/773JW/7A2R4BnMjfBM1lowIEV79vE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=YOTgwY4m; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="YOTgwY4m" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261778; x=1772797778; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=a8n+wcgwUCPOXqWmRX7S3Jlr+gBdORqLt/DhnXqN9wM=; b=YOTgwY4mLNQwxkdMo17iv7f8VY911tKmLokErLBLz4PJvj53sZ7gELTe Qz+kd6H+REoFgKylKgSbKx6RtAKGh/3RHyBLZEGig4qCObVuRCEmGUzl3 nKRtT8HDIEKXevpO1DdlKauJYhuZUm/FncVNGztWoyW6aUhgb/z6/FbQv 83u+5ae98fb0eUVeHnrinGaykcDarSDxWvBb7ERkP2yIKcqLJ1zOq6u1J tXM0DPkp7jvu1hvQCEN6/xlNyIklr0WtfJTtxZGwWrwsZTvsnD9FZ5Blx eUhXWLDT07Glg/1bUnjG2/1Q3X8zgmqa0ycsiEUUXAhKSF32O+nXmaMRh g==; X-CSE-ConnectionGUID: HkKDOrRqQ1eCxH4g/WE7Iw== X-CSE-MsgGUID: i65S4/tRRuezU64iueOt+Q== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474575" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474575" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:38 -0800 X-CSE-ConnectionGUID: 3+d4OR0eTba7ETxWVgE7wA== X-CSE-MsgGUID: w+XrdBCjQzOMw5F+2MOwpw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915596" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:35 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg Subject: [PATCH wireless-next 18/19] wifi: iwlwifi: fw: do reset handshake during assert if needed Date: Thu, 6 Mar 2025 13:48:54 +0200 Message-Id: <20250306134559.0a5d15ebc9aa.Ie3911db1ebbd196ae4b0de1c53012aa1de193c0d@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited From: Johannes Berg Earlier, the firmware could only request the reset handshake is done during the dump, if the dump was split. However, it's also needed when the dump isn't split, in which case it must be done before the dump. The firmware now advertises this requirement, so do the handshake in the non-split case when asked for. Rename apply policy ..._RESET_HANDSHAKE to ..._SPLIT_DUMP_RESET to more clearly indicate that this specific dump needs to be split, while the handshake requirement overall is now indicated by the new capability flag. Signed-off-by: Johannes Berg Signed-off-by: Miri Korenblit --- .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 8 ++++---- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 15 ++++++++++++--- drivers/net/wireless/intel/iwlwifi/fw/file.h | 7 +++++++ 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h b/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h index 4fab6c66994e..3173fa96cb48 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h @@ -527,8 +527,8 @@ enum iwl_fw_ini_time_point { * @IWL_FW_INI_APPLY_POLICY_OVERRIDE_DATA: override trigger data. * Append otherwise * @IWL_FW_INI_APPLY_POLICY_DUMP_COMPLETE_CMD: send cmd once dump collected - * @IWL_FW_INI_APPLY_POLICY_RESET_HANDSHAKE: perform reset handshake and - * split dump to before/after with region marking + * @IWL_FW_INI_APPLY_POLICY_SPLIT_DUMP_RESET: split this dump into regions + * before and after the reset handshake */ enum iwl_fw_ini_trigger_apply_policy { IWL_FW_INI_APPLY_POLICY_MATCH_TIME_POINT = BIT(0), @@ -537,7 +537,7 @@ enum iwl_fw_ini_trigger_apply_policy { IWL_FW_INI_APPLY_POLICY_OVERRIDE_CFG = BIT(9), IWL_FW_INI_APPLY_POLICY_OVERRIDE_DATA = BIT(10), IWL_FW_INI_APPLY_POLICY_DUMP_COMPLETE_CMD = BIT(16), - IWL_FW_INI_APPLY_POLICY_RESET_HANDSHAKE = BIT(17), + IWL_FW_INI_APPLY_POLICY_SPLIT_DUMP_RESET = BIT(17), }; /** @@ -560,7 +560,7 @@ enum iwl_fw_ini_trigger_reset_fw_policy { * @IWL_FW_INI_DEBUG_DUMP_POLICY_MAX_LIMIT_600KB: mini dump only 600KB region dump * @IWL_FW_IWL_DEBUG_DUMP_POLICY_MAX_LIMIT_5MB: mini dump 5MB size dump * @IWL_FW_IWL_DEBUG_DUMP_POLICY_BEFORE_RESET: dump this region before reset - * handshake (if requested by %IWL_FW_INI_APPLY_POLICY_RESET_HANDSHAKE) + * handshake (if requested by %IWL_FW_INI_APPLY_POLICY_SPLIT_DUMP_RESET) */ enum iwl_fw_ini_dump_policy { IWL_FW_INI_DEBUG_DUMP_POLICY_NO_LIMIT = BIT(0), diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c index 634e2543ba6d..2ba00257b327 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c @@ -2594,6 +2594,12 @@ enum iwl_dump_ini_region_selector { IWL_INI_DUMP_LATE_REGIONS, }; +static bool iwl_dump_due_to_error(enum iwl_fw_ini_time_point tp_id) +{ + return tp_id == IWL_FW_INI_TIME_POINT_FW_ASSERT || + tp_id == IWL_FW_INI_TIME_POINT_FW_HW_ERROR; +} + static u32 iwl_dump_ini_dump_regions(struct iwl_fw_runtime *fwrt, struct iwl_fwrt_dump_data *dump_data, @@ -2659,8 +2665,7 @@ iwl_dump_ini_dump_regions(struct iwl_fw_runtime *fwrt, * debug data which also need to be collected. */ if (reg_type == IWL_FW_INI_REGION_DRAM_IMR) { - if (tp_id == IWL_FW_INI_TIME_POINT_FW_ASSERT || - tp_id == IWL_FW_INI_TIME_POINT_FW_HW_ERROR) + if (iwl_dump_due_to_error(tp_id)) imr_reg_data->reg_tlv = fwrt->trans->dbg.active_regions[i]; else @@ -2697,7 +2702,7 @@ static u32 iwl_dump_ini_trigger(struct iwl_fw_runtime *fwrt, ARRAY_SIZE(fwrt->trans->dbg.active_regions)); if (trigger->time_point & - cpu_to_le32(IWL_FW_INI_APPLY_POLICY_RESET_HANDSHAKE)) { + cpu_to_le32(IWL_FW_INI_APPLY_POLICY_SPLIT_DUMP_RESET)) { size += iwl_dump_ini_dump_regions(fwrt, dump_data, list, tp_id, regions_mask, &imr_reg_data, IWL_INI_DUMP_EARLY_REGIONS); @@ -2706,6 +2711,10 @@ static u32 iwl_dump_ini_trigger(struct iwl_fw_runtime *fwrt, regions_mask, &imr_reg_data, IWL_INI_DUMP_LATE_REGIONS); } else { + if (fw_has_capa(&fwrt->fw->ucode_capa, + IWL_UCODE_TLV_CAPA_RESET_DURING_ASSERT) && + iwl_dump_due_to_error(tp_id)) + iwl_trans_pcie_fw_reset_handshake(fwrt->trans); size += iwl_dump_ini_dump_regions(fwrt, dump_data, list, tp_id, regions_mask, &imr_reg_data, IWL_INI_DUMP_ALL_REGIONS); diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h index 770991d0c60b..b222dc081819 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/file.h +++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h @@ -506,6 +506,13 @@ enum iwl_ucode_tlv_capa { IWL_UCODE_TLV_CAPA_BIOS_OVERRIDE_5G9_FOR_CA = (__force iwl_ucode_tlv_capa_t)123, IWL_UCODE_TLV_CAPA_UHB_CANADA_TAS_SUPPORT = (__force iwl_ucode_tlv_capa_t)124, IWL_UCODE_TLV_CAPA_RESTRICTED_TWT_SUPPORT = (__force iwl_ucode_tlv_capa_t)126, + + /* set 4 */ + /** + * @IWL_UCODE_TLV_CAPA_RESET_DURING_ASSERT: FW reset handshake is needed + * during assert handling even if the dump isn't split + */ + IWL_UCODE_TLV_CAPA_RESET_DURING_ASSERT = (__force iwl_ucode_tlv_capa_t)(4 * 32 + 0), NUM_IWL_UCODE_TLV_CAPA /* * This construction make both sparse (which cannot increment the previous From patchwork Thu Mar 6 11:48:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871120 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DC40C20AF98 for ; Thu, 6 Mar 2025 11:49:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261780; cv=none; b=b7ejjCdFTe/3XU0lNL7JIVcsjx8nMiy4p1rfalUnpJX/jwzLwjgo/DgcIY8QSKnNK8BzbsXLfnmRUR1mQWPxZt1RbfP9ZZ1R8zHs45qBnhUXgqzY9UslW2PMOVXmegFIQVemL34l1h5TTZeZx9D6rE0GzdONXhd9/nVypF/x5VM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741261780; c=relaxed/simple; bh=g6BiFm89esW+8V8YJ24jsMF1JDmgXbzryMkXVjpvqIM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=W2Jin2X77rpODV+o30TT727ZbHkLvj1u7oTp5UzvbCEFbhaVF2HnYchpRqN/7tTxJ/DDdkMgy46iNyn6aK+UceDveY/0inKJViM4boqj5MlrVYRA1uraWVebe0Vsm86aoe7FZmEpTXKZgcxQLg5iKu7yl4lmSRyBtZ8MkrCHEZs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=bKgHBoXj; arc=none smtp.client-ip=198.175.65.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="bKgHBoXj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741261779; x=1772797779; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=g6BiFm89esW+8V8YJ24jsMF1JDmgXbzryMkXVjpvqIM=; b=bKgHBoXjSlFnFfYyPy2sype4tXocUYiw6CXlrUjlUp60b8q7cjWteCV6 fqqqvvJcY+tIBbqnJWWNUG3c7PiJVzk1/+ob3pNr8ZNutV1wV4JG88z+r Ix2OmcdVmUsGcd6F1wj+V62A7YBK+P8EoX+Rt/ufGVsGUcdlNTvasq+CP Gf7ePvqBuPj0a2gSVO3JopKSPu4OjekBjlfJc8owisouqJbbir6uhBaNk n9tuMIqyOzObixgXKGmU6Q3BpVf2bmBTIgd+BMGYQF+4rJKz+kY1sTFVJ lrbpE+j6uu1EaOsQkc9X540w4jdyArxSKVsbaB4Oh3huxf1t648ROb//X Q==; X-CSE-ConnectionGUID: 14y9wfqMTCCkIX2vsLuWTg== X-CSE-MsgGUID: GMR29ZgoReyOdt2BziGnoA== X-IronPort-AV: E=McAfee;i="6700,10204,11363"; a="52474578" X-IronPort-AV: E=Sophos;i="6.14,226,1736841600"; d="scan'208";a="52474578" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:39 -0800 X-CSE-ConnectionGUID: PFMGPfU8SkuXdx1SGLZMBQ== X-CSE-MsgGUID: S2a/eHwzQEaCmelOpnq57w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="119915597" Received: from weis0040.iil.intel.com ([10.12.217.108]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Mar 2025 03:49:37 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org Subject: [PATCH wireless-next 19/19] wifi: iwlwifi: re-add IWL_AMSDU_8K case Date: Thu, 6 Mar 2025 13:48:55 +0200 Message-Id: <20250306134559.fd4ec088400a.Ifbf89e7b7391cd7070267b7360c53230b3b2c57c@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> References: <20250306114855.4170261-1-miriam.rachel.korenblit@intel.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Israel (74) Limited This case in iwl_trans_get_rb_size_order was accidently combined with the IWL_AMSDU_12K case. Fix this. Fixes: 7391b2a4f7db ("wifi: iwlwifi: rework firmware error handling") Signed-off-by: Miri Korenblit --- drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h index 25fb4c50e38b..b9dc1b8794ce 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h +++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h @@ -328,6 +328,7 @@ iwl_trans_get_rb_size_order(enum iwl_amsdu_size rb_size) case IWL_AMSDU_4K: return get_order(4 * 1024); case IWL_AMSDU_8K: + return get_order(8 * 1024); case IWL_AMSDU_12K: return get_order(16 * 1024); default: