From: Miri Korenblit <miriam.rachel.korenblit@intel.com>
To: linux-wireless@vger.kernel.org
Cc: Johannes Berg <johannes.berg@intel.com>
Subject: [PATCH iwlwifi-next 05/15] wifi: iwlwifi: cfg: handle cc firmware dynamically
Date: Thu, 8 May 2025 15:12:56 +0300 [thread overview]
Message-ID: <20250508121306.1277801-6-miriam.rachel.korenblit@intel.com> (raw)
In-Reply-To: <20250508121306.1277801-1-miriam.rachel.korenblit@intel.com>
From: Johannes Berg <johannes.berg@intel.com>
Instead of using fw_name_pre, handle the cc firmware file
name specially in iwl_drv_get_fwname_pre() for the cc MAC
type.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Message-Id: <20250508151045.a6e47e2f761d.I5d58561503c8b02f9145a0c09737897031a909a5@changeid>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
---
drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 6 ------
drivers/net/wireless/intel/iwlwifi/iwl-config.h | 2 +-
drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 ++++
drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 6 +++---
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
index 5b0704241b15..073e95a61c0d 100644
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
@@ -214,12 +214,6 @@ const struct iwl_cfg iwl_qu_hr_80mhz = {
.bw_limit = 80,
};
-const struct iwl_cfg iwl_ax200_cfg_cc = {
- .fw_name_pre = IWL_CC_A_FW_PRE,
- IWL_DEVICE_22500,
- .num_rbds = IWL_NUM_RBDS_22000_HE,
-};
-
MODULE_FIRMWARE(IWL_QU_B_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
MODULE_FIRMWARE(IWL_QU_C_HR_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
MODULE_FIRMWARE(IWL_QU_B_JF_B_MODULE_FIRMWARE(IWL_22000_UCODE_API_MAX));
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-config.h b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
index 0977a683459a..320b14303a66 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-config.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-config.h
@@ -410,6 +410,7 @@ struct iwl_cfg {
#define IWL_CFG_MAC_TYPE_PU 0x31
#define IWL_CFG_MAC_TYPE_TH 0x32
#define IWL_CFG_MAC_TYPE_QU 0x33
+#define IWL_CFG_MAC_TYPE_CC 0x34
#define IWL_CFG_MAC_TYPE_QUZ 0x35
#define IWL_CFG_MAC_TYPE_SO 0x37
#define IWL_CFG_MAC_TYPE_TY 0x42
@@ -671,7 +672,6 @@ extern const struct iwl_cfg iwl9560_qu_jf_cfg_80mhz;
extern const struct iwl_cfg iwl_qu_hr1;
extern const struct iwl_cfg iwl_qu_hr;
extern const struct iwl_cfg iwl_qu_hr_80mhz;
-extern const struct iwl_cfg iwl_ax200_cfg_cc;
extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0;
extern const struct iwl_cfg iwlax210_2ax_cfg_so_jf_b0_80mhz;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index eb57981e4c8c..2fade565a810 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -201,6 +201,10 @@ const char *iwl_drv_get_fwname_pre(struct iwl_trans *trans, char *buf)
case IWL_CFG_MAC_TYPE_QU:
mac = "Qu";
break;
+ case IWL_CFG_MAC_TYPE_CC:
+ /* special case - no RF since it's fixed (discrete) */
+ scnprintf(buf, FW_NAME_PRE_BUFSIZE, "iwlwifi-cc-a0");
+ return buf;
case IWL_CFG_MAC_TYPE_QUZ:
mac = "QuZ";
/* all QuZ use A0 firmware */
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index bffe3bb3e3f0..94c1b844a6b1 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -997,11 +997,11 @@ VISIBLE_IF_IWLWIFI_KUNIT const struct iwl_dev_info iwl_dev_info_table[] = {
DEVICE(0x7E40), SUBDEV(0x1692)),
/* AX200 */
- IWL_DEV_INFO(iwl_ax200_cfg_cc, iwl_ax200_name,
+ IWL_DEV_INFO(iwl_qu_hr, iwl_ax200_name,
DEVICE(0x2723)),
- IWL_DEV_INFO(iwl_ax200_cfg_cc, iwl_ax200_killer_1650w_name,
+ IWL_DEV_INFO(iwl_qu_hr, iwl_ax200_killer_1650w_name,
DEVICE(0x2723), SUBDEV(0x1653)),
- IWL_DEV_INFO(iwl_ax200_cfg_cc, iwl_ax200_killer_1650x_name,
+ IWL_DEV_INFO(iwl_qu_hr, iwl_ax200_killer_1650x_name,
DEVICE(0x2723), SUBDEV(0x1654)),
/* Qu with Hr */
--
2.34.1
next prev parent reply other threads:[~2025-05-08 12:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-08 12:12 [PATCH iwlwifi-next 00/15] wifi: iwlwifi: updates - 2025-05-08 Miri Korenblit
2025-05-08 12:12 ` [PATCH iwlwifi-next 01/15] wifi: iwlwifi: build 9000 series FW filenames dynamically Miri Korenblit
2025-05-08 12:12 ` [PATCH iwlwifi-next 02/15] wifi: iwlwifi: cfg: remove QuZ/JF special cases Miri Korenblit
2025-05-08 12:12 ` [PATCH iwlwifi-next 03/15] wifi: iwlwifi: cfg: remove 'cdb' value Miri Korenblit
2025-05-08 12:12 ` [PATCH iwlwifi-next 04/15] wifi: iwlwifi: cfg: build ax210 family FW names dynamically Miri Korenblit
2025-05-08 12:12 ` Miri Korenblit [this message]
2025-05-08 12:12 ` [PATCH iwlwifi-next 06/15] wifi: iwlwifi: cfg: remove nvm_hw_section_num from new devices Miri Korenblit
2025-05-08 12:12 ` [PATCH iwlwifi-next 07/15] wifi: iwlwifi: pass trans to iwl_parse_nvm_mcc_info() Miri Korenblit
2025-05-08 12:12 ` [PATCH iwlwifi-next 08/15] wifi: iwlwifi: rename cfg_trans_params to mac_cfg Miri Korenblit
2025-05-08 12:13 ` [PATCH iwlwifi-next 09/15] wifi: iwlwifi: cfg: remove dbgc_supported field Miri Korenblit
2025-05-08 12:13 ` [PATCH iwlwifi-next 10/15] wifi: iwlwifi: cfg: remove rf_id field Miri Korenblit
2025-05-08 12:13 ` [PATCH iwlwifi-next 11/15] wifi: iwlwifi: rename struct iwl_base_params Miri Korenblit
2025-05-08 12:13 ` [PATCH iwlwifi-next 12/15] wifi: iwlwifi: cfg: remove eeprom_size from new devices Miri Korenblit
2025-05-08 12:13 ` [PATCH iwlwifi-next 13/15] wifi: iwlwifi: cfg: remove DCCM offsets " Miri Korenblit
2025-05-08 12:13 ` [PATCH iwlwifi-next 14/15] wifi: iwlwifi: cfg: move MAC parameters to MAC data Miri Korenblit
2025-05-08 12:13 ` [PATCH iwlwifi-next 15/15] wifi: iwlwifi: remove unused high_temp from iwl_cfg Miri Korenblit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250508121306.1277801-6-miriam.rachel.korenblit@intel.com \
--to=miriam.rachel.korenblit@intel.com \
--cc=johannes.berg@intel.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.