Commit c9071401 authored by David S. Miller's avatar David S. Miller
Browse files

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



Johannes berg says:

====================
We have a handful of fixes:
 - fix DMA from stack in wilc1000 driver
 - fix crash on chip reset failure in mt7921e
 - fix for the reported warning on aggregation timer expiry
 - check packet lengths in hwsim virtio paths
 - fix compiler warnings/errors with AAD construction by
   using struct_group
 - fix Intel 4965 driver rate scale operation
 - release channel contexts correctly in mac80211 mlme code
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d9c0103b 2aec9099

drivers/net/wireless/intel/iwlegacy/4965-rs.c

+1 −4
Original line number Diff line number Diff line
@@ -2403,7 +2403,7 @@ il4965_rs_fill_link_cmd(struct il_priv *il, struct il_lq_sta *lq_sta, 
		/* Repeat initial/next rate.

		 * For legacy IL_NUMBER_TRY == 1, this loop will not execute.

		 * For HT IL_HT_NUMBER_TRY == 3, this executes twice. */

		while (repeat_rate > 0) {

		while (repeat_rate > 0 && idx < (LINK_QUAL_MAX_RETRY_NUM - 1)) {

			if (is_legacy(tbl_type.lq_type)) {

				if (ant_toggle_cnt < NUM_TRY_BEFORE_ANT_TOGGLE)

					ant_toggle_cnt++;
@@ -2422,8 +2422,6 @@ il4965_rs_fill_link_cmd(struct il_priv *il, struct il_lq_sta *lq_sta, 
			    cpu_to_le32(new_rate);

			repeat_rate--;

			idx++;

			if (idx >= LINK_QUAL_MAX_RETRY_NUM)

				goto out;

		}



		il4965_rs_get_tbl_info_from_mcs(new_rate, lq_sta->band,
@@ -2468,7 +2466,6 @@ il4965_rs_fill_link_cmd(struct il_priv *il, struct il_lq_sta *lq_sta, 
		repeat_rate--;

	}



out:

	lq_cmd->agg_params.agg_frame_cnt_limit = LINK_QUAL_AGG_FRAME_LIMIT_DEF;

	lq_cmd->agg_params.agg_dis_start_th = LINK_QUAL_AGG_DISABLE_START_DEF;

drivers/net/wireless/mac80211_hwsim.c

+6 −1
Original line number Diff line number Diff line
@@ -5060,6 +5060,10 @@ static int hwsim_virtio_handle_cmd(struct sk_buff *skb) 


	nlh = nlmsg_hdr(skb);

	gnlh = nlmsg_data(nlh);



	if (skb->len < nlh->nlmsg_len)

		return -EINVAL;



	err = genlmsg_parse(nlh, &hwsim_genl_family, tb, HWSIM_ATTR_MAX,

			    hwsim_genl_policy, NULL);

	if (err) {
@@ -5102,7 +5106,8 @@ static void hwsim_virtio_rx_work(struct work_struct *work) 
	spin_unlock_irqrestore(&hwsim_virtio_lock, flags);



	skb->data = skb->head;

	skb_set_tail_pointer(skb, len);

	skb_reset_tail_pointer(skb);

	skb_put(skb, len);

	hwsim_virtio_handle_cmd(skb);



	spin_lock_irqsave(&hwsim_virtio_lock, flags);

drivers/net/wireless/mediatek/mt76/mt7921/pci_mac.c

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ int mt7921e_mac_reset(struct mt7921_dev *dev) 


	err = mt7921e_driver_own(dev);

	if (err)

		return err;

		goto out;



	err = mt7921_run_firmware(dev);

	if (err)

drivers/net/wireless/microchip/wilc1000/netdev.h

+1 −0
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ struct wilc { 
	u8 *rx_buffer;

	u32 rx_buffer_offset;

	u8 *tx_buffer;

	u32 *vmm_table;



	struct txq_handle txq[NQUEUES];

	int txq_entries;

drivers/net/wireless/microchip/wilc1000/sdio.c

+33 −6
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ struct wilc_sdio { 
	u32 block_size;

	bool isinit;

	int has_thrpt_enh3;

	u8 *cmd53_buf;

};



struct sdio_cmd52 {
@@ -47,6 +48,7 @@ struct sdio_cmd53 { 
	u32 count:		9;

	u8 *buffer;

	u32 block_size;

	bool use_global_buf;

};



static const struct wilc_hif_func wilc_hif_sdio;
@@ -91,6 +93,8 @@ static int wilc_sdio_cmd53(struct wilc *wilc, struct sdio_cmd53 *cmd) 
{

	struct sdio_func *func = container_of(wilc->dev, struct sdio_func, dev);

	int size, ret;

	struct wilc_sdio *sdio_priv = wilc->bus_data;

	u8 *buf = cmd->buffer;



	sdio_claim_host(func);
@@ -101,12 +105,23 @@ static int wilc_sdio_cmd53(struct wilc *wilc, struct sdio_cmd53 *cmd) 
	else

		size = cmd->count;



	if (cmd->use_global_buf) {

		if (size > sizeof(u32))

			return -EINVAL;



		buf = sdio_priv->cmd53_buf;

	}



	if (cmd->read_write) {  /* write */

		ret = sdio_memcpy_toio(func, cmd->address,

				       (void *)cmd->buffer, size);

		if (cmd->use_global_buf)

			memcpy(buf, cmd->buffer, size);



		ret = sdio_memcpy_toio(func, cmd->address, buf, size);

	} else {        /* read */

		ret = sdio_memcpy_fromio(func, (void *)cmd->buffer,

					 cmd->address,  size);

		ret = sdio_memcpy_fromio(func, buf, cmd->address, size);



		if (cmd->use_global_buf)

			memcpy(cmd->buffer, buf, size);

	}



	sdio_release_host(func);
@@ -128,6 +143,12 @@ static int wilc_sdio_probe(struct sdio_func *func, 
	if (!sdio_priv)

		return -ENOMEM;



	sdio_priv->cmd53_buf = kzalloc(sizeof(u32), GFP_KERNEL);

	if (!sdio_priv->cmd53_buf) {

		ret = -ENOMEM;

		goto free;

	}



	ret = wilc_cfg80211_init(&wilc, &func->dev, WILC_HIF_SDIO,

				 &wilc_hif_sdio);

	if (ret)
@@ -161,6 +182,7 @@ static int wilc_sdio_probe(struct sdio_func *func, 
	irq_dispose_mapping(wilc->dev_irq_num);

	wilc_netdev_cleanup(wilc);

free:

	kfree(sdio_priv->cmd53_buf);

	kfree(sdio_priv);

	return ret;

}
@@ -172,6 +194,7 @@ static void wilc_sdio_remove(struct sdio_func *func) 


	clk_disable_unprepare(wilc->rtc_clk);

	wilc_netdev_cleanup(wilc);

	kfree(sdio_priv->cmd53_buf);

	kfree(sdio_priv);

}
@@ -375,8 +398,9 @@ static int wilc_sdio_write_reg(struct wilc *wilc, u32 addr, u32 data) 
		cmd.address = WILC_SDIO_FBR_DATA_REG;

		cmd.block_mode = 0;

		cmd.increment = 1;

		cmd.count = 4;

		cmd.count = sizeof(u32);

		cmd.buffer = (u8 *)&data;

		cmd.use_global_buf = true;

		cmd.block_size = sdio_priv->block_size;

		ret = wilc_sdio_cmd53(wilc, &cmd);

		if (ret)
@@ -414,6 +438,7 @@ static int wilc_sdio_write(struct wilc *wilc, u32 addr, u8 *buf, u32 size) 
	nblk = size / block_size;

	nleft = size % block_size;



	cmd.use_global_buf = false;

	if (nblk > 0) {

		cmd.block_mode = 1;

		cmd.increment = 1;
@@ -492,8 +517,9 @@ static int wilc_sdio_read_reg(struct wilc *wilc, u32 addr, u32 *data) 
		cmd.address = WILC_SDIO_FBR_DATA_REG;

		cmd.block_mode = 0;

		cmd.increment = 1;

		cmd.count = 4;

		cmd.count = sizeof(u32);

		cmd.buffer = (u8 *)data;

		cmd.use_global_buf = true;



		cmd.block_size = sdio_priv->block_size;

		ret = wilc_sdio_cmd53(wilc, &cmd);
@@ -535,6 +561,7 @@ static int wilc_sdio_read(struct wilc *wilc, u32 addr, u8 *buf, u32 size) 
	nblk = size / block_size;

	nleft = size % block_size;



	cmd.use_global_buf = false;

	if (nblk > 0) {

		cmd.block_mode = 1;

		cmd.increment = 1;