Commit 1659b441 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2025-10-30' of... 

Merge tag 'wireless-next-2025-10-30' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Johannes Berg says:

====================
Not that many changes this time:

 - mac80211:
   - improved VHT radiotap reporting
   - S1G improvements
   - multi-radio monitor improvements
   - HT action frame handling on 6 GHz
   - mesh rate tracking improvements
   - CSA handling improvements
 - cfg80211: multi-radio debugfs
 - rt2x00: improvements for embedded platforms

* tag 'wireless-next-2025-10-30' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next:
  wifi: mac80211: Allow HT Action frame processing on 6 GHz when HE is supported
  wifi: rt2x00: add nvmem eeprom support
  wifi: mac80211: add RX flag to report radiotap VHT information
  net: wireless: Remove redundant pm_runtime_mark_last_busy() calls
  wifi: cfg80211: Add parameters to radio-specific debugfs directories
  wifi: cfg80211: Add debugfs support for multi-radio wiphy
  wifi: mac80211: fix missing RX bitrate update for mesh forwarding path
  wifi: cfg80211: default S1G chandef width to 1MHz
  wifi: mac80211: get probe response chan via ieee80211_get_channel_khz
  wifi: mac80211: reset CRC valid after CSA
  wifi: mac80211_hwsim: advertise puncturing feature support
  wifi: cfg80211/mac80211: validate radio frequency range for monitor mode
  wifi: rt2x00: check retval for of_get_mac_address
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ecca75ae 508dfc1f

drivers/net/wireless/ath/wil6210/pm.c

+0 −1
Original line number Diff line number Diff line
@@ -458,6 +458,5 @@ void wil_pm_runtime_put(struct wil6210_priv *wil) 
{

	struct device *dev = wil_to_dev(wil);



	pm_runtime_mark_last_busy(dev);

	pm_runtime_put_autosuspend(dev);

}

drivers/net/wireless/ralink/rt2x00/rt2800lib.c

+34 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/crc-ccitt.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/nvmem-consumer.h>

#include <linux/slab.h>



#include "rt2x00.h"
@@ -10962,6 +10963,36 @@ int rt2800_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev) 
}

EXPORT_SYMBOL_GPL(rt2800_read_eeprom_efuse);



int rt2800_read_eeprom_nvmem(struct rt2x00_dev *rt2x00dev)

{

	struct device_node *np = rt2x00dev->dev->of_node;

	unsigned int len = rt2x00dev->ops->eeprom_size;

	struct nvmem_cell *cell;

	const void *data;

	size_t retlen;



	cell = of_nvmem_cell_get(np, "eeprom");

	if (IS_ERR(cell))

		return PTR_ERR(cell);



	data = nvmem_cell_read(cell, &retlen);

	nvmem_cell_put(cell);



	if (IS_ERR(data))

		return PTR_ERR(data);



	if (retlen != len) {

		dev_err(rt2x00dev->dev, "invalid eeprom size, required: 0x%04x\n", len);

		kfree(data);

		return -EINVAL;

	}



	memcpy(rt2x00dev->eeprom, data, len);

	kfree(data);

	return 0;

}

EXPORT_SYMBOL_GPL(rt2800_read_eeprom_nvmem);



static u8 rt2800_get_txmixer_gain_24g(struct rt2x00_dev *rt2x00dev)

{

	u16 word;
@@ -11011,7 +11042,9 @@ static int rt2800_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
	 * Start validation of the data that has been read.

	 */

	mac = rt2800_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);

	rt2x00lib_set_mac_address(rt2x00dev, mac);

	retval = rt2x00lib_set_mac_address(rt2x00dev, mac);

	if (retval)

		return retval;



	word = rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0);

	if (word == 0xffff) {

drivers/net/wireless/ralink/rt2x00/rt2800lib.h

+2 −0
Original line number Diff line number Diff line
@@ -248,6 +248,8 @@ void rt2800_disable_radio(struct rt2x00_dev *rt2x00dev); 
int rt2800_efuse_detect(struct rt2x00_dev *rt2x00dev);

int rt2800_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev);



int rt2800_read_eeprom_nvmem(struct rt2x00_dev *rt2x00dev);



int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev);



void rt2800_get_key_seq(struct ieee80211_hw *hw,

drivers/net/wireless/ralink/rt2x00/rt2800pci.c

+3 −0
Original line number Diff line number Diff line
@@ -278,6 +278,9 @@ static int rt2800pci_read_eeprom(struct rt2x00_dev *rt2x00dev) 
{

	int retval;



	if (!rt2800_read_eeprom_nvmem(rt2x00dev))

		return 0;



	if (rt2800pci_efuse_detect(rt2x00dev))

		retval = rt2800pci_read_eeprom_efuse(rt2x00dev);

	else

drivers/net/wireless/ralink/rt2x00/rt2800soc.c

+5 −1
Original line number Diff line number Diff line
@@ -92,8 +92,12 @@ static int rt2800soc_set_device_state(struct rt2x00_dev *rt2x00dev, 


static int rt2800soc_read_eeprom(struct rt2x00_dev *rt2x00dev)

{

	void __iomem *base_addr = ioremap(0x1F040000, EEPROM_SIZE);

	void __iomem *base_addr;



	if (!rt2800_read_eeprom_nvmem(rt2x00dev))

		return 0;



	base_addr = ioremap(0x1F040000, EEPROM_SIZE);

	if (!base_addr)

		return -ENOMEM;