From patchwork Sat Mar 8 21:19:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871856 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 8C2BC1FF61A for ; Sat, 8 Mar 2025 21:19:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468783; cv=none; b=cPautl+ASjF1vGdg4FkO1W38UaXtS5g2aubOsK4cQe6CZR08IY7YDA1efBFvMLu9RWUMfJhE+iorkXomf76yRFKfCSOEo+R7cojnaaZs9AlImKboR9DqsNWVgzEH7KjL+SlEkkB7R4UZC/uNh7YV/YWfdKcNW5ZA24akXTfLPZU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468783; c=relaxed/simple; bh=El77FSaeXv2Jz3VNslgdmKdwlHda5ceJfe3PZPQ8xZI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=o1TkzPu1BCY6YMg2W9+O+SQG8BRyyp3KfVhKZrixnnKlMKNfWgNknoi0GKfKb7BK7OLKGUkrLbl7HKfYWyEDXV+jxwXDG6wrauZN4qJkjHWezpQFit+Oz7N4Nc94XJdQ+5GbXmRVX/kgFjSnUAFSriO+u90fcuZNmPqwbS/27Kg= 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=dv4T1QgC; arc=none smtp.client-ip=192.198.163.8 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="dv4T1QgC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468782; x=1773004782; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=El77FSaeXv2Jz3VNslgdmKdwlHda5ceJfe3PZPQ8xZI=; b=dv4T1QgCVO+6UJg8e7nSKIhDCL12vou1rP4w3BWort3El2PsNGlGMFhI JuutWbYikVHciyKKgJwRrbeiqmP4oUZqBK5oTA7sNWKKAlyO+Np1Eozd7 D3V+MqiI/42tEqj3SuzmK7zfM7pXVvHeLGg1nRUoiQXfgQxl/ALzG6DaI pyq/y7mGghTbDgtMl8iKATmpwo8LoJi9AU2pfmxAUAvnGm2PxEN1NDuX4 X8eb3t0RiQDO2esqxHbPBTWX8fh12/hBOrdSQ1/iP7umS+FNBNsihM8SX 1Phiq+qw6emAbJXwLJ7nwdsEWe/vBJugt1GPcDcntEj/UgfwoORkvHwLB Q==; X-CSE-ConnectionGUID: 5JHTsfKzRmqTyf3QesShfg== X-CSE-MsgGUID: W/ioSjXWR8qbTHNeH1UaMw== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052363" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052363" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:40 -0800 X-CSE-ConnectionGUID: VeHraarxQACA05bfBzrkwg== X-CSE-MsgGUID: 4CAuXd5uReSIt3NPTsQtlQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859893" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:38 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Emmanuel Grumbach Subject: [PATCH v3 wireless-next 01/14] wifi: iwlwifi: add support for BE213 Date: Sat, 8 Mar 2025 23:19:12 +0200 Message-Id: <20250308231426.f02f4d7fc73b.Idaf000dd311358e3b50a511f4efc1cc720abd58b@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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 eb56af9a8411..05cbb80ab575 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 7e4864c00780..b9bd89bfdd74 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 03f7eb46bbc7..93446c374008 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c @@ -1187,8 +1187,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, @@ -1202,8 +1207,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, @@ -1217,8 +1227,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 Sat Mar 8 21:19:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 872146 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 147E61F5848 for ; Sat, 8 Mar 2025 21:19:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468782; cv=none; b=aT4D2C1yoF0E33a7xHeEWFhotE0HyzIX3GqfvdmFm26r/piyEihJhWwg7m1QP3xCMELW0yBgZ4XsUTTGKoY23NMMAyvc4Gutonwpnmksfmo3yPQRXpdN8h55F9PXGxMCLG7ueR58N2ZmhrYHmGiRcIeo05ZWY4gP1JgYwpKI/f8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468782; c=relaxed/simple; bh=fJEr3aww8jhIlGGUZnSWrFYY4mHTE0hyHSsWOgAwZRg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hcPKufGK2iqLSXz2Y0o4cW0FHKye8X0Us9kD2CSiyVJXuPtWKKYJKVrJ2A9FNYC5QyyZ5brm1qxtIFaa+HT8GCljd42bJfIcjpyoRaLp8Csy6Q/JMhYEaOb0g/mK+8MkIIvIuzwt9n5U4p+19LfvPA9jZ4Xh+kbz9q4YCZQaigo= 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=UrpFVtJA; arc=none smtp.client-ip=192.198.163.8 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="UrpFVtJA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468781; x=1773004781; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fJEr3aww8jhIlGGUZnSWrFYY4mHTE0hyHSsWOgAwZRg=; b=UrpFVtJA116v33BNpGiyGV1+1zXoLT7g/u6ItXf7u7HBM45iy4T/T4DO h8MHf7lOJ3wl4UFlL55fKa5i3OkbKzOZgh7StBHnKFHEybOByatxUarBG x3v3Eeyi7VBuL+q0cGCPg4lVoqQejhRX/kr8H0vpI84j4gm6Mixt/Sk/U o1pZPaFGBbBG/5C1LicC1CvTRtHVXDgVIQaHS6rv7caYBmvfDkE5+bcfG JMMuqt/vc7Y6oidT9z1OLnhRspg2ZHe7a6K6feVzndhOBT/b8MBMl4OId hftOtSSa6UuRs8Fq2nzop13YaaMQykFQmEonJ5BqtebqgGL0w1AmU9Ozt g==; X-CSE-ConnectionGUID: WbH3sFvXSxid00q0JYhPVQ== X-CSE-MsgGUID: QNY2ovRjQlGKkThXxsWt4A== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052365" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052365" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:41 -0800 X-CSE-ConnectionGUID: igHzfLpZSiylB/3HUWi+KA== X-CSE-MsgGUID: Xl/py0qUSPu+mzopzfpbuA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859897" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:40 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Emmanuel Grumbach Subject: [PATCH v3 wireless-next 02/14] wifi: iwlwifi: fix the ECKV UEFI variable name Date: Sat, 8 Mar 2025 23:19:13 +0200 Message-Id: <20250308231426.78c998d0fa71.I2bc9d72c1dc2c4d7028f0265634a940c2fadbbb5@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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 Sat Mar 8 21:19:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 872145 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 F03962046BF for ; Sat, 8 Mar 2025 21:19:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468784; cv=none; b=reeap4wgRgoC6nw1ToA0lC3Siws1HF+RNIuh8c5au2YU9amX2P43rw4oHEwHHVEvuXl7R20XrvBSC+7uqTNiFW4jOFzmKFVo9zRRI04WqpOKv4B87hRol1hFlw450t3tYj5A5y3Ugesyl0Fm8AAEk6cNtMYdk1QN+h3XVxNhj90= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468784; c=relaxed/simple; bh=jOSPCYdHjY3mmUmNQsjMfcaCD0ekcqINe9k3tizI2lk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CazkRpTVrxJmS+a9I08FwxTmTUlDzuxnI6VG8rwcgYzCycAl0jMOaJXwQTkAFn4io+8i6o8vMgvtIO/hwPEUXU1/+5mbwLo0wmp+rtfirRWmu42874F5teE8dMgR4TwFKFPtQBvro7IOa4qJZEVKb4erlsf7jF80VcAVq986vTg= 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=JRP5UQmI; arc=none smtp.client-ip=192.198.163.8 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="JRP5UQmI" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468783; x=1773004783; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jOSPCYdHjY3mmUmNQsjMfcaCD0ekcqINe9k3tizI2lk=; b=JRP5UQmISy9goAiWS+OveP3JdjJbu/JuNUZ4r1Sqxu5RmJ6L9GnVO4cP /7RRmKS3TyoXQF8zbJG2KtemS6KWO3NPDyNNtCgTKuHoDv0UqBDOSSExu YtNqEf5dm715EjBYsgpXirngi8qQ/m9F2pQ3pfaJCf+g/+U6/Nr3qXm2c xPtu1Yrt62ocLJz1SF8bJTCHkh3KuVTSoWUp5p/w2EFUYuvdvyt0/LD0s cwip1aHioTatWEI6hgvQKefxQMqY9HZgFIOCAGD2vhjif5hkWPalut6By o5iNuL/QN0JzMnh5kW5nnxoDFag4O8w616UTCYXPmF1lj220EtVrXcrxP g==; X-CSE-ConnectionGUID: +NJzr2jqS5WwYTovbvcbpw== X-CSE-MsgGUID: ixE7tNTQTumdpleCmKMBqg== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052367" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052367" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:43 -0800 X-CSE-ConnectionGUID: wICFJnuMT0e6lsBaGWvf8w== X-CSE-MsgGUID: axefZ+6SQHib99f8MQhhFA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859902" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:41 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Emmanuel Grumbach Subject: [PATCH v3 wireless-next 03/14] wifi: iwlwifi: fix print for ECKV Date: Sat, 8 Mar 2025 23:19:14 +0200 Message-Id: <20250308231426.e006c6b21432.I318fed724709f9ee7a0c369e1cf5e1038ddd546a@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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 Sat Mar 8 21:19:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871855 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 6ECAE1FF61A for ; Sat, 8 Mar 2025 21:19:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468786; cv=none; b=WkCBqzhHphHwmcLa/k2hdtU952YNgTUK0p/Zk0tmil8DXlm858ta4kNtrFDcgvgcU3EeXGWXctdrG65ctS5AIa/zms23kK7sUBjm+1cjaNWh+OMEtZQF1dx0n8eJH5PmTeA5e9/s/tsKV0Jr9dTYlXF+HKWNndLBFJPru9F7QFI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468786; c=relaxed/simple; bh=Fdhe8LOAuCkCUmDReNXyM/ZFsBgc8ZmpMHkeGbiRBxk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ckqFoaOOl6gAMUSDXtEieoZj1Ye8iKBSK1nxTEY6hODXwTWEfMlGEATsyXOPv6oHNaNwCtB6e0oPQOSjymz50pkf6myYL6MurjP076CYQa6O4zAn75EFL+Oa6wsMrXBr2lUBZflBeNhq2dBDFjS1P/8uY1zbZXZfpH4W+EYMUgM= 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=JZTKXvY/; arc=none smtp.client-ip=192.198.163.8 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="JZTKXvY/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468785; x=1773004785; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Fdhe8LOAuCkCUmDReNXyM/ZFsBgc8ZmpMHkeGbiRBxk=; b=JZTKXvY/PVIcgEdTgILg6Q5co//aNog1e+jYHLwqbzlUAZK8VbO1GXzl E5BhhuZIMB0pHlQ25xC94qYf9655bq3ONUmIgp7OwPgUbfUao+oJvAwNL gRP5AVrk1otY2jOqq9HY5ipnczJF3tAYNKpI3SAHuJdVmt01jF58rPwM1 4o8If4VB5y4wIg3M5/qQ2iu4VQ88Uht5GKn3pQ6ibZ3EXvw/OL7Qwyz1g K65zbhTBX7kwr6fibqv/HqcDSzZZGmmdjqIza8hu/Ll0v8eIvmiYsH2BW nJKccvzU2ZBi07x1giPWSPh5r0Tm9ZtlLdUepkNbyRNkpKvrt1Wn1bvuJ w==; X-CSE-ConnectionGUID: tJXHLAcoRy+EQqINEBfAbw== X-CSE-MsgGUID: eJ5db1dfQdGRyup/JB8hOA== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052369" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052369" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:44 -0800 X-CSE-ConnectionGUID: VTcvC/jgQbSG3zKgYN9jnQ== X-CSE-MsgGUID: hBmR4+2+SxiOXBmNpsbm7A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859910" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:43 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Pagadala Yesu Anjaneyulu Subject: [PATCH v3 wireless-next 04/14] wifi: iwlwifi: mvm: cleanup of TAS structure and enums Date: Sat, 8 Mar 2025 23:19:15 +0200 Message-Id: <20250308231427.59144bee9987.Ic2678dcb5afdacc2ca234d4aa4901e7e1f6e8dbb@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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 Sat Mar 8 21:19:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 872144 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 A530B20E31D for ; Sat, 8 Mar 2025 21:19:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468787; cv=none; b=T9Ov15VEw50bT17NF/Blr2AEN76jGj8DOuVJfQ3a+lz+W89xghsj6pilaUsFATXeL2h4svGoDKKQJcR8JlQMm+hoJM1Rgeod8G7N9Dz7rLWJ/ZVAyQQnvOZH9PGQQ//4NEOsstlfJUgZVCqOywz+FxArKYPoKE9bxIOWFgTcAEA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468787; c=relaxed/simple; bh=kzX5tu+ew83PjbPqBkcMUrtdK5UVT24DkjBm499PVt0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kZHz02enqQ3lJER02YSRayMaDsUgH0o1CPtoFawSIyNNhn5BiSsOC0AxIJtF39mVHuLlja0rtkN9hlO8TKtcf2OAZlP0VPI/m0NiRIcB4nkMIkGLXiJWCE73/t4wcebMjR87eM7NCnhJtvUlWgARnh6VLlWNLh3pkibbHw5oFRI= 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=L1FWTWb4; arc=none smtp.client-ip=192.198.163.8 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="L1FWTWb4" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468786; x=1773004786; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kzX5tu+ew83PjbPqBkcMUrtdK5UVT24DkjBm499PVt0=; b=L1FWTWb45w8qBAWVz6Ub5eColHH/UKx4kC0pQtO0JWgAqOKrugQ70Ilb 449NCo9d6WeeXj6QiLe9IRiRed5L7N09DbF15brdqIwVpLCePyf+DF+Cz j1TYBcfxFqRFemKt+xcOylGfty3mwORLdo9DF5He+aMFUx/uGax8+LbY6 qMle2N+XnJpesNrKmM8ocfT/mZOF53T8L0pZDxUYbSHtdEUMQBGj1tAlO nNkXd5n3TaebaW0o8o/h0F5ren3/KOz/srPBkZQmxpdeqZuVqPuOjrSAz UiUlaGi1hdASNsKXnSeg7RZoKiciDktB4p7VhXVmPHczq6iZkcs0MmxYA g==; X-CSE-ConnectionGUID: V9YtvqmbTC+BuBwBCkzlug== X-CSE-MsgGUID: CCDo9NzGQLW58cvNrVWfkQ== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052371" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052371" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:46 -0800 X-CSE-ConnectionGUID: CmetSVOAR3qjKl578KHb5Q== X-CSE-MsgGUID: RcLf6xpVRXyth5PAsYTfZw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859915" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:44 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Pagadala Yesu Anjaneyulu Subject: [PATCH v3 wireless-next 05/14] wifi: iwlwifi: Add new TAS disable reason for invalid table source Date: Sat, 8 Mar 2025 23:19:16 +0200 Message-Id: <20250308231427.5e1272ef3508.I24f668ae716bee20cba15fdc73c3363693bbaf73@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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 Sat Mar 8 21:19:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871854 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 1EE3020F083 for ; Sat, 8 Mar 2025 21:19:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468788; cv=none; b=ctg9Wwmn6abtW5YKTYCPT0Z5oUmQiKgDHpIeBvElkrtbUmkPLcCUF3oxhoGMq5N8xM8MtoAcVDXOD7kTzTgbOT8ZVTnesb3BNVIpNP9vzw2/qLqSo7xqLsXMEb/mSwP8iMAD2gWaWkUjvyiK6p0t5/ick2D0GzCcSGP1XuY9Xck= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468788; c=relaxed/simple; bh=v8eDgCLCD7qr1N7shvQbjm54WkW42fw+d5O30jsCbKQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=asJoNLFKdCuuXpYZIZ/mLch3hXMLgnBuLoqZNCQwrKIHLIbbmWuk3+xNcKDdFc/7BYskqvne15uLl2vBMlPcDrzQuQhmL80BeI9X1HThqnm2KbZ1Vu9Y7j6nk5r0H0EgzcVNssTYz/RPLNBr5JOySdEybzh5mk8PUOLkRDR9RKc= 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=cSli9fKA; arc=none smtp.client-ip=192.198.163.8 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="cSli9fKA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468787; x=1773004787; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=v8eDgCLCD7qr1N7shvQbjm54WkW42fw+d5O30jsCbKQ=; b=cSli9fKAqJ5/0RaYa0z5UXaBpsvjTqH3MrpzVkrn50IeH2U6NtvNeyNu 63lwOVecx8ggT+Hg/ynlHlB5gvKbXPZdPPH3JxTqJIbfwq0lyyyGolFVn JNd+3P3TVQ1kNtT883mNaTxEh1VSoD14YXqXt8rRmGpCZNoeq7ReRpczH xOt++fDv+bWhVDJAJ8RNgMfl8BVLE4fzh5iUVCDZPPv4Andl/vJMbTEqM Kcs3huXRdvPZQEHfwJak7DxjC22GeDMjG2dVcqDhadD/Kb/reJMvsRxFx 5wmOfjuo93R53SNmImF9fRoG23cVo9zIfOYXhfSCgDBXWZ0ATk3ziUvpr g==; X-CSE-ConnectionGUID: wE1BJ2yZSeCo5MrgRpqP8A== X-CSE-MsgGUID: OejWjCasT/2LdqdR4LGrTw== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052373" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052373" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:47 -0800 X-CSE-ConnectionGUID: RWIqvk8oSwiQscq8Z9vy4w== X-CSE-MsgGUID: CT0Ry5S+QFWRYU6u1VHhwA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859919" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:46 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg Subject: [PATCH v3 wireless-next 06/14] wifi: iwlwifi: mark Br device not integrated Date: Sat, 8 Mar 2025 23:19:17 +0200 Message-Id: <20250308231427.9bb69393fcc9.I197129383e5441c8139cbb0e810ae0b71198a37c@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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 69176b59b4de..48b487f6e366 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 Sat Mar 8 21:19:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 872143 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 9CBB91F9F5C for ; Sat, 8 Mar 2025 21:19:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468790; cv=none; b=YAv3G0oPNnjzndW9gO0R5ojTencySglfaoxvfxE88FHBYVMxb9+yWd7V5GeNc8bozrfLR33+Hb2nOcM47iUa9jdSDJ81k0xjwKPnK6Z8y9dW2m4TTXF/970W9qRODPpK9xMap+IQ+4NTIQMW5clxMLqygdj/76lmoRoiLNWWlhY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468790; c=relaxed/simple; bh=sa7vOZzSkawInADUnsvelr4iWp2BgINI7uEkWPmoFzE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=DN33p4jdx7I1mN1tYDwtfK0tSOALcQoc3z+u5y6iduQ51ZLyoU/oFIRxiOSqcUExjTzrky6J6qQ+tStUF1f1obGXvyU0W0MgtOYDzjrM/LyTjzeE+XzChnvsqQHKAmxHwPQ7UzVo/ZtKpxnelSmVUumv1U4XWS7G/UjYghj5ItM= 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=WGpCBr8Q; arc=none smtp.client-ip=192.198.163.8 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="WGpCBr8Q" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468789; x=1773004789; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sa7vOZzSkawInADUnsvelr4iWp2BgINI7uEkWPmoFzE=; b=WGpCBr8Q0swEZLHiZ+ExL/ztDxALOM+pR8F0I0HkNVb54szixJU7J6ps 7NIOdGHWTWWenLDUrF3uI0gulpHMUaCs1nIQ7QxFm9fNjKT0sqndJJn9i 3sk31igujsgw3btg+UTZQsPXFR+Y1Sp61pcP3tgZ5Czum43MlK9kUmg/Y wqTRmXlFEZKhHiVjTa3GDlj6q2CD5wHUCEofthQQh9U086OczbU3yKq68 fRVyp+CMBxs6vaygITXNSy5CnwTtR3f/uhr6wH0TTky6OBZMyu/W/XBf+ Olz0Q1uRuo65K7pkrZO8wCCQlvdd/LNY37Uhwo/P0+khuG9ykIEiw3cTp Q==; X-CSE-ConnectionGUID: IBiJIzVURAGfZX7ZCyp26w== X-CSE-MsgGUID: 3qP3VblrTF+z3jyqONOa3Q== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052375" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052375" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:49 -0800 X-CSE-ConnectionGUID: RuPR0SaWQEi7ieIV9ku5dA== X-CSE-MsgGUID: qscUSTSSTRun8eep1ReGag== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859926" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:47 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Johannes Berg Subject: [PATCH v3 wireless-next 07/14] wifi: iwlwifi: fix debug actions order Date: Sat, 8 Mar 2025 23:19:18 +0200 Message-Id: <20250308231427.6de7fa8e63ed.I40632c48e2a67a8aca05def572a934b88ce7934b@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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 Sat Mar 8 21:19:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871853 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 1E41A20458B for ; Sat, 8 Mar 2025 21:19:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468791; cv=none; b=pxuRZy5uBO36t2w4qdRdUmIIJXNjtagNRg39HZV2wzxYP7yOg5QxVcke3W2+9iIbll1Sew8jQBuAMrA4Id8EpgzrXHJO3O38rkUi151+2bW/db9l1UDpUq8xN0D8FuTDPWOFyx7AuTg55F/32WsH5xynfULHDIp12TobP9EC/Wk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468791; c=relaxed/simple; bh=Pj0p2paligLz2ZvpOs3SXHK7UYAOvX5cSNksAWAn4lM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iTmiVzRYn1d5ni0T6g2ZZmE13sNtfOYhcc9B+in8eb3pLjWikfSYLiAZJXpq3Ym8e9Y984rPwjA3dHFaZ8vM+qVE5iaKrA7ksu2rUBosZf6JX5r0dP++x3AUNF8KzPKeFE1IhUbwUXrTxbS+yKJRmyPPFmgkmbvWcktlC1pBsOU= 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=DWLnHgEj; arc=none smtp.client-ip=192.198.163.8 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="DWLnHgEj" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468790; x=1773004790; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Pj0p2paligLz2ZvpOs3SXHK7UYAOvX5cSNksAWAn4lM=; b=DWLnHgEjeqv89V9GPvDou7dKNon8y8QU60IgnadMrbf7neBzy3pAR8oQ 1ggXtNMT29rmrixWr8PP/v7NLFseXIwrMxZztdSgq6zBs5qg+AIf8E/8U ofr2uT50Uf8I5d6bB+GwQZv4n0yz+XlyRY2ewhuSCyhuAP4gOwb/ZcGKG pKvS7NVOW3GjHw58bFJud3BealK0WSVFNVqHAZnRh5+3mazWhFBwINLeG Y2XAHA+lUuj1wr/jyfPnyWeI+reZxM11zLn0t0mlh+3HOWOF81wxpCRV+ 3DwSlUsptlnj9iITBl5uIJiRehxW99fCZQcBJOKMx+vEgHAz1zjHwOd/X w==; X-CSE-ConnectionGUID: MIzG0OiGQxmSJno8uS8yKQ== X-CSE-MsgGUID: 843xX9x7Q066+7QjZP/qTg== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052378" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052378" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:50 -0800 X-CSE-ConnectionGUID: hmHcc0tNQp23PNyAARua/g== X-CSE-MsgGUID: zW/K5i3vSPiZrhWK4ZGhvw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859933" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:49 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Daniel Gabay Subject: [PATCH v3 wireless-next 08/14] wifi: iwlwifi: w/a FW SMPS mode selection Date: Sat, 8 Mar 2025 23:19:19 +0200 Message-Id: <20250308231427.7bf205efa027.I2c793ff1fc2a6779a95faaee1ded348100fd97f1@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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 Sat Mar 8 21:19:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 872142 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 92B391F9F5C for ; Sat, 8 Mar 2025 21:19:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468793; cv=none; b=EeVeylbed3rKl4XNIBLMVcpYrZIX9UnON27D8TSyVf8RistI/maK2r8xr0Wph4aecHIyq3xuw6r9dLVV6ZhWeCWcEB1I67KSSdMWd77gSEdsfmShvDqmsevCeyoivht69BM/9RxJryXVxG1xm6iVmcUF4lX1SYU8+yncyaQrlXs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468793; c=relaxed/simple; bh=Lvi7BfNv2bRCFi4MHBrGC8IskUYwUo2kII2i6+tJ10A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HE+qHL5hJ1BR+hWag/2KYnz3BMQG0+2hfOWYKAifKZdaj6d62J18LO306QsYguiYZJzHvZgxPj4cY3x+PQqKH84A4hAq+2IhzegsETV2unWTPdWsUis8VWRGVyAZC92usLZGRj/3FbU1ZuDWs46x3afx0arr9dJR+nwUmwYsxOE= 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=DEr31ka5; arc=none smtp.client-ip=192.198.163.8 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="DEr31ka5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468792; x=1773004792; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Lvi7BfNv2bRCFi4MHBrGC8IskUYwUo2kII2i6+tJ10A=; b=DEr31ka5NYZWqWylp5h41l3FJb8lOztIQIqfOMKSDgQLDjnxspKxNdoS oqHwl0atRQTaxv51+NtfVHf/7KaUx6bDMOrSXNmdOL5l1HYs0neWvBhsm AxHkOOabYSrY/WkCDB0x4PhNswCQxZytGsGU/OuJ/0nPL5W3Ke8knpR4y +9mm9PIOB9KKqadnLkccsbq56f3QPuDy86x70Z7gsrwIFhtd7IiG8sA1K b6OlvpXH1vzJgzrGbcOkexbVtfyqG7vfydIDv7ABJ1QnKWsNJWXFb4wX8 2/hi5wN3Y+abb6chnDyMOXoJr84v3CY0URuBSr8kqTslQponx3EwjuRHN A==; X-CSE-ConnectionGUID: pQHCnfEtSWGqTGhtHpfwlQ== X-CSE-MsgGUID: 451tH+BiTv66wu8RWmE/ZA== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052381" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052381" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:52 -0800 X-CSE-ConnectionGUID: ft9kaWORSFKDZ8Q7m4hmXQ== X-CSE-MsgGUID: SZhEWfKgQru2+H3zNKijyQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859941" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:50 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Pagadala Yesu Anjaneyulu Subject: [PATCH v3 wireless-next 09/14] wifi: iwlwifi: mvm: Fix bit size calculation in iwl_dbgfs_tas_get_status_read Date: Sat, 8 Mar 2025 23:19:20 +0200 Message-Id: <20250308231427.65d373e4a10e.If2cea63035333b07849e5a2c2a4f5dc5c5239595@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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 Sat Mar 8 21:19:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871852 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 A60B820B803 for ; Sat, 8 Mar 2025 21:19:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468794; cv=none; b=aXUrEoU9msQ8AlDa9dgvW0KvvEym4mt6VapQGKQau6zbUXjCZ9c9YeWPLhPSBKh8Y8W1BUsGvcTNqijMfYGBoLK/lFXi0qYQIB4kgadnTodEdG3DBfOTA+VCiKw0hDlBIJILsv/iMgbs9NFuw+KjzZWh0XaqTljaf4L1cllGz2A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468794; c=relaxed/simple; bh=Ichdq+tZ7ND6n1DbkCc5GuJ3+XlFAGNzacYrCqlVfm8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=EJwIRmNrtMa9NywxulygvQDmqYzqVeLfUL0tiWnXQ+6HQ+gsRE3zPea+wLv5yPlq2K+G4BMkxb6PWbM+jK+TwMgmium//l7dnUl6W6L0B4RUOKaVub87xrFah0WV2YNwR9U2AES98PGjlRjJ2HUppwTLn0sEXTagfEuM5++BcsU= 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=BQj/bbaz; arc=none smtp.client-ip=192.198.163.8 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="BQj/bbaz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468793; x=1773004793; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Ichdq+tZ7ND6n1DbkCc5GuJ3+XlFAGNzacYrCqlVfm8=; b=BQj/bbazWRXYnitY12iYj5TXmcAu96Se3AIbPZQikOKu+8unpmVs4545 Slua8levfGrhhEgOW/alqfsi/woUowBPGlxvx8/t5BlA1Y7oBDPS9dX2M lVWIpTWjTMDPT18zgJYeortBKZZv14WaLL3DzHryOiQOQLVpRbHMFYiBI +YzNey2Kvf2SXjp5OJDDGLvWUZVCOlrTZnELxq2hbTLjk/vUd/9lIIYPE xIqXpI9mhf4UNx78wIxuEGwE6EAnKg+YDk7Q2YprZ+hIq/bA7F21rEcXk K6JTMVSH5mrFrLPoFfVE1uoQsHMJV0ycTQ4KjnUjtJMQGM2QEkorp+QVa Q==; X-CSE-ConnectionGUID: 310eYZarQTu31mfUXNtiBA== X-CSE-MsgGUID: vU07P2g8Q9qy1IwIJOps1A== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052383" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052383" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:53 -0800 X-CSE-ConnectionGUID: lPp2C6pkRhm6pKGSYfCJ7Q== X-CSE-MsgGUID: HMiBbB0eSMWiBZhMdNaW+Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859942" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:52 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org Subject: [PATCH v3 wireless-next 10/14] wifi: iwlwifi: bump FW API to 98 for BZ/SC/DR devices Date: Sat, 8 Mar 2025 23:19:21 +0200 Message-Id: <20250308231427.55b5455795aa.I333f1e7fa31f9da1d40f668660c1e25b93ff469e@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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 versions 97 and 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(-) --- v3: this is now squashed with the 'bump to 97' commit diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c index 36e8e3a991dc..dbd303385157 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 96 +#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 48b487f6e366..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 96 +#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 05cbb80ab575..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 96 +#define IWL_SC_UCODE_API_MAX 98 /* Lowest firmware API version supported */ #define IWL_SC_UCODE_API_MIN 92 From patchwork Sat Mar 8 21:19:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 872141 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 E50D220C031 for ; Sat, 8 Mar 2025 21:19:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468795; cv=none; b=DZGxsTT13rMsl2eMe8JGNCw7xRbufqVonWcIMz93Pn5K+8Eo3GllCdiQ/qe8rTwl/V5CB0blT5wY+nfLf1PK7B6ZzLkNi/HqrQjtKeIAuvhCvJWFF5K6jpVrKuv5D8HN15DZW2oeoLb3XLonlEQveLvCAMunax8ptRRH6rqjFs8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468795; c=relaxed/simple; bh=ZXmibLRbiU43LSmBNtFknoOQ2FY0nQZWBglffmp59Sw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jtJSuhdzNsYWDm54HQ65p7UAPCKHwzl1MMPaMIOopcVXTKWx7OAB79RCEttBNRA7SKyyTHfrrOy1VdbTuQqOP5AOyJYmvBUf3bU72948F/CjhoUpBpjwHMW/zt3CqzrQyuUe0BXYNnev0Tz1bML3jXF2pNxPoWydNmrSCVBHgDs= 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=mmE01H1w; arc=none smtp.client-ip=192.198.163.8 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="mmE01H1w" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468794; x=1773004794; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ZXmibLRbiU43LSmBNtFknoOQ2FY0nQZWBglffmp59Sw=; b=mmE01H1w9HEajlMAPfIzqtDl9nI/oX88raA1CcsDfRZ8jF0/BweoSh2T Ix3lBfJTTqN6VgKW1v3TZQYIaSZwgmOWcod694rcWH0zMtzj6AM+ZiJKp aqxgrGwWg158ut2+OS+kS2vNSnbTRgCKossev1JiOZaLzF5QsZNpBryKn mAiAk7JPVlDTCogv6d2nHS0hMxTwjeVaR9D2jDoT5bfU9kspS1U8MAKhJ OLf7rvaE+SUbrok6vNuv6ApO/DMfW9VHw9E6bP825nGoZxTtabdYcU4gb isj+h/wdgyLcrnyTR10DLLFf5rfq7XwN88vREd6oDRIcmlNBfl4bYm02y A==; X-CSE-ConnectionGUID: R7xbP0ePTXS5lrq5GXDcoQ== X-CSE-MsgGUID: L+5CcLHxTBGbP/nWqL65Aw== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052385" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052385" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:54 -0800 X-CSE-ConnectionGUID: FDvgDenVTuKFEzlFTz/wiQ== X-CSE-MsgGUID: +xfJf+hhTdSkYCnZoMUthg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859947" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:53 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org Subject: [PATCH v3 wireless-next 11/14] wifi: iwlwifi: bump minimum API version in BZ/SC to 93 Date: Sat, 8 Mar 2025 23:19:22 +0200 Message-Id: <20250308231427.73e962ca3e6c.I942fa8cafc1791b9330ad18e2599fae11d7b3336@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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 dbd303385157..f055255a7c93 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 Sat Mar 8 21:19:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871851 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 333AC1F5848 for ; Sat, 8 Mar 2025 21:19:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468796; cv=none; b=e14YWY+Gv3x2pLjIDNvttIWs6Yt5M0gb7ufHTcQiyV6V11azW9GdledkT4FRfrGwgQWD82lr+/vyb+70ldZWr1csRlY+l9StYoUL6y+rVZLjAFQXXN5C1zQfHkRPCYtKU3K0F+Lb+MhkCUgsMUOsY2KMXO1N5xzsodG0tqvUHRo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468796; c=relaxed/simple; bh=+syhqyEU7ZeN3xxAqNsIFIuAmJpnrWfr6M2cgkxY0gQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=V5WT881rAOs3gCOnukOAiXth9o+lv8cGmuaOXiMaHmpgokfrYVuMyLmYW/PzvBC+VeQoumPdpz6CXFtRL1qrs4HIHB62OxRWC5+1b4EeKgA2Bg7hA9Z0m057fDx981zdcQzZbFxjHMqIaJsOoY3f9exJ58Q9s22M1pD0W4TNlnE= 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=gnT0a7mc; arc=none smtp.client-ip=192.198.163.8 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="gnT0a7mc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468795; x=1773004795; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+syhqyEU7ZeN3xxAqNsIFIuAmJpnrWfr6M2cgkxY0gQ=; b=gnT0a7mcisidRcFLcfcqlmzCY4C3vZ7h7xGsMCgWmUmKFGML9CTQAyXg Zbjt4Wsu9RO4T9IrikGP515Y7JRzdwvfK5wjph+cBHqmFT/wiXooy6AFK 9OSFMr1ZoleYODkWFqvP3rSMgpWNR0IG7Aue3tIPmSSPzToD2bibeqQ1j +FEQ2Vv8+3Nf5VSD/6Ex9WbSUf4Xl/jgr/OS5bZaZjBEvQTiujGO2slQl Mqe/XAod80LPwztvLDYAD8lBP/lUhp5NgCr3SmN/KDTwCZDvTKc10Y+pY tfHvB+HKK5LhY2lDMkGHPi7pEKVTO4Wj0BB+f/mH44j/fi9aD8T2VbtoA w==; X-CSE-ConnectionGUID: JGNw4DtOQRCHQpaAzsqB2A== X-CSE-MsgGUID: Cxnste1gR52dSpCUgRh7nw== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052387" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052387" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:55 -0800 X-CSE-ConnectionGUID: vOKy0+ErT+GUQ05Xn6TiYw== X-CSE-MsgGUID: 1Ga1HCcoRYCgOuZ9S3bufA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859957" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:54 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org Subject: [PATCH v3 wireless-next 12/14] wifi: iwlwifi: don't warn when if there is a FW error Date: Sat, 8 Mar 2025 23:19:23 +0200 Message-Id: <20250308231427.ba3d90b22c25.I9332506af1997faefcf0bdb51d98d5e874051722@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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 Sat Mar 8 21:19:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 872140 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 BF31420C031 for ; Sat, 8 Mar 2025 21:19:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468798; cv=none; b=sp4VSZT9kJN9QSN7I1R0wa1Cmx4ubo2dyUkB+fas4Wrt0s/HHfLaFXCVf/3DjaG5mNHYlImoAQIXS1FzxgFoON68AbcoHqbVP035UR7sA3LnDCvQHLiQeLBntYM3r6rm3fkp41m6paCwwg2fmCUel1qUwk6dD6ICmJPT9cphx44= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468798; c=relaxed/simple; bh=fWKR+NTasQWmb41vYMEWcM/PWchbNMqsHUJfbuePSXA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=g6fH5zsGI5YBxEo3E3XkNDhCkwB+mdbpsIiPK8PQ3asnnc/whzRn/8NapE1tJxRXU1axl875zIQAuvJH2WSfDVLtRcJ1q3n6WBsJV7SRBdcgq5D4ImMpEaVEHXIVySPJQIUNANqfhJvrbQrc9QYnPbQGNn5nP50LWD79fYRm28Q= 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=VS/6H8Gh; arc=none smtp.client-ip=192.198.163.8 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="VS/6H8Gh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468797; x=1773004797; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=fWKR+NTasQWmb41vYMEWcM/PWchbNMqsHUJfbuePSXA=; b=VS/6H8Ghgtu9NsbhIpLBwzaOoIf2wdj58L8wmfZgo4JZK9MC6/sRDtP2 rhg2CUsFWFA1jZPhAtBXmupA+CzUJYAB6L90JE/rNxKu9hwmUgNOh+WUr o6xatVduLmkL76ciTZDP4sXls76vGEgejfbpoTiEegI4eL+ZXGkFh/TqZ 6/hUDQG3wQfmqzp71B7F51280QacL6QYlRE7VhUtDaqe2ZV5d8rMMpnit 50j5Ab3CAXDoRyP8DJVVBPi7BV0eGq2YKgO4jmZXW8lp4vzvm2NsyjmM7 jP5jFyQpQg+8ykEJiYcSpPdwhF9g+e7LKGnzVCEBfzGBlQWggSs6Qk17e w==; X-CSE-ConnectionGUID: eK5toU9vSV2rWgk/JlReIg== X-CSE-MsgGUID: rIHVDAi7RhOfWHeWDESn6g== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052389" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052389" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:57 -0800 X-CSE-ConnectionGUID: TjjmiTYJRMqOMLrkdHIHjA== X-CSE-MsgGUID: 9r9V0ClFSM69U8Jo4FxSTQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859975" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:56 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, nerrera Subject: [PATCH v3 wireless-next 13/14] wifi: iwlwifi: add restricted TWT capability Date: Sat, 8 Mar 2025 23:19:24 +0200 Message-Id: <20250308231427.d58360cf4218.I08ecc8ead59e0869445b5802c13002dae99f68fd@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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 cd1b0048bb6d..81b83ce56c45 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" @@ -1112,6 +1113,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 Sat Mar 8 21:19:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miri Korenblit X-Patchwork-Id: 871850 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) (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 3B41D1F5848 for ; Sat, 8 Mar 2025 21:19:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.8 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468799; cv=none; b=uyy5bdmPGuaOoM1WWyOigqGeZdgT2pAEI7lrBELV5Ag9Tmj3EqfRIPEr+oM7m/KS1KDz1E4wFIZ6eUU5djFv3FBs5rGYlXwYK6uIioyfUXtKYyoeX7F7bxHZfwT+HBGnjvO4DN0N5m1J7uZJAiNTKHMnQDK28n/vQ+UxX793qAs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741468799; c=relaxed/simple; bh=Fs0s/aimuoS/iHurGf8VxnMtc9mb6hXdFm4hTzV0Yuw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tTpGpFp42G/Nc5S39GxoE7s/QM94av3r0lizGZwuZgFlVc6UWcrHCPxScmjaL06HmLkxoXg8Fdjj6X15aR8yoiCvVLmsj0Rx3I2BA1t5aLlgLP8U3kdRqRF/8GYZyJM3Vt/w32vTWfLejFKnSNnR0BqzwKK1l/1oF3uzboK9JRs= 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=Bj7/Qf9u; arc=none smtp.client-ip=192.198.163.8 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="Bj7/Qf9u" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1741468798; x=1773004798; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Fs0s/aimuoS/iHurGf8VxnMtc9mb6hXdFm4hTzV0Yuw=; b=Bj7/Qf9uTMMFNemee4LDIZxlaBnFAAuJ8TISyJfIvSPFAUbL2Hhv8amF NBMEurBWJjjbn2FfNI5N3W6VS93cY16xrcqmE2V9K+AcyiajD+OUSe1Jk D4k6xcKWtNI0jcCty7qZjoQF4HLIn+DB8L6ohqz3d71KYJDTQFX9cuNKX 2IUJFeOroHypxof4ac+vaU7fUEDREJsabaaJN/yCjrFXII69x+DXos9kc PChKzsBLJtT/Mq/KGTkECngo9SSgi8t3vXb95hWZxWuZ/4TClfbmdfn2D Sjek6AUsKqRwDfYtqZSjWFpJLnetodJBuu1qV24fGleInZKa8O9vWOx/4 Q==; X-CSE-ConnectionGUID: cg03DT/RTJ6oJgKcyRYogw== X-CSE-MsgGUID: uTHlpCU5SUKZGgKRO3tV2w== X-IronPort-AV: E=McAfee;i="6700,10204,11367"; a="60052391" X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="60052391" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:58 -0800 X-CSE-ConnectionGUID: PVrITE/2Tm+trrH6xYR5nA== X-CSE-MsgGUID: 7J5fg2RuTMumCIZeZelAWA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,233,1736841600"; d="scan'208";a="142859981" Received: from weis0040.iil.intel.com ([10.12.217.108]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Mar 2025 13:19:57 -0800 From: Miri Korenblit To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Avraham Stern Subject: [PATCH v3 wireless-next 14/14] wifi: iwlwifi: mvm: fix setting the TK when associated Date: Sat, 8 Mar 2025 23:19:25 +0200 Message-Id: <20250308231427.603dc31579d9.Icd19d797e56483c08dd22c55b96fee481c4d2f3d@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250308211925.2332313-1-miriam.rachel.korenblit@intel.com> References: <20250308211925.2332313-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)); }