Commit 93d4e8bb authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-next-2024-06-07' of... 

Merge tag 'wireless-next-2024-06-07' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

Kalle Valo says:

====================
wireless-next patches for v6.11

The first "new features" pull request for v6.11 with changes both in
stack and in drivers. Nothing out of ordinary, except that we have
two conflicts this time:

net/mac80211/cfg.c
  https://lore.kernel.org/all/20240531124415.05b25e7a@canb.auug.org.au

drivers/net/wireless/microchip/wilc1000/netdev.c
  https://lore.kernel.org/all/20240603110023.23572803@canb.auug.org.au

Major changes:

cfg80211/mac80211
 * parse Transmit Power Envelope (TPE) data in mac80211 instead of in drivers

wilc1000
 * read MAC address during probe to make it visible to user space

iwlwifi
 * bump FW API to 91 for BZ/SC devices
 * report 64-bit radiotap timestamp
 * enable P2P low latency by default
 * handle Transmit Power Envelope (TPE) advertised by AP
 * start using guard()

rtlwifi
 * RTL8192DU support

ath12k
 * remove unsupported tx monitor handling
 * channel 2 in 6 GHz band support
 * Spatial Multiplexing Power Save (SMPS) in 6 GHz band support
 * multiple BSSID (MBSSID) and Enhanced Multi-BSSID Advertisements (EMA)
   support
 * dynamic VLAN support
 * add panic handler for resetting the firmware state

ath10k
 * add qcom,no-msa-ready-indicator Device Tree property
 * LED support for various chipsets

* tag 'wireless-next-2024-06-07' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next

: (194 commits)
  wifi: ath12k: add hw_link_id in ath12k_pdev
  wifi: ath12k: add panic handler
  wifi: rtw89: chan: Use swap() in rtw89_swap_sub_entity()
  wifi: brcm80211: remove unused structs
  wifi: brcm80211: use sizeof(*pointer) instead of sizeof(type)
  wifi: ath12k: do not process consecutive RDDM event
  dt-bindings: net: wireless: ath11k: Drop "qcom,ipq8074-wcss-pil" from example
  wifi: ath12k: fix memory leak in ath12k_dp_rx_peer_frag_setup()
  wifi: rtlwifi: handle return value of usb init TX/RX
  wifi: rtlwifi: Enable the new rtl8192du driver
  wifi: rtlwifi: Add rtl8192du/sw.c
  wifi: rtlwifi: Constify rtl_hal_cfg.{ops,usb_interface_cfg} and rtl_priv.cfg
  wifi: rtlwifi: Add rtl8192du/dm.{c,h}
  wifi: rtlwifi: Add rtl8192du/fw.{c,h} and rtl8192du/led.{c,h}
  wifi: rtlwifi: Add rtl8192du/rf.{c,h}
  wifi: rtlwifi: Add rtl8192du/trx.{c,h}
  wifi: rtlwifi: Add rtl8192du/phy.{c,h}
  wifi: rtlwifi: Add rtl8192du/hw.{c,h}
  wifi: rtlwifi: Add new members to struct rtl_priv for RTL8192DU
  wifi: rtlwifi: Add rtl8192du/table.{c,h}
  ...

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>

====================

Link: https://lore.kernel.org/r/20240607093517.41394C2BBFC@smtp.kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2ba6d157 a46300b1

Documentation/devicetree/bindings/net/wireless/qcom,ath10k.yaml

+5 −0
Original line number Diff line number Diff line
@@ -128,6 +128,11 @@ properties: 
      Whether to skip executing an SCM call that reassigns the memory

      region ownership.



  qcom,no-msa-ready-indicator:

    type: boolean

    description:

      Don't wait for MSA_READY indicator to complete init.



  qcom,smem-states:

    $ref: /schemas/types.yaml#/definitions/phandle-array

    description: State bits used by the AP to signal the WLAN Q6.

Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml

+0 −9
Original line number Diff line number Diff line
@@ -265,15 +265,6 @@ allOf: 


examples:

  - |



    q6v5_wcss: remoteproc@cd00000 {

        compatible = "qcom,ipq8074-wcss-pil";

        reg = <0xcd00000 0x4040>,

              <0x4ab000 0x20>;

        reg-names = "qdsp6",

                    "rmb";

    };



    wifi0: wifi@c000000 {

        compatible = "qcom,ipq8074-wifi";

        reg = <0xc000000 0x2000000>;

drivers/net/wireless/ath/ath10k/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -68,6 +68,12 @@ config ATH10K_DEBUGFS 


	  If unsure, say Y to make it easier to debug problems.



config ATH10K_LEDS

	bool

	depends on ATH10K

	depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211

	default y



config ATH10K_SPECTRAL

	bool "Atheros ath10k spectral scan support"

	depends on ATH10K_DEBUGFS

drivers/net/wireless/ath/ath10k/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ ath10k_core-$(CONFIG_ATH10K_SPECTRAL) += spectral.o 
ath10k_core-$(CONFIG_NL80211_TESTMODE) += testmode.o

ath10k_core-$(CONFIG_ATH10K_TRACING) += trace.o

ath10k_core-$(CONFIG_THERMAL) += thermal.o

ath10k_core-$(CONFIG_ATH10K_LEDS) += leds.o

ath10k_core-$(CONFIG_MAC80211_DEBUGFS) += debugfs_sta.o

ath10k_core-$(CONFIG_PM) += wow.o

ath10k_core-$(CONFIG_DEV_COREDUMP) += coredump.o

drivers/net/wireless/ath/ath10k/core.c

+32 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "testmode.h"

#include "wmi-ops.h"

#include "coredump.h"

#include "leds.h"



unsigned int ath10k_debug_mask;

EXPORT_SYMBOL(ath10k_debug_mask);
@@ -68,6 +69,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca988x hw2.0",

		.patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,

		.uart_pin = 7,

		.led_pin = 1,

		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,
@@ -108,6 +110,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca988x hw2.0 ubiquiti",

		.patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,

		.uart_pin = 7,

		.led_pin = 0,

		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,
@@ -149,6 +152,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca9887 hw1.0",

		.patch_load_addr = QCA9887_HW_1_0_PATCH_LOAD_ADDR,

		.uart_pin = 7,

		.led_pin = 1,

		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,
@@ -190,6 +194,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca6174 hw3.2 sdio",

		.patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,

		.uart_pin = 19,

		.led_pin = 0,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,
@@ -226,6 +231,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca6164 hw2.1",

		.patch_load_addr = QCA6174_HW_2_1_PATCH_LOAD_ADDR,

		.uart_pin = 6,

		.led_pin = 0,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,
@@ -266,6 +272,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca6174 hw2.1",

		.patch_load_addr = QCA6174_HW_2_1_PATCH_LOAD_ADDR,

		.uart_pin = 6,

		.led_pin = 0,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,
@@ -306,6 +313,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca6174 hw3.0",

		.patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,

		.uart_pin = 6,

		.led_pin = 0,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,
@@ -346,6 +354,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca6174 hw3.2",

		.patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,

		.uart_pin = 6,

		.led_pin = 0,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,
@@ -390,6 +399,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca99x0 hw2.0",

		.patch_load_addr = QCA99X0_HW_2_0_PATCH_LOAD_ADDR,

		.uart_pin = 7,

		.led_pin = 17,

		.otp_exe_param = 0x00000700,

		.continuous_frag_desc = true,

		.cck_rate_map_rev2 = true,
@@ -436,6 +446,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca9984/qca9994 hw1.0",

		.patch_load_addr = QCA9984_HW_1_0_PATCH_LOAD_ADDR,

		.uart_pin = 7,

		.led_pin = 17,

		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,

		.otp_exe_param = 0x00000700,

		.continuous_frag_desc = true,
@@ -488,6 +499,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca9888 hw2.0",

		.patch_load_addr = QCA9888_HW_2_0_PATCH_LOAD_ADDR,

		.uart_pin = 7,

		.led_pin = 17,

		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,

		.otp_exe_param = 0x00000700,

		.continuous_frag_desc = true,
@@ -538,6 +550,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca9377 hw1.0",

		.patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,

		.uart_pin = 6,

		.led_pin = 0,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,
@@ -578,6 +591,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca9377 hw1.1",

		.patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,

		.uart_pin = 6,

		.led_pin = 0,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,
@@ -620,6 +634,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca9377 hw1.1 sdio",

		.patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,

		.uart_pin = 19,

		.led_pin = 0,

		.otp_exe_param = 0,

		.channel_counters_freq_hz = 88000,

		.max_probe_resp_desc_thres = 0,
@@ -653,6 +668,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.name = "qca4019 hw1.0",

		.patch_load_addr = QCA4019_HW_1_0_PATCH_LOAD_ADDR,

		.uart_pin = 7,

		.led_pin = 0,

		.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,

		.otp_exe_param = 0x0010000,

		.continuous_frag_desc = true,
@@ -698,6 +714,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.dev_id = 0,

		.bus = ATH10K_BUS_SNOC,

		.name = "wcn3990 hw1.0",

		.led_pin = 0,

		.continuous_frag_desc = true,

		.tx_chain_mask = 0x7,

		.rx_chain_mask = 0x7,
@@ -3224,6 +3241,10 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, 
		goto err_hif_stop;

	}



	status = ath10k_leds_start(ar);

	if (status)

		goto err_hif_stop;



	return 0;



err_hif_stop:
@@ -3482,9 +3503,18 @@ static void ath10k_core_register_work(struct work_struct *work) 
		goto err_spectral_destroy;

	}



	status = ath10k_leds_register(ar);

	if (status) {

		ath10k_err(ar, "could not register leds: %d\n",

			   status);

		goto err_thermal_unregister;

	}



	set_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags);

	return;



err_thermal_unregister:

	ath10k_thermal_unregister(ar);

err_spectral_destroy:

	ath10k_spectral_destroy(ar);

err_debug_destroy:
@@ -3520,6 +3550,8 @@ void ath10k_core_unregister(struct ath10k *ar) 
	if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags))

		return;



	ath10k_leds_unregister(ar);



	ath10k_thermal_unregister(ar);

	/* Stop spectral before unregistering from mac80211 to remove the

	 * relayfs debugfs file cleanly. Otherwise the parent debugfs tree