Commit 30763f1a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2025-04-24' of... 

Merge tag 'wireless-2025-04-24' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless

Johannes Berg says:

====================
Some more fixes, notably:
 * iwlwifi: various regression and iwlmld fixes
 * mac80211: fix TX frames in monitor mode
 * brcmfmac: error handling for firmware load

* tag 'wireless-2025-04-24' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: iwlwifi: restore missing initialization of async_handlers_list
  wifi: brcm80211: fmac: Add error handling for brcmf_usb_dl_writeimage()
  wifi: plfxlc: Remove erroneous assert in plfxlc_mac_release
  wifi: iwlwifi: fix the check for the SCRATCH register upon resume
  wifi: iwlwifi: don't warn if the NIC is gone in resume
  wifi: iwlwifi: mld: fix BAID validity check
  wifi: iwlwifi: back off on continuous errors
  wifi: iwlwifi: mld: only create debugfs symlink if it does not exist
  wifi: iwlwifi: mld: inform trans on init failure
  wifi: iwlwifi: mld: properly handle async notification in op mode start
  Revert "wifi: iwlwifi: make no_160 more generic"
  Revert "wifi: iwlwifi: add support for BE213"
  wifi: mac80211: restore monitor for outgoing frames
====================

Link: https://patch.msgid.link/20250424120535.56499-3-johannes@sipsolutions.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e72e9e69 175e69e3

drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c

+4 −2
Original line number Diff line number Diff line
@@ -896,14 +896,16 @@ brcmf_usb_dl_writeimage(struct brcmf_usbdev_info *devinfo, u8 *fw, int fwlen) 
	}



	/* 1) Prepare USB boot loader for runtime image */

	brcmf_usb_dl_cmd(devinfo, DL_START, &state, sizeof(state));

	err = brcmf_usb_dl_cmd(devinfo, DL_START, &state, sizeof(state));

	if (err)

		goto fail;



	rdlstate = le32_to_cpu(state.state);

	rdlbytes = le32_to_cpu(state.bytes);



	/* 2) Check we are in the Waiting state */

	if (rdlstate != DL_WAITING) {

		brcmf_err("Failed to DL_START\n");

		brcmf_err("Invalid DL state: %u\n", rdlstate);

		err = -EINVAL;

		goto fail;

	}

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

+0 −2
Original line number Diff line number Diff line
@@ -142,8 +142,6 @@ 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,

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+9 −7
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
/*

 * Copyright (C) 2005-2014, 2018-2021 Intel Corporation

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2025 Intel Corporation

 * Copyright (C) 2018-2024 Intel Corporation

 */

#ifndef __IWL_CONFIG_H__

#define __IWL_CONFIG_H__
@@ -451,8 +451,11 @@ struct iwl_cfg { 
#define IWL_CFG_RF_ID_HR		0x7

#define IWL_CFG_RF_ID_HR1		0x4



#define IWL_CFG_BW_NO_LIM		(U16_MAX - 1)

#define IWL_CFG_BW_ANY			U16_MAX

#define IWL_CFG_NO_160			0x1

#define IWL_CFG_160			0x0



#define IWL_CFG_NO_320			0x1

#define IWL_CFG_320			0x0



#define IWL_CFG_CORES_BT		0x0

#define IWL_CFG_CORES_BT_GNSS		0x5
@@ -464,7 +467,7 @@ struct iwl_cfg { 
#define IWL_CFG_IS_JACKET		0x1



#define IWL_SUBDEVICE_RF_ID(subdevice)	((u16)((subdevice) & 0x00F0) >> 4)

#define IWL_SUBDEVICE_BW_LIM(subdevice)	((u16)((subdevice) & 0x0200) >> 9)

#define IWL_SUBDEVICE_NO_160(subdevice)	((u16)((subdevice) & 0x0200) >> 9)

#define IWL_SUBDEVICE_CORES(subdevice)	((u16)((subdevice) & 0x1C00) >> 10)



struct iwl_dev_info {
@@ -472,10 +475,10 @@ struct iwl_dev_info { 
	u16 subdevice;

	u16 mac_type;

	u16 rf_type;

	u16 bw_limit;

	u8 mac_step;

	u8 rf_step;

	u8 rf_id;

	u8 no_160;

	u8 cores;

	u8 cdb;

	u8 jacket;
@@ -489,7 +492,7 @@ extern const unsigned int iwl_dev_info_table_size; 
const struct iwl_dev_info *

iwl_pci_find_dev_info(u16 device, u16 subsystem_device,

		      u16 mac_type, u8 mac_step, u16 rf_type, u8 cdb,

		      u8 jacket, u8 rf_id, u8 bw_limit, u8 cores, u8 rf_step);

		      u8 jacket, u8 rf_id, u8 no_160, u8 cores, u8 rf_step);

extern const struct pci_device_id iwl_hw_card_ids[];

#endif
@@ -550,7 +553,6 @@ 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[];

drivers/net/wireless/intel/iwlwifi/iwl-csr.h

+1 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ 
 * during a error FW error.

 */

#define CSR_FUNC_SCRATCH_INIT_VALUE		(0x01010101)

#define CSR_FUNC_SCRATCH_POWER_OFF_MASK		0xFFFF



/* Bits for CSR_HW_IF_CONFIG_REG */

#define CSR_HW_IF_CONFIG_REG_MSK_MAC_STEP_DASH	(0x0000000F)

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+6 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause

/*

 * Copyright (C) 2005-2014, 2018-2023, 2025 Intel Corporation

 * Copyright (C) 2005-2014, 2018-2023 Intel Corporation

 * Copyright (C) 2013-2015 Intel Mobile Communications GmbH

 * Copyright (C) 2016-2017 Intel Deutschland GmbH

 */
@@ -944,8 +944,7 @@ 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 &&

		    trans->bw_limit >= 320) {

		if (!trans->reduced_cap_sku) {

			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] |=
@@ -1095,22 +1094,19 @@ iwl_nvm_fixup_sband_iftd(struct iwl_trans *trans, 
		iftype_data->eht_cap.eht_mcs_nss_supp.bw._320.rx_tx_mcs13_max_nss = 0;

	}



	if (trans->bw_limit < 160)

	if (trans->no_160)

		iftype_data->he_cap.he_cap_elem.phy_cap_info[0] &=

			~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G;



	if (trans->bw_limit < 320 || trans->reduced_cap_sku) {

	if (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;

	}

}