Commit 38a4762e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-2022-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless 

Kalle Valo says:

====================
wireless fixes for v5.19

First set of fixes for v5.19. Build fixes for iwlwifi and libertas, a
scheduling while atomic fix for rtw88 and use-after-free fix for
mac80211.

* tag 'wireless-2022-06-01' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless:
  wifi: mac80211: fix use-after-free in chanctx code
  wifi: rtw88: add a work to correct atomic scheduling warning of ::set_tim
  wifi: iwlwifi: pcie: rename CAUSE macro
  wifi: libertas: use variable-size data in assoc req/resp cmd
====================

Link: https://lore.kernel.org/r/20220601110741.90B28C385A5@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 8d3398ba 2965c4cd

drivers/net/wireless/intel/iwlwifi/pcie/trans.c

+17 −17
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ struct iwl_causes_list { 
	u8 addr;

};



#define CAUSE(reg, mask)						\

#define IWL_CAUSE(reg, mask)						\

	{								\

		.mask_reg = reg,					\

		.bit = ilog2(mask),					\
@@ -1101,28 +1101,28 @@ struct iwl_causes_list { 
	}



static const struct iwl_causes_list causes_list_common[] = {

	CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_D2S_CH0_NUM),

	CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_D2S_CH1_NUM),

	CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_S2D),

	CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_FH_ERR),

	CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_ALIVE),

	CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_WAKEUP),

	CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_RESET_DONE),

	CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_CT_KILL),

	CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_RF_KILL),

	CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_PERIODIC),

	CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SCD),

	CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_FH_TX),

	CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_HW_ERR),

	CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_HAP),

	IWL_CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_D2S_CH0_NUM),

	IWL_CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_D2S_CH1_NUM),

	IWL_CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_S2D),

	IWL_CAUSE(CSR_MSIX_FH_INT_MASK_AD, MSIX_FH_INT_CAUSES_FH_ERR),

	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_ALIVE),

	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_WAKEUP),

	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_RESET_DONE),

	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_CT_KILL),

	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_RF_KILL),

	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_PERIODIC),

	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SCD),

	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_FH_TX),

	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_HW_ERR),

	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_HAP),

};



static const struct iwl_causes_list causes_list_pre_bz[] = {

	CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SW_ERR),

	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SW_ERR),

};



static const struct iwl_causes_list causes_list_bz[] = {

	CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ),

	IWL_CAUSE(CSR_MSIX_HW_INT_MASK_AD, MSIX_HW_INT_CAUSES_REG_SW_ERR_BZ),

};



static void iwl_pcie_map_list(struct iwl_trans *trans,

drivers/net/wireless/marvell/libertas/cfg.c

+1 −3
Original line number Diff line number Diff line
@@ -1053,7 +1053,6 @@ static int lbs_set_authtype(struct lbs_private *priv, 
 */

#define LBS_ASSOC_MAX_CMD_SIZE                     \

	(sizeof(struct cmd_ds_802_11_associate)    \

	 - 512 /* cmd_ds_802_11_associate.iebuf */ \

	 + LBS_MAX_SSID_TLV_SIZE                   \

	 + LBS_MAX_CHANNEL_TLV_SIZE                \

	 + LBS_MAX_CF_PARAM_TLV_SIZE               \
@@ -1130,8 +1129,7 @@ static int lbs_associate(struct lbs_private *priv, 
	if (sme->ie && sme->ie_len)

		pos += lbs_add_wpa_tlv(pos, sme->ie, sme->ie_len);



	len = (sizeof(*cmd) - sizeof(cmd->iebuf)) +

		(u16)(pos - (u8 *) &cmd->iebuf);

	len = sizeof(*cmd) + (u16)(pos - (u8 *) &cmd->iebuf);

	cmd->hdr.size = cpu_to_le16(len);



	lbs_deb_hex(LBS_DEB_ASSOC, "ASSOC_CMD", (u8 *) cmd,

drivers/net/wireless/marvell/libertas/host.h

+4 −2
Original line number Diff line number Diff line
@@ -528,7 +528,8 @@ struct cmd_ds_802_11_associate { 
	__le16 listeninterval;

	__le16 bcnperiod;

	u8 dtimperiod;

	u8 iebuf[512];    /* Enough for required and most optional IEs */

	/* 512 permitted - enough for required and most optional IEs */

	u8 iebuf[];

} __packed;



struct cmd_ds_802_11_associate_response {
@@ -537,7 +538,8 @@ struct cmd_ds_802_11_associate_response { 
	__le16 capability;

	__le16 statuscode;

	__le16 aid;

	u8 iebuf[512];

	/* max 512 */

	u8 iebuf[];

} __packed;



struct cmd_ds_802_11_set_wep {

drivers/net/wireless/realtek/rtw88/fw.c

+10 −0
Original line number Diff line number Diff line
@@ -1602,6 +1602,16 @@ int rtw_fw_download_rsvd_page(struct rtw_dev *rtwdev) 
	return ret;

}



void rtw_fw_update_beacon_work(struct work_struct *work)

{

	struct rtw_dev *rtwdev = container_of(work, struct rtw_dev,

					      update_beacon_work);



	mutex_lock(&rtwdev->mutex);

	rtw_fw_download_rsvd_page(rtwdev);

	mutex_unlock(&rtwdev->mutex);

}



static void rtw_fw_read_fifo_page(struct rtw_dev *rtwdev, u32 offset, u32 size,

				  u32 *buf, u32 residue, u16 start_pg)

{

drivers/net/wireless/realtek/rtw88/fw.h

+1 −0
Original line number Diff line number Diff line
@@ -809,6 +809,7 @@ void rtw_add_rsvd_page_pno(struct rtw_dev *rtwdev, 
void rtw_add_rsvd_page_sta(struct rtw_dev *rtwdev,

			   struct rtw_vif *rtwvif);

int rtw_fw_download_rsvd_page(struct rtw_dev *rtwdev);

void rtw_fw_update_beacon_work(struct work_struct *work);

void rtw_send_rsvd_page_h2c(struct rtw_dev *rtwdev);

int rtw_dump_drv_rsvd_page(struct rtw_dev *rtwdev,

			   u32 offset, u32 size, u32 *buf);