Commit 9e4cb387 authored by Johannes Berg's avatar Johannes Berg Committed by Miri Korenblit
Browse files

wifi: iwlwifi: cfg: fix and clean up FM/WH device matching 



We only need a few entries, and there don't seem to be any
such devices actually limited to 160 MHz.

Also add PCI IDs for the new Killer device on LNL platforms.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250510214621.ba2964bee671.If7aaaf10b236115e39b17d37296341de6c821069@changeid
parent 7f3791cb

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ iwlwifi-$(CONFIG_IWLMVM) += cfg/ax210.o 
iwlwifi-$(CONFIG_IWLMLD) += cfg/bz.o cfg/sc.o cfg/dr.o

# RF configurations

iwlwifi-$(CONFIG_IWLMVM) += cfg/rf-jf.o cfg/rf-hr.o cfg/rf-gf.o

iwlwifi-$(CONFIG_IWLMLD) += cfg/rf-fm.o

iwlwifi-$(CONFIG_IWLMLD) += cfg/rf-fm.o cfg/rf-wh.o



iwlwifi-objs		+= iwl-dbg-tlv.o

iwlwifi-objs		+= iwl-trans.o

drivers/net/wireless/intel/iwlwifi/cfg/ax210.c

+0 −2
Original line number Diff line number Diff line
@@ -134,8 +134,6 @@ const struct iwl_mac_cfg iwl_ma_mac_cfg = { 
	.umac_prph_offset = 0x300000

};



const char iwl_ax231_name[] = "Intel(R) Wi-Fi 6E AX231 160MHz";



MODULE_FIRMWARE(IWL_SO_A_JF_B_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

MODULE_FIRMWARE(IWL_SO_A_HR_B_MODULE_FIRMWARE(IWL_AX210_UCODE_API_MAX));

IWL_FW_AND_PNVM(IWL_SO_A_GF_A_FW_PRE, IWL_AX210_UCODE_API_MAX);

drivers/net/wireless/intel/iwlwifi/cfg/bz.c

+0 −5
Original line number Diff line number Diff line
@@ -107,11 +107,6 @@ const struct iwl_mac_cfg iwl_gl_mac_cfg = { 
	.low_latency_xtal = true,

};



const char iwl_fm_name[] = "Intel(R) Wi-Fi 7 BE201 320MHz";

const char iwl_wh_name[] = "Intel(R) Wi-Fi 7 BE211 320MHz";

const char iwl_gl_name[] = "Intel(R) Wi-Fi 7 BE200 320MHz";

const char iwl_mtp_name[] = "Intel(R) Wi-Fi 7 BE202 160MHz";



MODULE_FIRMWARE(IWL_BZ_A_HR_B_MODULE_FIRMWARE(IWL_BZ_UCODE_API_MAX));

IWL_FW_AND_PNVM(IWL_BZ_A_GF_A_FW_PRE, IWL_BZ_UCODE_API_MAX);

IWL_FW_AND_PNVM(IWL_BZ_A_GF4_A_FW_PRE, IWL_BZ_UCODE_API_MAX);

drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c

+9 −0
Original line number Diff line number Diff line
@@ -40,3 +40,12 @@ const char iwl_killer_be1750w_name[] = 
	"Killer(TM) Wi-Fi 7 BE1750w 320MHz Wireless Network Adapter (BE200D2W)";

const char iwl_killer_be1750x_name[] =

	"Killer(TM) Wi-Fi 7 BE1750x 320MHz Wireless Network Adapter (BE200NGW)";

const char iwl_killer_be1790s_name[] =

	"Killer(R) Wi-Fi 7 BE1790s 320MHz Wireless Network Adapter (BE401D2W)";

const char iwl_killer_be1790i_name[] =

	"Killer(R) Wi-Fi 7 BE1790i 320MHz Wireless Network Adapter (BE401NGW)";



const char iwl_be201_name[] = "Intel(R) Wi-Fi 7 BE201 320MHz";

const char iwl_be200_name[] = "Intel(R) Wi-Fi 7 BE200 320MHz";

const char iwl_be202_name[] = "Intel(R) Wi-Fi 7 BE202 160MHz";

const char iwl_be401_name[] = "Intel(R) Wi-Fi 7 BE401 320MHz";

drivers/net/wireless/intel/iwlwifi/cfg/rf-wh.c

0 → 100644
+15 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2025 Intel Corporation

 */

#include "iwl-config.h"



/* currently iwl_rf_wh/iwl_rf_wh_160mhz are just defines for the FM ones */



const char iwl_killer_be1775s_name[] =

	"Killer(R) Wi-Fi 7 BE1775s 320MHz Wireless Network Adapter (BE211D2W)";

const char iwl_killer_be1775i_name[] =

	"Killer(R) Wi-Fi 7 BE1775i 320MHz Wireless Network Adapter (BE211NGW)";



const char iwl_be211_name[] = "Intel(R) Wi-Fi 7 BE211 320MHz";

const char iwl_be213_name[] = "Intel(R) Wi-Fi 7 BE213 160MHz";