src - FreeBSD source tree

diff options


context:
space:
mode:

author	Bjoern A. Zeeb <bz@FreeBSD.org>	2025-04-21 22:30:22 +0000
committer	Bjoern A. Zeeb <bz@FreeBSD.org>	2025-04-21 22:30:22 +0000
commit	47517ebce7b8d1dc0ee900f13404f2e90ce33be9 (patch)
tree	4c44a2ef65a5bd5726893e26aca9e4790eec0766
parent	e05a7642395e7a6cbf1876350e96bd80e6292cd4 (diff)

vendor/Linux/ath10k/torvalds-v6.14

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

103

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

163

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

-rw-r--r--

109

-rw-r--r--

wmi.h

104

-rw-r--r--

wow.c

44 files changed, 722 insertions, 404 deletions

diff --git a/Kconfig b/Kconfig
index e6ea884cafc1..876aed765833 100644
--- a/Kconfig
+++ b/Kconfig

@@ -45,6 +45,7 @@ config ATH10K_SNOC

depends on ATH10K

depends on ARCH_QCOM || COMPILE_TEST

depends on QCOM_SMEM

+ depends on QCOM_RPROC_COMMON || QCOM_RPROC_COMMON=n

select QCOM_SCM

select QCOM_QMI_HELPERS

help

@@ -67,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

diff --git a/Makefile b/Makefile
index 142c777b287f..02bf9b629038 100644
--- a/Makefile
+++ b/Makefile

@@ -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

diff --git a/ahb.c b/ahb.c
index 76efea2f1138..db9f9ebcb62d 100644
--- a/ahb.c
+++ b/ahb.c

@@ -394,14 +394,14 @@ static irqreturn_t ath10k_ahb_interrupt_handler(int irq, void *arg)

if (!ath10k_pci_irq_pending(ar))

return IRQ_NONE;

- ath10k_pci_disable_and_clear_legacy_irq(ar);

+ ath10k_pci_disable_and_clear_intx_irq(ar);

ath10k_pci_irq_msi_fw_mask(ar);

napi_schedule(&ar->napi);

return IRQ_HANDLED;

}

-static int ath10k_ahb_request_irq_legacy(struct ath10k *ar)

+static int ath10k_ahb_request_irq_intx(struct ath10k *ar)

{

struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);

@@ -415,12 +415,12 @@ static int ath10k_ahb_request_irq_legacy(struct ath10k *ar)

ar_ahb->irq, ret);

return ret;

}

- ar_pci->oper_irq_mode = ATH10K_PCI_IRQ_LEGACY;

+ ar_pci->oper_irq_mode = ATH10K_PCI_IRQ_INTX;

return 0;

}

-static void ath10k_ahb_release_irq_legacy(struct ath10k *ar)

+static void ath10k_ahb_release_irq_intx(struct ath10k *ar)

{

struct ath10k_ahb *ar_ahb = ath10k_ahb_priv(ar);

@@ -430,7 +430,7 @@ static void ath10k_ahb_release_irq_legacy(struct ath10k *ar)

static void ath10k_ahb_irq_disable(struct ath10k *ar)

{

ath10k_ce_disable_interrupts(ar);

- ath10k_pci_disable_and_clear_legacy_irq(ar);

+ ath10k_pci_disable_and_clear_intx_irq(ar);

}

static int ath10k_ahb_resource_init(struct ath10k *ar)

@@ -621,7 +621,7 @@ static int ath10k_ahb_hif_start(struct ath10k *ar)

ath10k_core_napi_enable(ar);

ath10k_ce_enable_interrupts(ar);

- ath10k_pci_enable_legacy_irq(ar);

+ ath10k_pci_enable_intx_irq(ar);

ath10k_pci_rx_post(ar);

@@ -733,7 +733,7 @@ static int ath10k_ahb_probe(struct platform_device *pdev)

int ret;

struct ath10k_bus_params bus_params = {};

- hw_rev = (enum ath10k_hw_rev)of_device_get_match_data(&pdev->dev);

+ hw_rev = (uintptr_t)of_device_get_match_data(&pdev->dev);

if (!hw_rev) {

dev_err(&pdev->dev, "OF data missing\n");

return -EINVAL;

@@ -775,7 +775,7 @@ static int ath10k_ahb_probe(struct platform_device *pdev)

ath10k_pci_init_napi(ar);

- ret = ath10k_ahb_request_irq_legacy(ar);

+ ret = ath10k_ahb_request_irq_intx(ar);

if (ret)

goto err_free_pipes;

@@ -806,7 +806,7 @@ err_halt_device:

ath10k_ahb_clock_disable(ar);

err_free_irq:

- ath10k_ahb_release_irq_legacy(ar);

+ ath10k_ahb_release_irq_intx(ar);

err_free_pipes:

ath10k_pci_release_resource(ar);

@@ -828,7 +828,7 @@ static void ath10k_ahb_remove(struct platform_device *pdev)

ath10k_core_unregister(ar);

ath10k_ahb_irq_disable(ar);

- ath10k_ahb_release_irq_legacy(ar);

+ ath10k_ahb_release_irq_intx(ar);

ath10k_pci_release_resource(ar);

ath10k_ahb_halt_chip(ar);

ath10k_ahb_clock_disable(ar);

@@ -837,12 +837,12 @@ static void ath10k_ahb_remove(struct platform_device *pdev)

}

static struct platform_driver ath10k_ahb_driver = {

- .driver = {

- .name = "ath10k_ahb",

+ .driver = {

+ .name = "ath10k_ahb",

.of_match_table = ath10k_ahb_of_match,

- .probe = ath10k_ahb_probe,

- .remove_new = ath10k_ahb_remove,

+ .probe = ath10k_ahb_probe,

+ .remove = ath10k_ahb_remove,

};

int ath10k_ahb_init(void)

diff --git a/bmi.c b/bmi.c
index af6546572df2..9a4f8e815412 100644
--- a/bmi.c
+++ b/bmi.c

@@ -2,6 +2,7 @@

#include "bmi.h"

diff --git a/ce.c b/ce.c
index c27b8204718a..afae4a8027f8 100644
--- a/ce.c
+++ b/ce.c

@@ -3,6 +3,7 @@

#include "hif.h"

diff --git a/ce.h b/ce.h
index 666ce384a1d8..27367bd64e95 100644
--- a/ce.h
+++ b/ce.h

@@ -110,7 +110,7 @@ struct ath10k_ce_ring {

struct ce_desc_64 *shadow_base;

/* keep last */

- void *per_transfer_context[];

+ void *per_transfer_context[] __counted_by(nentries);

};

struct ath10k_ce_pipe {

diff --git a/core.c b/core.c
index 6cdb225b7eac..b3294287bce1 100644
--- a/core.c
+++ b/core.c

@@ -3,6 +3,7 @@

#include <linux/module.h>

@@ -26,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);

@@ -67,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,

@@ -74,7 +77,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.cal_data_len = 2116,

.fw = {

.dir = QCA988X_HW_2_0_FW_DIR,

- .board = QCA988X_HW_2_0_BOARD_DATA_FILE,

.board_size = QCA988X_BOARD_DATA_SZ,

.board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,

@@ -100,6 +102,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = QCA988X_HW_2_0_VERSION,

@@ -107,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,

@@ -114,7 +118,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.cal_data_len = 2116,

.fw = {

.dir = QCA988X_HW_2_0_FW_DIR,

- .board = QCA988X_HW_2_0_BOARD_DATA_FILE,

.board_size = QCA988X_BOARD_DATA_SZ,

.board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,

@@ -140,6 +143,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = QCA9887_HW_1_0_VERSION,

@@ -148,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,

@@ -155,7 +160,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.cal_data_len = 2116,

.fw = {

.dir = QCA9887_HW_1_0_FW_DIR,

- .board = QCA9887_HW_1_0_BOARD_DATA_FILE,

.board_size = QCA9887_BOARD_DATA_SZ,

.board_ext_size = QCA9887_BOARD_EXT_DATA_SZ,

@@ -181,6 +185,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = QCA6174_HW_3_2_VERSION,

@@ -189,13 +194,13 @@ 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,

.cal_data_len = 0,

.fw = {

.dir = QCA6174_HW_3_0_FW_DIR,

- .board = QCA6174_HW_3_0_BOARD_DATA_FILE,

.board_size = QCA6174_BOARD_DATA_SZ,

.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

@@ -217,6 +222,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = QCA6174_HW_2_1_VERSION,

@@ -225,13 +231,13 @@ 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,

.cal_data_len = 8124,

.fw = {

.dir = QCA6174_HW_2_1_FW_DIR,

- .board = QCA6174_HW_2_1_BOARD_DATA_FILE,

.board_size = QCA6174_BOARD_DATA_SZ,

.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

@@ -257,6 +263,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = QCA6174_HW_2_1_VERSION,

@@ -265,13 +272,13 @@ 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,

.cal_data_len = 8124,

.fw = {

.dir = QCA6174_HW_2_1_FW_DIR,

- .board = QCA6174_HW_2_1_BOARD_DATA_FILE,

.board_size = QCA6174_BOARD_DATA_SZ,

.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

@@ -297,6 +304,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = QCA6174_HW_3_0_VERSION,

@@ -305,13 +313,13 @@ 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,

.cal_data_len = 8124,

.fw = {

.dir = QCA6174_HW_3_0_FW_DIR,

- .board = QCA6174_HW_3_0_BOARD_DATA_FILE,

.board_size = QCA6174_BOARD_DATA_SZ,

.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

@@ -337,6 +345,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = QCA6174_HW_3_2_VERSION,

@@ -345,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,

@@ -352,7 +362,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.fw = {

/* uses same binaries as hw3.0 */

.dir = QCA6174_HW_3_0_FW_DIR,

- .board = QCA6174_HW_3_0_BOARD_DATA_FILE,

.board_size = QCA6174_BOARD_DATA_SZ,

.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

@@ -381,6 +390,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = true,

{

.id = QCA99X0_HW_2_0_DEV_VERSION,

@@ -389,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,

@@ -400,7 +411,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.cal_data_len = 12064,

.fw = {

.dir = QCA99X0_HW_2_0_FW_DIR,

- .board = QCA99X0_HW_2_0_BOARD_DATA_FILE,

.board_size = QCA99X0_BOARD_DATA_SZ,

.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,

@@ -427,6 +437,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = QCA9984_HW_1_0_DEV_VERSION,

@@ -435,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,

@@ -447,8 +459,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.cal_data_len = 12064,

.fw = {

.dir = QCA9984_HW_1_0_FW_DIR,

- .board = QCA9984_HW_1_0_BOARD_DATA_FILE,

- .eboard = QCA9984_HW_1_0_EBOARD_DATA_FILE,

.board_size = QCA99X0_BOARD_DATA_SZ,

.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,

.ext_board_size = QCA99X0_EXT_BOARD_DATA_SZ,

@@ -480,6 +490,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = QCA9888_HW_2_0_DEV_VERSION,

@@ -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,

@@ -499,7 +511,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.cal_data_len = 12064,

.fw = {

.dir = QCA9888_HW_2_0_FW_DIR,

- .board = QCA9888_HW_2_0_BOARD_DATA_FILE,

.board_size = QCA99X0_BOARD_DATA_SZ,

.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,

@@ -530,6 +541,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = QCA9377_HW_1_0_DEV_VERSION,

@@ -538,13 +550,13 @@ 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,

.cal_data_len = 8124,

.fw = {

.dir = QCA9377_HW_1_0_FW_DIR,

- .board = QCA9377_HW_1_0_BOARD_DATA_FILE,

.board_size = QCA9377_BOARD_DATA_SZ,

.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,

@@ -570,6 +582,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = QCA9377_HW_1_1_DEV_VERSION,

@@ -578,13 +591,13 @@ 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,

.cal_data_len = 8124,

.fw = {

.dir = QCA9377_HW_1_0_FW_DIR,

- .board = QCA9377_HW_1_0_BOARD_DATA_FILE,

.board_size = QCA9377_BOARD_DATA_SZ,

.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,

@@ -612,6 +625,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = QCA9377_HW_1_1_DEV_VERSION,

@@ -620,13 +634,13 @@ 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,

.cal_data_len = 8124,

.fw = {

.dir = QCA9377_HW_1_0_FW_DIR,

- .board = QCA9377_HW_1_0_BOARD_DATA_FILE,

.board_size = QCA9377_BOARD_DATA_SZ,

.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,

@@ -645,6 +659,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = QCA4019_HW_1_0_DEV_VERSION,

@@ -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,

@@ -665,7 +681,6 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.cal_data_len = 12064,

.fw = {

.dir = QCA4019_HW_1_0_FW_DIR,

- .board = QCA4019_HW_1_0_BOARD_DATA_FILE,

.board_size = QCA4019_BOARD_DATA_SZ,

.board_ext_size = QCA4019_BOARD_EXT_DATA_SZ,

@@ -692,18 +707,22 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = false,

.use_fw_tx_credits = true,

.delay_unmap_buffer = false,

+ .mcast_frame_registration = false,

{

.id = WCN3990_HW_1_0_DEV_VERSION,

.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,

.max_spatial_stream = 4,

.fw = {

.dir = WCN3990_HW_1_0_FW_DIR,

+ .board_size = WCN3990_BOARD_DATA_SZ,

+ .board_ext_size = WCN3990_BOARD_EXT_DATA_SZ,

.sw_decrypt_mcast_mgmt = true,

.rx_desc_ops = &wcn3990_rx_desc_ops,

@@ -725,6 +744,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {

.hw_restart_disconnect = true,

.use_fw_tx_credits = false,

.delay_unmap_buffer = true,

+ .mcast_frame_registration = false,

};

@@ -925,11 +945,20 @@ static const struct firmware *ath10k_fetch_fw_file(struct ath10k *ar,

if (dir == NULL)

dir = ".";

+ if (ar->board_name) {

+ snprintf(filename, sizeof(filename), "%s/%s/%s",

+ dir, ar->board_name, file);

+ ret = firmware_request_nowarn(&fw, filename, ar->dev);

+ ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",

+ filename, ret);

+ if (!ret)

+ return fw;

+ }

snprintf(filename, sizeof(filename), "%s/%s", dir, file);

ret = firmware_request_nowarn(&fw, filename, ar->dev);

ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot fw request '%s': %d\n",

filename, ret);

if (ret)

return ERR_PTR(ret);

@@ -1271,11 +1300,6 @@ static int ath10k_core_fetch_board_data_api_1(struct ath10k *ar, int bd_ie_type)

char boardname[100];

if (bd_ie_type == ATH10K_BD_IE_BOARD) {

- if (!ar->hw_params.fw.board) {

- ath10k_err(ar, "failed to find board file fw entry\n");

- return -EINVAL;

- }

scnprintf(boardname, sizeof(boardname), "board-%s-%s.bin",

ath10k_bus_str(ar->hif.bus), dev_name(ar->dev));

@@ -1285,7 +1309,7 @@ static int ath10k_core_fetch_board_data_api_1(struct ath10k *ar, int bd_ie_type)

if (IS_ERR(ar->normal_mode_fw.board)) {

fw = ath10k_fetch_fw_file(ar,

ar->hw_params.fw.dir,

- ar->hw_params.fw.board);

+ ATH10K_BOARD_DATA_FILE);

ar->normal_mode_fw.board = fw;

}

@@ -1295,13 +1319,8 @@ static int ath10k_core_fetch_board_data_api_1(struct ath10k *ar, int bd_ie_type)

ar->normal_mode_fw.board_data = ar->normal_mode_fw.board->data;

ar->normal_mode_fw.board_len = ar->normal_mode_fw.board->size;

} else if (bd_ie_type == ATH10K_BD_IE_BOARD_EXT) {

- if (!ar->hw_params.fw.eboard) {

- ath10k_err(ar, "failed to find eboard file fw entry\n");

- return -EINVAL;

- }

fw = ath10k_fetch_fw_file(ar, ar->hw_params.fw.dir,

- ar->hw_params.fw.eboard);

+ ATH10K_EBOARD_DATA_FILE);

ar->normal_mode_fw.ext_board = fw;

if (IS_ERR(ar->normal_mode_fw.ext_board))

return PTR_ERR(ar->normal_mode_fw.ext_board);

@@ -3222,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:

@@ -3480,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:

@@ -3518,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

@@ -3596,7 +3630,7 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,

default:

ath10k_err(ar, "unsupported core hardware revision %d\n",

hw_rev);

- ret = -ENOTSUPP;

+ ret = -EOPNOTSUPP;

goto err_free_mac;

}

@@ -3656,11 +3690,13 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,

INIT_WORK(&ar->set_coverage_class_work,

ath10k_core_set_coverage_class_work);

- init_dummy_netdev(&ar->napi_dev);

+ ar->napi_dev = alloc_netdev_dummy(0);

+ if (!ar->napi_dev)

+ goto err_free_tx_complete;

ret = ath10k_coredump_create(ar);

if (ret)

- goto err_free_tx_complete;

+ goto err_free_netdev;

ret = ath10k_debug_create(ar);

if (ret)

@@ -3670,6 +3706,8 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,

err_free_coredump:

ath10k_coredump_destroy(ar);

+err_free_netdev:

+ free_netdev(ar->napi_dev);

err_free_tx_complete:

destroy_workqueue(ar->workqueue_tx_complete);

err_free_aux_wq:

@@ -3691,6 +3729,7 @@ void ath10k_core_destroy(struct ath10k *ar)

destroy_workqueue(ar->workqueue_tx_complete);

+ free_netdev(ar->napi_dev);

ath10k_debug_destroy(ar);

ath10k_coredump_destroy(ar);

ath10k_htt_tx_destroy(&ar->htt);

diff --git a/core.h b/core.h
index 4b5239de4018..446dca74f06a 100644
--- a/core.h
+++ b/core.h

@@ -3,6 +3,7 @@

#ifndef _CORE_H_

@@ -14,6 +15,7 @@

#include <linux/pci.h>

#include <linux/uuid.h>

#include <linux/time.h>

+#include <linux/leds.h>

#include "htt.h"

#include "htc.h"

@@ -607,7 +609,7 @@ struct ath10k_vif {

u8 tim_bitmap[64];

u8 tim_len;

u32 ssid_len;

- u8 ssid[IEEE80211_MAX_SSID_LEN];

+ u8 ssid[IEEE80211_MAX_SSID_LEN] __nonstring;

bool hidden_ssid;

/* P2P_IE with NoA attribute for P2P_GO case */

u32 noa_len;

@@ -1080,6 +1082,8 @@ struct ath10k {

const struct ath10k_fw_components *running_fw;

+ const char *board_name;

const struct firmware *pre_cal_file;

const struct firmware *cal_file;

@@ -1256,6 +1260,13 @@ struct ath10k {

} testmode;

struct {

+ struct gpio_led wifi_led;

+ struct led_classdev cdev;

+ char label[48];

+ u32 gpio_state_pin;

+ } leds;

+ struct {

/* protected by data_lock */

u32 rx_crc_err_drop;

u32 fw_crash_counter;

@@ -1268,7 +1279,7 @@ struct ath10k {

struct ath10k_per_peer_tx_stats peer_tx_stats;

/* NAPI */

- struct net_device napi_dev;

+ struct net_device *napi_dev;

struct napi_struct napi;

struct work_struct set_coverage_class_work;

diff --git a/coredump.c b/coredump.c
index 2d1634a890dd..bb3a276b7ed5 100644
--- a/coredump.c
+++ b/coredump.c

@@ -2,6 +2,7 @@

#include "coredump.h"

diff --git a/coredump.h b/coredump.h
index 437b9759f05d..8d274e0f374b 100644
--- a/coredump.h
+++ b/coredump.h

@@ -1,6 +1,7 @@

/* SPDX-License-Identifier: ISC */

#ifndef _COREDUMP_H_

@@ -12,7 +13,11 @@

/**

* enum ath10k_fw_crash_dump_type - types of data in the dump file

- * @ATH10K_FW_CRASH_DUMP_REGDUMP: Register crash dump in binary format

+ * @ATH10K_FW_CRASH_DUMP_REGISTERS: Register crash dump in binary format

+ * @ATH10K_FW_CRASH_DUMP_CE_DATA: Copy Engine crash dump data

+ * @ATH10K_FW_CRASH_DUMP_RAM_DATA: RAM crash dump data, contains multiple

+ * struct ath10k_dump_ram_data_hdr

+ * @ATH10K_FW_CRASH_DUMP_MAX: Maximum enumeration

enum ath10k_fw_crash_dump_type {

ATH10K_FW_CRASH_DUMP_REGISTERS = 0,

diff --git a/debug.c b/debug.c
index f9518e1c9903..35bfe7232e95 100644
--- a/debug.c
+++ b/debug.c

@@ -3,6 +3,7 @@

#include <linux/module.h>

@@ -1140,7 +1141,7 @@ void ath10k_debug_get_et_strings(struct ieee80211_hw *hw,

u32 sset, u8 *data)

{

if (sset == ETH_SS_STATS)

- memcpy(data, *ath10k_gstrings_stats,

+ memcpy(data, ath10k_gstrings_stats,

sizeof(ath10k_gstrings_stats));

}

@@ -1773,7 +1774,7 @@ static ssize_t ath10k_write_simulate_radar(struct file *file,

if (!arvif->is_started)

return -EINVAL;

- ieee80211_radar_detected(ar->hw);

+ ieee80211_radar_detected(ar->hw, NULL);

return count;

}

@@ -1964,20 +1965,13 @@ static ssize_t ath10k_write_btcoex(struct file *file,

size_t count, loff_t *ppos)

{

struct ath10k *ar = file->private_data;

- char buf[32];

- size_t buf_size;

- int ret;

+ ssize_t ret;

bool val;

u32 pdev_param;

- buf_size = min(count, (sizeof(buf) - 1));

- if (copy_from_user(buf, ubuf, buf_size))

- return -EFAULT;

- buf[buf_size] = '\0';

- if (kstrtobool(buf, &val) != 0)

- return -EINVAL;

+ ret = kstrtobool_from_user(ubuf, count, &val);

+ if (ret)

+ return ret;

if (!ar->coex_support)

return -EOPNOTSUPP;

@@ -2000,7 +1994,7 @@ static ssize_t ath10k_write_btcoex(struct file *file,

ar->running_fw->fw_file.fw_features)) {

ret = ath10k_wmi_pdev_set_param(ar, pdev_param, val);

if (ret) {

- ath10k_warn(ar, "failed to enable btcoex: %d\n", ret);

+ ath10k_warn(ar, "failed to enable btcoex: %zd\n", ret);

ret = count;

goto exit;

}

@@ -2103,19 +2097,12 @@ static ssize_t ath10k_write_peer_stats(struct file *file,

size_t count, loff_t *ppos)

{

struct ath10k *ar = file->private_data;

- char buf[32];

- size_t buf_size;

- int ret;

+ ssize_t ret;

bool val;

- buf_size = min(count, (sizeof(buf) - 1));

- if (copy_from_user(buf, ubuf, buf_size))

- return -EFAULT;

- buf[buf_size] = '\0';

- if (kstrtobool(buf, &val) != 0)

- return -EINVAL;

+ ret = kstrtobool_from_user(ubuf, count, &val);

+ if (ret)

+ return ret;

mutex_lock(&ar->conf_mutex);

@@ -2239,21 +2226,16 @@ static ssize_t ath10k_sta_tid_stats_mask_write(struct file *file,

size_t count, loff_t *ppos)

{

struct ath10k *ar = file->private_data;

- char buf[32];

- ssize_t len;

+ ssize_t ret;

u32 mask;

- len = min(count, sizeof(buf) - 1);

- if (copy_from_user(buf, user_buf, len))

- return -EFAULT;

- buf[len] = '\0';

- if (kstrtoint(buf, 0, &mask))

- return -EINVAL;

+ ret = kstrtoint_from_user(user_buf, count, 0, &mask);

+ if (ret)

+ return ret;

ar->sta_tid_stats_mask = mask;

- return len;

+ return count;

}

static const struct file_operations fops_sta_tid_stats_mask = {

diff --git a/debugfs_sta.c b/debugfs_sta.c
index 87a3365330ff..0f6de862c3a9 100644
--- a/debugfs_sta.c
+++ b/debugfs_sta.c

@@ -2,6 +2,7 @@

#include "core.h"

@@ -438,7 +439,7 @@ ath10k_dbg_sta_write_peer_debug_trigger(struct file *file,

}

out:

mutex_unlock(&ar->conf_mutex);

- return count;

+ return ret ?: count;

}

static const struct file_operations fops_peer_debug_trigger = {

diff --git a/htc.c b/htc.c
index 5bfeecb95fca..a6e21ce90bad 100644
--- a/htc.c
+++ b/htc.c

@@ -2,6 +2,7 @@

#include "core.h"

diff --git a/htc.h b/htc.h
index 0d180faf3b77..7ff665020015 100644
--- a/htc.h
+++ b/htc.h

@@ -246,26 +246,12 @@ struct ath10k_htc_lookahead_bundle {

struct ath10k_htc_record {

struct ath10k_ath10k_htc_record_hdr hdr;

union {

- struct ath10k_htc_credit_report credit_report[0];

- struct ath10k_htc_lookahead_report lookahead_report[0];

- struct ath10k_htc_lookahead_bundle lookahead_bundle[0];

- u8 pauload[0];

+ DECLARE_FLEX_ARRAY(struct ath10k_htc_credit_report, credit_report);

+ DECLARE_FLEX_ARRAY(struct ath10k_htc_lookahead_report, lookahead_report);

+ DECLARE_FLEX_ARRAY(struct ath10k_htc_lookahead_bundle, lookahead_bundle);

};

} __packed __aligned(4);

-/*

- * note: the trailer offset is dynamic depending

- * on payload length. this is only a struct layout draft

- */

-struct ath10k_htc_frame {

- struct ath10k_htc_hdr hdr;

- union {

- struct ath10k_htc_msg msg;

- u8 payload[0];

- };

- struct ath10k_htc_record trailer[0];

-} __packed __aligned(4);

/*******************/

/* Host-side stuff */

/*******************/

diff --git a/htt.c b/htt.c
index 907e1e13871a..dbaf262cd7c1 100644
--- a/htt.c
+++ b/htt.c

@@ -2,6 +2,7 @@

#include <linux/slab.h>

@@ -381,7 +382,7 @@ static int ath10k_htt_verify_version(struct ath10k_htt *htt)

htt->target_version_major != 3) {

ath10k_err(ar, "unsupported htt major version %d. supported versions are 2 and 3\n",

htt->target_version_major);

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

}

return 0;

diff --git a/htt.h b/htt.h
index e0c9f45e7476..603f6de62b0a 100644
--- a/htt.h
+++ b/htt.h

@@ -3,6 +3,7 @@

#ifndef _HTT_H_

@@ -69,7 +70,7 @@ struct htt_ver_req {

* The HTT tx descriptor is defined in two manners: by a struct with

* bitfields, and by a series of [dword offset, bit mask, bit shift]

* definitions.

- * The target should use the struct def, for simplicitly and clarity,

+ * The target should use the struct def, for simplicity and clarity,

* but the host shall use the bit-mast + bit-shift defs, to be endian-

* neutral. Specifically, the host shall use the get/set macros built

* around the mask + shift defs.

@@ -880,8 +881,7 @@ enum htt_data_tx_status {

HTT_DATA_TX_STATUS_OK = 0,

HTT_DATA_TX_STATUS_DISCARD = 1,

HTT_DATA_TX_STATUS_NO_ACK = 2,

- HTT_DATA_TX_STATUS_POSTPONE = 3, /* HL only */

- HTT_DATA_TX_STATUS_DOWNLOAD_FAIL = 128

+ HTT_DATA_TX_STATUS_POSTPONE = 3 /* HL only */

};

enum htt_data_tx_flags {

@@ -906,7 +906,7 @@ struct htt_data_tx_completion_ext {

__le16 msdus_rssi[];

} __packed;

-/**

+/*

* @brief target -> host TX completion indication message definition

* @details

@@ -1474,15 +1474,19 @@ enum htt_q_depth_type {

#define HTT_TX_Q_STATE_ENTRY_MULTIPLIER 0

/**

- * htt_q_state_conf - part of htt_frag_desc_bank_cfg for host q state config

+ * struct htt_q_state_conf - part of htt_frag_desc_bank_cfg for host q state config

* Defines host q state format and behavior. See htt_q_state.

+ * @paddr: Queue physical address

+ * @num_peers: Number of supported peers

+ * @num_tids: Number of supported TIDs

* @record_size: Defines the size of each host q entry in bytes. In practice

* however firmware (at least 10.4.3-00191) ignores this host

* configuration value and uses hardcoded value of 1.

* @record_multiplier: This is valid only when q depth type is MSDUs. It

* defines the exponent for the power of 2 multiplication.

+ * @pad: struct padding for 32-bit alignment

struct htt_q_state_conf {

__le32 paddr;

@@ -1518,7 +1522,7 @@ struct htt_frag_desc_bank_cfg64 {

#define HTT_TX_Q_STATE_ENTRY_EXP_LSB 6

/**

- * htt_q_state - shared between host and firmware via DMA

+ * struct htt_q_state - shared between host and firmware via DMA

* This structure is used for the host to expose it's software queue state to

* firmware so that its rate control can schedule fetch requests for optimized

@@ -2086,7 +2090,7 @@ static inline bool ath10k_htt_rx_proc_rx_frag_ind(struct ath10k_htt *htt,

* for correctly accessing rx descriptor data.

-/* base struct used for abstracting the rx descritor representation */

+/* base struct used for abstracting the rx descriptor representation */

struct htt_rx_desc {

union {

/* This field is filled on the host using the msdu buffer

diff --git a/htt_rx.c b/htt_rx.c
index 438b0caaceb7..7d28ae5453cf 100644
--- a/htt_rx.c
+++ b/htt_rx.c

@@ -3,6 +3,7 @@

#include "core.h"

@@ -1294,7 +1295,7 @@ static void ath10k_htt_rx_h_ppdu(struct ath10k *ar,

status->encoding = RX_ENC_LEGACY;

status->bw = RATE_INFO_BW_20;

- status->flag &= ~RX_FLAG_MACTIME_END;

+ status->flag &= ~RX_FLAG_MACTIME;

status->flag |= RX_FLAG_NO_SIGNAL_VAL;

status->flag &= ~(RX_FLAG_AMPDU_IS_LAST);

@@ -2964,7 +2965,6 @@ static void ath10k_htt_rx_tx_compl_ind(struct ath10k *ar,

break;

case HTT_DATA_TX_STATUS_DISCARD:

case HTT_DATA_TX_STATUS_POSTPONE:

- case HTT_DATA_TX_STATUS_DOWNLOAD_FAIL:

tx_done.status = HTT_TX_COMPL_STATE_DISCARD;

break;

default:

diff --git a/htt_tx.c b/htt_tx.c
index bd603feb7953..9725feecefd6 100644
--- a/htt_tx.c
+++ b/htt_tx.c

@@ -2,6 +2,7 @@

#include <linux/etherdevice.h>

@@ -40,7 +41,6 @@ static void __ath10k_htt_tx_txq_recalc(struct ieee80211_hw *hw,

struct ath10k *ar = hw->priv;

struct ath10k_sta *arsta;

struct ath10k_vif *arvif = (void *)txq->vif->drv_priv;

- unsigned long frame_cnt;

unsigned long byte_cnt;

int idx;

u32 bit;

@@ -67,7 +67,7 @@ static void __ath10k_htt_tx_txq_recalc(struct ieee80211_hw *hw,

bit = BIT(peer_id % 32);

idx = peer_id / 32;

- ieee80211_txq_get_depth(txq, &frame_cnt, &byte_cnt);

+ ieee80211_txq_get_depth(txq, NULL, &byte_cnt);

count = ath10k_htt_tx_txq_calc_size(byte_cnt);

if (unlikely(peer_id >= ar->htt.tx_q_state.num_peers) ||

@@ -796,20 +796,16 @@ static int ath10k_htt_send_frag_desc_bank_cfg_64(struct ath10k_htt *htt)

return 0;

}

-static void ath10k_htt_fill_rx_desc_offset_32(struct ath10k_hw_params *hw, void *rx_ring)

+static void ath10k_htt_fill_rx_desc_offset_32(struct ath10k_hw_params *hw,

+ struct htt_rx_ring_setup_ring32 *rx_ring)

{

- struct htt_rx_ring_setup_ring32 *ring =

- (struct htt_rx_ring_setup_ring32 *)rx_ring;

- ath10k_htt_rx_desc_get_offsets(hw, &ring->offsets);

+ ath10k_htt_rx_desc_get_offsets(hw, &rx_ring->offsets);

}

-static void ath10k_htt_fill_rx_desc_offset_64(struct ath10k_hw_params *hw, void *rx_ring)

+static void ath10k_htt_fill_rx_desc_offset_64(struct ath10k_hw_params *hw,

+ struct htt_rx_ring_setup_ring64 *rx_ring)

{

- struct htt_rx_ring_setup_ring64 *ring =

- (struct htt_rx_ring_setup_ring64 *)rx_ring;

- ath10k_htt_rx_desc_get_offsets(hw, &ring->offsets);

+ ath10k_htt_rx_desc_get_offsets(hw, &rx_ring->offsets);

}

static int ath10k_htt_send_rx_ring_cfg_32(struct ath10k_htt *htt)

diff --git a/hw.c b/hw.c
index 6d32b43a4da6..8fafe096adff 100644
--- a/hw.c
+++ b/hw.c

@@ -1,6 +1,7 @@

// SPDX-License-Identifier: ISC

#include <linux/types.h>

diff --git a/hw.h b/hw.h
index 9643031a4427..442091c6dfd2 100644
--- a/hw.h
+++ b/hw.h

@@ -3,6 +3,7 @@

#ifndef _HW_H_

@@ -38,14 +39,12 @@ enum ath10k_bus {

#define QCA988X_HW_2_0_VERSION 0x4100016c

#define QCA988X_HW_2_0_CHIP_ID_REV 0x2

#define QCA988X_HW_2_0_FW_DIR ATH10K_FW_DIR "/QCA988X/hw2.0"

-#define QCA988X_HW_2_0_BOARD_DATA_FILE "board.bin"

#define QCA988X_HW_2_0_PATCH_LOAD_ADDR 0x1234

/* QCA9887 1.0 definitions */

#define QCA9887_HW_1_0_VERSION 0x4100016d

#define QCA9887_HW_1_0_CHIP_ID_REV 0

#define QCA9887_HW_1_0_FW_DIR ATH10K_FW_DIR "/QCA9887/hw1.0"

-#define QCA9887_HW_1_0_BOARD_DATA_FILE "board.bin"

#define QCA9887_HW_1_0_PATCH_LOAD_ADDR 0x1234

/* QCA6174 target BMI version signatures */

@@ -84,11 +83,9 @@ enum qca9377_chip_id_rev {

};

#define QCA6174_HW_2_1_FW_DIR ATH10K_FW_DIR "/QCA6174/hw2.1"

-#define QCA6174_HW_2_1_BOARD_DATA_FILE "board.bin"

#define QCA6174_HW_2_1_PATCH_LOAD_ADDR 0x1234

#define QCA6174_HW_3_0_FW_DIR ATH10K_FW_DIR "/QCA6174/hw3.0"

-#define QCA6174_HW_3_0_BOARD_DATA_FILE "board.bin"

#define QCA6174_HW_3_0_PATCH_LOAD_ADDR 0x1234

/* QCA99X0 1.0 definitions (unsupported) */

@@ -98,7 +95,6 @@ enum qca9377_chip_id_rev {

#define QCA99X0_HW_2_0_DEV_VERSION 0x01000000

#define QCA99X0_HW_2_0_CHIP_ID_REV 0x1

#define QCA99X0_HW_2_0_FW_DIR ATH10K_FW_DIR "/QCA99X0/hw2.0"

-#define QCA99X0_HW_2_0_BOARD_DATA_FILE "board.bin"

#define QCA99X0_HW_2_0_PATCH_LOAD_ADDR 0x1234

/* QCA9984 1.0 defines */

@@ -106,8 +102,6 @@ enum qca9377_chip_id_rev {

#define QCA9984_HW_DEV_TYPE 0xa

#define QCA9984_HW_1_0_CHIP_ID_REV 0x0

#define QCA9984_HW_1_0_FW_DIR ATH10K_FW_DIR "/QCA9984/hw1.0"

-#define QCA9984_HW_1_0_BOARD_DATA_FILE "board.bin"

-#define QCA9984_HW_1_0_EBOARD_DATA_FILE "eboard.bin"

#define QCA9984_HW_1_0_PATCH_LOAD_ADDR 0x1234

/* QCA9888 2.0 defines */

@@ -115,18 +109,15 @@ enum qca9377_chip_id_rev {

#define QCA9888_HW_DEV_TYPE 0xc

#define QCA9888_HW_2_0_CHIP_ID_REV 0x0

#define QCA9888_HW_2_0_FW_DIR ATH10K_FW_DIR "/QCA9888/hw2.0"

-#define QCA9888_HW_2_0_BOARD_DATA_FILE "board.bin"

#define QCA9888_HW_2_0_PATCH_LOAD_ADDR 0x1234

/* QCA9377 1.0 definitions */

#define QCA9377_HW_1_0_FW_DIR ATH10K_FW_DIR "/QCA9377/hw1.0"

-#define QCA9377_HW_1_0_BOARD_DATA_FILE "board.bin"

#define QCA9377_HW_1_0_PATCH_LOAD_ADDR 0x1234

/* QCA4019 1.0 definitions */

#define QCA4019_HW_1_0_DEV_VERSION 0x01000000

#define QCA4019_HW_1_0_FW_DIR ATH10K_FW_DIR "/QCA4019/hw1.0"

-#define QCA4019_HW_1_0_BOARD_DATA_FILE "board.bin"

#define QCA4019_HW_1_0_PATCH_LOAD_ADDR 0x1234

/* WCN3990 1.0 definitions */

@@ -158,7 +149,9 @@ enum qca9377_chip_id_rev {

#define ATH10K_FIRMWARE_MAGIC "QCA-ATH10K"

#define ATH10K_BOARD_MAGIC "QCA-ATH10K-BOARD"

+#define ATH10K_BOARD_DATA_FILE "board.bin"

#define ATH10K_BOARD_API2_FILE "board-2.bin"

+#define ATH10K_EBOARD_DATA_FILE "eboard.bin"

#define REG_DUMP_COUNT_QCA988X 60

@@ -519,6 +512,7 @@ struct ath10k_hw_params {

const char *name;

u32 patch_load_addr;

int uart_pin;

+ int led_pin;

u32 otp_exe_param;

/* Type of hw cycle counter wraparound logic, for more info

@@ -552,9 +546,7 @@ struct ath10k_hw_params {

struct ath10k_hw_params_fw {

const char *dir;

- const char *board;

size_t board_size;

- const char *eboard;

size_t ext_board_size;

size_t board_ext_size;

} fw;

@@ -639,6 +631,9 @@ struct ath10k_hw_params {

bool use_fw_tx_credits;

bool delay_unmap_buffer;

+ /* The hardware support multicast frame registrations */

+ bool mcast_frame_registration;

};

struct htt_resp;

diff --git a/leds.c b/leds.c
new file mode 100644
index 000000000000..9b1d04eb4265
--- /dev/null
+++ b/leds.c

@@ -0,0 +1,90 @@

+// SPDX-License-Identifier: ISC

+/*

+ */

+#include <linux/leds.h>

+#include "core.h"

+#include "wmi.h"

+#include "wmi-ops.h"

+#include "leds.h"

+static int ath10k_leds_set_brightness_blocking(struct led_classdev *led_cdev,

+ enum led_brightness brightness)

+ struct ath10k *ar = container_of(led_cdev, struct ath10k,

+ leds.cdev);

+ struct gpio_led *led = &ar->leds.wifi_led;

+ mutex_lock(&ar->conf_mutex);

+ if (ar->state != ATH10K_STATE_ON)

+ goto out;

+ ar->leds.gpio_state_pin = (brightness != LED_OFF) ^ led->active_low;

+ ath10k_wmi_gpio_output(ar, led->gpio, ar->leds.gpio_state_pin);

+out:

+ mutex_unlock(&ar->conf_mutex);

+ return 0;

+int ath10k_leds_start(struct ath10k *ar)

+ if (ar->hw_params.led_pin == 0)

+ /* leds not supported */

+ return 0;

+ /* under some circumstances, the gpio pin gets reconfigured

+ * to default state by the firmware, so we need to

+ * reconfigure it this behaviour has only ben seen on

+ * QCA9984 and QCA99XX devices so far

+ */

+ ath10k_wmi_gpio_config(ar, ar->hw_params.led_pin, 0,

+ WMI_GPIO_PULL_NONE, WMI_GPIO_INTTYPE_DISABLE);

+ ath10k_wmi_gpio_output(ar, ar->hw_params.led_pin, 1);

+ return 0;

+int ath10k_leds_register(struct ath10k *ar)

+ int ret;

+ if (ar->hw_params.led_pin == 0)

+ /* leds not supported */

+ return 0;

+ snprintf(ar->leds.label, sizeof(ar->leds.label), "ath10k-%s",

+ wiphy_name(ar->hw->wiphy));

+ ar->leds.wifi_led.active_low = 1;

+ ar->leds.wifi_led.gpio = ar->hw_params.led_pin;

+ ar->leds.wifi_led.name = ar->leds.label;

+ ar->leds.wifi_led.default_state = LEDS_GPIO_DEFSTATE_KEEP;

+ ar->leds.cdev.name = ar->leds.label;

+ ar->leds.cdev.brightness_set_blocking = ath10k_leds_set_brightness_blocking;

+ ar->leds.cdev.default_trigger = ar->leds.wifi_led.default_trigger;

+ ret = led_classdev_register(wiphy_dev(ar->hw->wiphy), &ar->leds.cdev);

+ if (ret)

+ return ret;

+ return 0;

+void ath10k_leds_unregister(struct ath10k *ar)

+ if (ar->hw_params.led_pin == 0)

+ /* leds not supported */

+ return;

+ led_classdev_unregister(&ar->leds.cdev);

diff --git a/leds.h b/leds.h
new file mode 100644
index 000000000000..56325b0875e5
--- /dev/null
+++ b/leds.h

@@ -0,0 +1,34 @@

+/* SPDX-License-Identifier: ISC */

+/*

+ */

+#ifndef _LEDS_H_

+#define _LEDS_H_

+#include "core.h"

+#ifdef CONFIG_ATH10K_LEDS

+void ath10k_leds_unregister(struct ath10k *ar);

+int ath10k_leds_start(struct ath10k *ar);

+int ath10k_leds_register(struct ath10k *ar);

+#else

+static inline void ath10k_leds_unregister(struct ath10k *ar)

+static inline int ath10k_leds_start(struct ath10k *ar)

+ return 0;

+static inline int ath10k_leds_register(struct ath10k *ar)

+ return 0;

+#endif

+#endif /* _LEDS_H_ */

diff --git a/mac.c b/mac.c
index 03e7bc5b6c0b..c61b95a928da 100644
--- a/mac.c
+++ b/mac.c

@@ -3,6 +3,7 @@

#include "mac.h"

@@ -24,6 +25,7 @@

#include "wmi-tlv.h"

#include "wmi-ops.h"

#include "wow.h"

+#include "leds.h"

/*********/

/* Rates */

@@ -728,20 +730,13 @@ static int ath10k_peer_create(struct ath10k *ar,

const u8 *addr,

enum wmi_peer_type peer_type)

{

- struct ath10k_vif *arvif;

struct ath10k_peer *peer;

- int num_peers = 0;

int ret;

lockdep_assert_held(&ar->conf_mutex);

- num_peers = ar->num_peers;

- /* Each vdev consumes a peer entry as well */

- list_for_each_entry(arvif, &ar->arvifs, list)

- num_peers++;

- if (num_peers >= ar->max_num_peers)

+ /* Each vdev consumes a peer entry as well. */

+ if (ar->num_peers + list_count_nodes(&ar->arvifs) >= ar->max_num_peers)

return -ENOBUFS;

ret = ath10k_wmi_peer_create(ar, vdev_id, addr, peer_type);

@@ -1249,7 +1244,7 @@ static bool ath10k_mac_monitor_vdev_is_needed(struct ath10k *ar)

return ar->monitor ||

(!test_bit(ATH10K_FW_FEATURE_ALLOWS_MESH_BCAST,

ar->running_fw->fw_file.fw_features) &&

- (ar->filter_flags & FIF_OTHER_BSS)) ||

+ (ar->filter_flags & (FIF_OTHER_BSS | FIF_MCAST_ACTION))) ||

test_bit(ATH10K_CAC_RUNNING, &ar->dev_flags);

}

@@ -1442,7 +1437,7 @@ static void ath10k_recalc_radar_detection(struct ath10k *ar)

* by indicating that radar was detected.

ath10k_warn(ar, "failed to start CAC: %d\n", ret);

- ieee80211_radar_detected(ar->hw);

+ ieee80211_radar_detected(ar->hw, NULL);

}

@@ -2040,8 +2035,8 @@ static void ath10k_mac_vif_ap_csa_count_down(struct ath10k_vif *arvif)

if (!arvif->is_up)

return;

- if (!ieee80211_beacon_cntdwn_is_complete(vif)) {

- ieee80211_beacon_update_cntdwn(vif);

+ if (!ieee80211_beacon_cntdwn_is_complete(vif, 0)) {

+ ieee80211_beacon_update_cntdwn(vif, 0);

ret = ath10k_mac_setup_bcn_tmpl(arvif);

if (ret)

@@ -2053,7 +2048,7 @@ static void ath10k_mac_vif_ap_csa_count_down(struct ath10k_vif *arvif)

ath10k_warn(ar, "failed to update prb tmpl during csa: %d\n",

ret);

} else {

- ieee80211_csa_finish(vif);

+ ieee80211_csa_finish(vif, 0);

}

@@ -4062,7 +4057,7 @@ static int ath10k_mac_tx(struct ath10k *ar,

!(skb_cb->flags & ATH10K_SKB_F_RAW_TX)) {

WARN_ON_ONCE(1);

ieee80211_free_txskb(hw, skb);

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

}

@@ -4503,18 +4498,21 @@ void __ath10k_scan_finish(struct ath10k *ar)

break;

case ATH10K_SCAN_RUNNING:

case ATH10K_SCAN_ABORTING:

+ if (ar->scan.is_roc && ar->scan.roc_notify)

+ ieee80211_remain_on_channel_expired(ar->hw);

+ fallthrough;

+ case ATH10K_SCAN_STARTING:

if (!ar->scan.is_roc) {

struct cfg80211_scan_info info = {

- .aborted = (ar->scan.state ==

- ATH10K_SCAN_ABORTING),

+ .aborted = ((ar->scan.state ==

+ ATH10K_SCAN_ABORTING) ||

+ (ar->scan.state ==

+ ATH10K_SCAN_STARTING)),

};

ieee80211_scan_completed(ar->hw, &info);

- } else if (ar->scan.roc_notify) {

- ieee80211_remain_on_channel_expired(ar->hw);

}

- fallthrough;

- case ATH10K_SCAN_STARTING:

ar->scan.state = ATH10K_SCAN_IDLE;

ar->scan_channel = NULL;

ar->scan.roc_freq = 0;

@@ -5365,7 +5363,7 @@ err:

return ret;

}

-static void ath10k_stop(struct ieee80211_hw *hw)

+static void ath10k_stop(struct ieee80211_hw *hw, bool suspend)

{

struct ath10k *ar = hw->priv;

u32 opt;

@@ -6029,10 +6027,15 @@ static void ath10k_configure_filter(struct ieee80211_hw *hw,

{

struct ath10k *ar = hw->priv;

int ret;

+ unsigned int supported = SUPPORTED_FILTERS;

mutex_lock(&ar->conf_mutex);

- *total_flags &= SUPPORTED_FILTERS;

+ if (ar->hw_params.mcast_frame_registration)

+ supported |= FIF_MCAST_ACTION;

+ *total_flags &= supported;

ar->filter_flags = *total_flags;

ret = ath10k_monitor_recalc(ar);

@@ -6125,9 +6128,8 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,

if (ieee80211_vif_is_mesh(vif)) {

/* mesh doesn't use SSID but firmware needs it */

- strncpy(arvif->u.ap.ssid, "mesh",

- sizeof(arvif->u.ap.ssid));

arvif->u.ap.ssid_len = 4;

+ memcpy(arvif->u.ap.ssid, "mesh", arvif->u.ap.ssid_len);

}

@@ -6367,7 +6369,7 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw,

struct ath10k *ar = hw->priv;

struct ath10k_vif *arvif = (void *)vif->drv_priv;

struct cfg80211_scan_request *req = &hw_req->req;

- struct wmi_start_scan_arg arg;

+ struct wmi_start_scan_arg *arg = NULL;

int ret = 0;

int i;

u32 scan_timeout;

@@ -6400,56 +6402,61 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw,

if (ret)

goto exit;

- memset(&arg, 0, sizeof(arg));

- ath10k_wmi_start_scan_init(ar, &arg);

- arg.vdev_id = arvif->vdev_id;

- arg.scan_id = ATH10K_SCAN_ID;

+ arg = kzalloc(sizeof(*arg), GFP_KERNEL);

+ if (!arg) {

+ ret = -ENOMEM;

+ goto exit;

+ }

+ ath10k_wmi_start_scan_init(ar, arg);

+ arg->vdev_id = arvif->vdev_id;

+ arg->scan_id = ATH10K_SCAN_ID;

if (req->ie_len) {

- arg.ie_len = req->ie_len;

- memcpy(arg.ie, req->ie, arg.ie_len);

+ arg->ie_len = req->ie_len;

+ memcpy(arg->ie, req->ie, arg->ie_len);

}

if (req->n_ssids) {

- arg.n_ssids = req->n_ssids;

- for (i = 0; i < arg.n_ssids; i++) {

- arg.ssids[i].len = req->ssids[i].ssid_len;

- arg.ssids[i].ssid = req->ssids[i].ssid;

+ arg->n_ssids = req->n_ssids;

+ for (i = 0; i < arg->n_ssids; i++) {

+ arg->ssids[i].len = req->ssids[i].ssid_len;

+ arg->ssids[i].ssid = req->ssids[i].ssid;

}

} else {

- arg.scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE;

+ arg->scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE;

}

if (req->flags & NL80211_SCAN_FLAG_RANDOM_ADDR) {

- arg.scan_ctrl_flags |= WMI_SCAN_ADD_SPOOFED_MAC_IN_PROBE_REQ;

- ether_addr_copy(arg.mac_addr.addr, req->mac_addr);

- ether_addr_copy(arg.mac_mask.addr, req->mac_addr_mask);

+ arg->scan_ctrl_flags |= WMI_SCAN_ADD_SPOOFED_MAC_IN_PROBE_REQ;

+ ether_addr_copy(arg->mac_addr.addr, req->mac_addr);

+ ether_addr_copy(arg->mac_mask.addr, req->mac_addr_mask);

}

if (req->n_channels) {

- arg.n_channels = req->n_channels;

- for (i = 0; i < arg.n_channels; i++)

- arg.channels[i] = req->channels[i]->center_freq;

+ arg->n_channels = req->n_channels;

+ for (i = 0; i < arg->n_channels; i++)

+ arg->channels[i] = req->channels[i]->center_freq;

}

/* if duration is set, default dwell times will be overwritten */

if (req->duration) {

- arg.dwell_time_active = req->duration;

- arg.dwell_time_passive = req->duration;

- arg.burst_duration_ms = req->duration;

+ arg->dwell_time_active = req->duration;

+ arg->dwell_time_passive = req->duration;

+ arg->burst_duration_ms = req->duration;

- scan_timeout = min_t(u32, arg.max_rest_time *

- (arg.n_channels - 1) + (req->duration +

+ scan_timeout = min_t(u32, arg->max_rest_time *

+ (arg->n_channels - 1) + (req->duration +

ATH10K_SCAN_CHANNEL_SWITCH_WMI_EVT_OVERHEAD) *

- arg.n_channels, arg.max_scan_time);

+ arg->n_channels, arg->max_scan_time);

} else {

- scan_timeout = arg.max_scan_time;

+ scan_timeout = arg->max_scan_time;

}

/* Add a 200ms margin to account for event/command processing */

scan_timeout += 200;

- ret = ath10k_start_scan(ar, &arg);

+ ret = ath10k_start_scan(ar, arg);

if (ret) {

ath10k_warn(ar, "failed to start hw scan: %d\n", ret);

spin_lock_bh(&ar->data_lock);

@@ -6461,6 +6468,8 @@ static int ath10k_hw_scan(struct ieee80211_hw *hw,

msecs_to_jiffies(scan_timeout));

exit:

+ kfree(arg);

mutex_unlock(&ar->conf_mutex);

return ret;

}

@@ -7064,7 +7073,7 @@ static int ath10k_mac_set_tid_config(struct ath10k *ar, struct ieee80211_sta *st

if (sta) {

if (!sta->wme)

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

arsta = (struct ath10k_sta *)sta->drv_priv;

@@ -7897,7 +7906,7 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw,

{

struct ath10k *ar = hw->priv;

struct ath10k_vif *arvif = (void *)vif->drv_priv;

- struct wmi_start_scan_arg arg;

+ struct wmi_start_scan_arg *arg = NULL;

int ret = 0;

u32 scan_time_msec;

@@ -7934,20 +7943,25 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw,

scan_time_msec = ar->hw->wiphy->max_remain_on_channel_duration * 2;

- memset(&arg, 0, sizeof(arg));

- ath10k_wmi_start_scan_init(ar, &arg);

- arg.vdev_id = arvif->vdev_id;

- arg.scan_id = ATH10K_SCAN_ID;

- arg.n_channels = 1;

- arg.channels[0] = chan->center_freq;

- arg.dwell_time_active = scan_time_msec;

- arg.dwell_time_passive = scan_time_msec;

- arg.max_scan_time = scan_time_msec;

- arg.scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE;

- arg.scan_ctrl_flags |= WMI_SCAN_FILTER_PROBE_REQ;

- arg.burst_duration_ms = duration;

- ret = ath10k_start_scan(ar, &arg);

+ arg = kzalloc(sizeof(*arg), GFP_KERNEL);

+ if (!arg) {

+ ret = -ENOMEM;

+ goto exit;

+ }

+ ath10k_wmi_start_scan_init(ar, arg);

+ arg->vdev_id = arvif->vdev_id;

+ arg->scan_id = ATH10K_SCAN_ID;

+ arg->n_channels = 1;

+ arg->channels[0] = chan->center_freq;

+ arg->dwell_time_active = scan_time_msec;

+ arg->dwell_time_passive = scan_time_msec;

+ arg->max_scan_time = scan_time_msec;

+ arg->scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE;

+ arg->scan_ctrl_flags |= WMI_SCAN_FILTER_PROBE_REQ;

+ arg->burst_duration_ms = duration;

+ ret = ath10k_start_scan(ar, arg);

if (ret) {

ath10k_warn(ar, "failed to start roc scan: %d\n", ret);

spin_lock_bh(&ar->data_lock);

@@ -7973,6 +7987,8 @@ static int ath10k_remain_on_channel(struct ieee80211_hw *hw,

ret = 0;

exit:

+ kfree(arg);

mutex_unlock(&ar->conf_mutex);

return ret;

}

@@ -8505,9 +8521,10 @@ exit:

static void ath10k_sta_rc_update(struct ieee80211_hw *hw,

struct ieee80211_vif *vif,

- struct ieee80211_sta *sta,

+ struct ieee80211_link_sta *link_sta,

u32 changed)

{

+ struct ieee80211_sta *sta = link_sta->sta;

struct ath10k *ar = hw->priv;

struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv;

struct ath10k_vif *arvif = (void *)vif->drv_priv;

@@ -9119,7 +9136,7 @@ static const struct ath10k_index_vht_data_rate_type supported_vht_mcs_rate_nss1[

{6, {2633, 2925}, {1215, 1350}, {585, 650} },

{7, {2925, 3250}, {1350, 1500}, {650, 722} },

{8, {3510, 3900}, {1620, 1800}, {780, 867} },

- {9, {3900, 4333}, {1800, 2000}, {780, 867} }

+ {9, {3900, 4333}, {1800, 2000}, {865, 960} }

};

/*MCS parameters with Nss = 2 */

@@ -9134,7 +9151,7 @@ static const struct ath10k_index_vht_data_rate_type supported_vht_mcs_rate_nss2[

{6, {5265, 5850}, {2430, 2700}, {1170, 1300} },

{7, {5850, 6500}, {2700, 3000}, {1300, 1444} },

{8, {7020, 7800}, {3240, 3600}, {1560, 1733} },

- {9, {7800, 8667}, {3600, 4000}, {1560, 1733} }

+ {9, {7800, 8667}, {3600, 4000}, {1730, 1920} }

};

static void ath10k_mac_get_rate_flags_ht(struct ath10k *ar, u32 rate, u8 nss, u8 mcs,

@@ -9448,7 +9465,7 @@ static const struct ieee80211_ops ath10k_ops = {

.reconfig_complete = ath10k_reconfig_complete,

.get_survey = ath10k_get_survey,

.set_bitrate_mask = ath10k_mac_op_set_bitrate_mask,

- .sta_rc_update = ath10k_sta_rc_update,

+ .link_sta_rc_update = ath10k_sta_rc_update,

.offset_tsf = ath10k_offset_tsf,

.ampdu_action = ath10k_ampdu_action,

.get_et_sset_count = ath10k_debug_get_et_sset_count,

@@ -10122,6 +10139,10 @@ int ath10k_mac_register(struct ath10k *ar)

NL80211_EXT_FEATURE_SET_SCAN_DWELL);

wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_AQL);

+ if (ar->hw_params.mcast_frame_registration)

+ wiphy_ext_feature_set(ar->hw->wiphy,

+ NL80211_EXT_FEATURE_MULTICAST_REGISTRATIONS);

if (test_bit(WMI_SERVICE_TX_DATA_ACK_RSSI, ar->wmi.svc_map) ||

test_bit(WMI_SERVICE_HTT_MGMT_TX_COMP_VALID_FLAGS, ar->wmi.svc_map))

wiphy_ext_feature_set(ar->hw->wiphy,

diff --git a/pci.c b/pci.c
index a7f44f6335fb..c52a16f8078f 100644
--- a/pci.c
+++ b/pci.c

@@ -2,6 +2,7 @@

#include <linux/pci.h>

@@ -720,7 +721,7 @@ bool ath10k_pci_irq_pending(struct ath10k *ar)

return false;

}

-void ath10k_pci_disable_and_clear_legacy_irq(struct ath10k *ar)

+void ath10k_pci_disable_and_clear_intx_irq(struct ath10k *ar)

{

/* IMPORTANT: INTR_CLR register has to be set after

* INTR_ENABLE is set to 0, otherwise interrupt can not be

@@ -738,7 +739,7 @@ void ath10k_pci_disable_and_clear_legacy_irq(struct ath10k *ar)

PCIE_INTR_ENABLE_ADDRESS);

}

-void ath10k_pci_enable_legacy_irq(struct ath10k *ar)

+void ath10k_pci_enable_intx_irq(struct ath10k *ar)

{

ath10k_pci_write32(ar, SOC_CORE_BASE_ADDRESS +

PCIE_INTR_ENABLE_ADDRESS,

@@ -888,7 +889,7 @@ static u32 ath10k_pci_targ_cpu_to_ce_addr(struct ath10k *ar, u32 addr)

struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

if (WARN_ON_ONCE(!ar_pci->targ_cpu_to_ce_addr))

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

return ar_pci->targ_cpu_to_ce_addr(ar, addr);

}

@@ -1636,7 +1637,7 @@ static int ath10k_pci_dump_memory_generic(struct ath10k *ar,

buf,

current_region->len);

- /* No individiual memory sections defined so we can

+ /* No individual memory sections defined so we can

* copy the entire memory region.

ret = ath10k_pci_diag_read_mem(ar,

@@ -1934,7 +1935,7 @@ static void ath10k_pci_irq_msi_fw_unmask(struct ath10k *ar)

static void ath10k_pci_irq_disable(struct ath10k *ar)

{

ath10k_ce_disable_interrupts(ar);

- ath10k_pci_disable_and_clear_legacy_irq(ar);

+ ath10k_pci_disable_and_clear_intx_irq(ar);

ath10k_pci_irq_msi_fw_mask(ar);

}

@@ -1948,7 +1949,7 @@ static void ath10k_pci_irq_sync(struct ath10k *ar)

static void ath10k_pci_irq_enable(struct ath10k *ar)

{

ath10k_ce_enable_interrupts(ar);

- ath10k_pci_enable_legacy_irq(ar);

+ ath10k_pci_enable_intx_irq(ar);

ath10k_pci_irq_msi_fw_unmask(ar);

}

@@ -1963,8 +1964,9 @@ static int ath10k_pci_hif_start(struct ath10k *ar)

ath10k_pci_irq_enable(ar);

ath10k_pci_rx_post(ar);

- pcie_capability_write_word(ar_pci->pdev, PCI_EXP_LNKCTL,

- ar_pci->link_ctl);

+ pcie_capability_clear_and_set_word(ar_pci->pdev, PCI_EXP_LNKCTL,

+ PCI_EXP_LNKCTL_ASPMC,

+ ar_pci->link_ctl & PCI_EXP_LNKCTL_ASPMC);

return 0;

}

@@ -2666,7 +2668,7 @@ static int ath10k_pci_safe_chip_reset(struct ath10k *ar)

struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

if (!ar_pci->pci_soft_reset)

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

return ar_pci->pci_soft_reset(ar);

}

@@ -2806,7 +2808,7 @@ static int ath10k_pci_chip_reset(struct ath10k *ar)

struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

if (WARN_ON(!ar_pci->pci_hard_reset))

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

return ar_pci->pci_hard_reset(ar);

}

@@ -2821,8 +2823,8 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar,

pcie_capability_read_word(ar_pci->pdev, PCI_EXP_LNKCTL,

&ar_pci->link_ctl);

- pcie_capability_write_word(ar_pci->pdev, PCI_EXP_LNKCTL,

- ar_pci->link_ctl & ~PCI_EXP_LNKCTL_ASPMC);

+ pcie_capability_clear_word(ar_pci->pdev, PCI_EXP_LNKCTL,

+ PCI_EXP_LNKCTL_ASPMC);

* Bring the target up cleanly.

@@ -3109,11 +3111,11 @@ static irqreturn_t ath10k_pci_interrupt_handler(int irq, void *arg)

return IRQ_NONE;

}

- if ((ar_pci->oper_irq_mode == ATH10K_PCI_IRQ_LEGACY) &&

+ if ((ar_pci->oper_irq_mode == ATH10K_PCI_IRQ_INTX) &&

!ath10k_pci_irq_pending(ar))

return IRQ_NONE;

- ath10k_pci_disable_and_clear_legacy_irq(ar);

+ ath10k_pci_disable_and_clear_intx_irq(ar);

ath10k_pci_irq_msi_fw_mask(ar);

napi_schedule(&ar->napi);

@@ -3147,10 +3149,10 @@ static int ath10k_pci_napi_poll(struct napi_struct *ctx, int budget)

* immediate servicing.

if (ath10k_ce_interrupt_summary(ar)) {

- napi_reschedule(ctx);

+ napi_schedule(ctx);

goto out;

}

- ath10k_pci_enable_legacy_irq(ar);

+ ath10k_pci_enable_intx_irq(ar);

ath10k_pci_irq_msi_fw_unmask(ar);

}

@@ -3175,7 +3177,7 @@ static int ath10k_pci_request_irq_msi(struct ath10k *ar)

return 0;

}

-static int ath10k_pci_request_irq_legacy(struct ath10k *ar)

+static int ath10k_pci_request_irq_intx(struct ath10k *ar)

{

struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

int ret;

@@ -3197,8 +3199,8 @@ static int ath10k_pci_request_irq(struct ath10k *ar)

struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

switch (ar_pci->oper_irq_mode) {

- case ATH10K_PCI_IRQ_LEGACY:

- return ath10k_pci_request_irq_legacy(ar);

+ case ATH10K_PCI_IRQ_INTX:

+ return ath10k_pci_request_irq_intx(ar);

case ATH10K_PCI_IRQ_MSI:

return ath10k_pci_request_irq_msi(ar);

default:

@@ -3215,7 +3217,7 @@ static void ath10k_pci_free_irq(struct ath10k *ar)

void ath10k_pci_init_napi(struct ath10k *ar)

{

- netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_pci_napi_poll);

+ netif_napi_add(ar->napi_dev, &ar->napi, ath10k_pci_napi_poll);

}

static int ath10k_pci_init_irq(struct ath10k *ar)

@@ -3230,7 +3232,7 @@ static int ath10k_pci_init_irq(struct ath10k *ar)

ath10k_pci_irq_mode);

/* Try MSI */

- if (ath10k_pci_irq_mode != ATH10K_PCI_IRQ_LEGACY) {

+ if (ath10k_pci_irq_mode != ATH10K_PCI_IRQ_INTX) {

ar_pci->oper_irq_mode = ATH10K_PCI_IRQ_MSI;

ret = pci_enable_msi(ar_pci->pdev);

if (ret == 0)

@@ -3248,7 +3250,7 @@ static int ath10k_pci_init_irq(struct ath10k *ar)

* For now, fix the race by repeating the write in below

* synchronization checking.

- ar_pci->oper_irq_mode = ATH10K_PCI_IRQ_LEGACY;

+ ar_pci->oper_irq_mode = ATH10K_PCI_IRQ_INTX;

ath10k_pci_write32(ar, SOC_CORE_BASE_ADDRESS + PCIE_INTR_ENABLE_ADDRESS,

PCIE_INTR_FIRMWARE_MASK | PCIE_INTR_CE_MASK_ALL);

@@ -3256,7 +3258,7 @@ static int ath10k_pci_init_irq(struct ath10k *ar)

return 0;

}

-static void ath10k_pci_deinit_irq_legacy(struct ath10k *ar)

+static void ath10k_pci_deinit_irq_intx(struct ath10k *ar)

{

ath10k_pci_write32(ar, SOC_CORE_BASE_ADDRESS + PCIE_INTR_ENABLE_ADDRESS,

0);

@@ -3267,8 +3269,8 @@ static int ath10k_pci_deinit_irq(struct ath10k *ar)

struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

switch (ar_pci->oper_irq_mode) {

- case ATH10K_PCI_IRQ_LEGACY:

- ath10k_pci_deinit_irq_legacy(ar);

+ case ATH10K_PCI_IRQ_INTX:

+ ath10k_pci_deinit_irq_intx(ar);

break;

default:

pci_disable_msi(ar_pci->pdev);

@@ -3305,14 +3307,14 @@ int ath10k_pci_wait_for_target_init(struct ath10k *ar)

if (val & FW_IND_INITIALIZED)

break;

- if (ar_pci->oper_irq_mode == ATH10K_PCI_IRQ_LEGACY)

+ if (ar_pci->oper_irq_mode == ATH10K_PCI_IRQ_INTX)

/* Fix potential race by repeating CORE_BASE writes */

- ath10k_pci_enable_legacy_irq(ar);

+ ath10k_pci_enable_intx_irq(ar);

mdelay(10);

} while (time_before(jiffies, timeout));

- ath10k_pci_disable_and_clear_legacy_irq(ar);

+ ath10k_pci_disable_and_clear_intx_irq(ar);

ath10k_pci_irq_msi_fw_mask(ar);

if (val == 0xffffffff) {

@@ -3592,7 +3594,7 @@ static int ath10k_pci_probe(struct pci_dev *pdev,

break;

default:

WARN_ON(1);

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

}

ar = ath10k_core_create(sizeof(*ar_pci), &pdev->dev, ATH10K_BUS_PCI,

@@ -3816,7 +3818,7 @@ static void __exit ath10k_pci_exit(void)

module_exit(ath10k_pci_exit);

MODULE_AUTHOR("Qualcomm Atheros");

-MODULE_DESCRIPTION("Driver support for Qualcomm Atheros 802.11ac WLAN PCIe/AHB devices");

+MODULE_DESCRIPTION("Driver support for Qualcomm Atheros PCIe/AHB 802.11ac WLAN devices");

MODULE_LICENSE("Dual BSD/GPL");

/* QCA988x 2.0 firmware files */

@@ -3824,28 +3826,28 @@ MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API2_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API3_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API4_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API5_FILE);

-MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" QCA988X_HW_2_0_BOARD_DATA_FILE);

+MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_BOARD_API2_FILE);

/* QCA9887 1.0 firmware files */

MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" ATH10K_FW_API5_FILE);

-MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" QCA9887_HW_1_0_BOARD_DATA_FILE);

+MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" ATH10K_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA9887_HW_1_0_FW_DIR "/" ATH10K_BOARD_API2_FILE);

/* QCA6174 2.1 firmware files */

MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_FW_API4_FILE);

MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_FW_API5_FILE);

-MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" QCA6174_HW_2_1_BOARD_DATA_FILE);

+MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_BOARD_API2_FILE);

/* QCA6174 3.1 firmware files */

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API4_FILE);

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API5_FILE);

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API6_FILE);

-MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" QCA6174_HW_3_0_BOARD_DATA_FILE);

+MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_BOARD_API2_FILE);

/* QCA9377 1.0 firmware files */

MODULE_FIRMWARE(QCA9377_HW_1_0_FW_DIR "/" ATH10K_FW_API6_FILE);

MODULE_FIRMWARE(QCA9377_HW_1_0_FW_DIR "/" ATH10K_FW_API5_FILE);

-MODULE_FIRMWARE(QCA9377_HW_1_0_FW_DIR "/" QCA9377_HW_1_0_BOARD_DATA_FILE);

+MODULE_FIRMWARE(QCA9377_HW_1_0_FW_DIR "/" ATH10K_BOARD_DATA_FILE);

diff --git a/pci.h b/pci.h
index 480cd97ab739..4c3f536f2ea1 100644
--- a/pci.h
+++ b/pci.h

@@ -2,6 +2,7 @@

#ifndef _PCI_H_

@@ -100,7 +101,7 @@ struct ath10k_pci_supp_chip {

enum ath10k_pci_irq_mode {

ATH10K_PCI_IRQ_AUTO = 0,

- ATH10K_PCI_IRQ_LEGACY = 1,

+ ATH10K_PCI_IRQ_INTX = 1,

ATH10K_PCI_IRQ_MSI = 2,

};

@@ -242,9 +243,9 @@ int ath10k_pci_init_pipes(struct ath10k *ar);

int ath10k_pci_init_config(struct ath10k *ar);

void ath10k_pci_rx_post(struct ath10k *ar);

void ath10k_pci_flush(struct ath10k *ar);

-void ath10k_pci_enable_legacy_irq(struct ath10k *ar);

+void ath10k_pci_enable_intx_irq(struct ath10k *ar);

bool ath10k_pci_irq_pending(struct ath10k *ar);

-void ath10k_pci_disable_and_clear_legacy_irq(struct ath10k *ar);

+void ath10k_pci_disable_and_clear_intx_irq(struct ath10k *ar);

void ath10k_pci_irq_msi_fw_mask(struct ath10k *ar);

int ath10k_pci_wait_for_target_init(struct ath10k *ar);

int ath10k_pci_setup_resource(struct ath10k *ar);

diff --git a/qmi.c b/qmi.c
index 52c1a3de8da6..f1f33af0170a 100644
--- a/qmi.c
+++ b/qmi.c

@@ -1,6 +1,7 @@

// SPDX-License-Identifier: ISC

#include <linux/completion.h>

@@ -1039,6 +1040,10 @@ static void ath10k_qmi_driver_event_work(struct work_struct *work)

switch (event->type) {

case ATH10K_QMI_EVENT_SERVER_ARRIVE:

ath10k_qmi_event_server_arrive(qmi);

+ if (qmi->no_msa_ready_indicator) {

+ ath10k_info(ar, "qmi not waiting for msa_ready indicator");

+ ath10k_qmi_event_msa_ready(qmi);

+ }

break;

case ATH10K_QMI_EVENT_SERVER_EXIT:

ath10k_qmi_event_server_exit(qmi);

@@ -1047,6 +1052,10 @@ static void ath10k_qmi_driver_event_work(struct work_struct *work)

ath10k_qmi_event_fw_ready_ind(qmi);

break;

case ATH10K_QMI_EVENT_MSA_READY_IND:

+ if (qmi->no_msa_ready_indicator) {

+ ath10k_warn(ar, "qmi unexpected msa_ready indicator");

+ break;

+ }

ath10k_qmi_event_msa_ready(qmi);

break;

default:

@@ -1076,6 +1085,9 @@ int ath10k_qmi_init(struct ath10k *ar, u32 msa_size)

if (of_property_read_bool(dev->of_node, "qcom,msa-fixed-perm"))

qmi->msa_fixed_perm = true;

+ if (of_property_read_bool(dev->of_node, "qcom,no-msa-ready-indicator"))

+ qmi->no_msa_ready_indicator = true;

ret = qmi_handle_init(&qmi->qmi_hdl,

WLFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN,

&ath10k_qmi_ops, qmi_msg_handler);

diff --git a/qmi.h b/qmi.h
index 89464239fe96..0816eb4e4a18 100644
--- a/qmi.h
+++ b/qmi.h

@@ -107,6 +107,7 @@ struct ath10k_qmi {

char fw_build_timestamp[MAX_TIMESTAMP_LEN + 1];

struct ath10k_qmi_cal_data cal_data[MAX_NUM_CAL_V01];

bool msa_fixed_perm;

+ bool no_msa_ready_indicator;

enum ath10k_qmi_state state;

};

diff --git a/qmi_wlfw_v01.c b/qmi_wlfw_v01.c
index 1c81e454f943..0e85c75d2278 100644
--- a/qmi_wlfw_v01.c
+++ b/qmi_wlfw_v01.c

@@ -1,6 +1,7 @@

// SPDX-License-Identifier: ISC

#include <linux/soc/qcom/qmi.h>

diff --git a/qmi_wlfw_v01.h b/qmi_wlfw_v01.h
index f0db991408dc..9f311f3bc9e7 100644
--- a/qmi_wlfw_v01.h
+++ b/qmi_wlfw_v01.h

@@ -1,6 +1,7 @@

/* SPDX-License-Identifier: ISC */

#ifndef WCN3990_QMI_SVC_V01_H

diff --git a/rx_desc.h b/rx_desc.h
index 777e53aa69dc..564293df1e9a 100644
--- a/rx_desc.h
+++ b/rx_desc.h

@@ -2,6 +2,7 @@

#ifndef _RX_DESC_H_

diff --git a/sdio.c b/sdio.c
index 79e09c7a82b3..6805357ee29e 100644
--- a/sdio.c
+++ b/sdio.c

@@ -3,6 +3,7 @@

#include <linux/module.h>

@@ -2389,7 +2390,7 @@ static int ath10k_sdio_dump_memory_generic(struct ath10k *ar,

buf,

current_region->len);

- /* No individiual memory sections defined so we can

+ /* No individual memory sections defined so we can

* copy the entire memory region.

if (fast_dump)

@@ -2531,7 +2532,7 @@ static int ath10k_sdio_probe(struct sdio_func *func,

return -ENOMEM;

}

- netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_sdio_napi_poll);

+ netif_napi_add(ar->napi_dev, &ar->napi, ath10k_sdio_napi_poll);

ath10k_dbg(ar, ATH10K_DBG_BOOT,

"sdio new func %d vendor 0x%x device 0x%x block 0x%x/0x%x\n",

@@ -2647,9 +2648,9 @@ static void ath10k_sdio_remove(struct sdio_func *func)

netif_napi_del(&ar->napi);

- ath10k_core_destroy(ar);

destroy_workqueue(ar_sdio->workqueue);

+ ath10k_core_destroy(ar);

}

static const struct sdio_device_id ath10k_sdio_devices[] = {

@@ -2666,29 +2667,10 @@ static struct sdio_driver ath10k_sdio_driver = {

.probe = ath10k_sdio_probe,

.remove = ath10k_sdio_remove,

.drv = {

- .owner = THIS_MODULE,

.pm = ATH10K_SDIO_PM_OPS,

};

-static int __init ath10k_sdio_init(void)

- int ret;

- ret = sdio_register_driver(&ath10k_sdio_driver);

- if (ret)

- pr_err("sdio driver registration failed: %d\n", ret);

- return ret;

-static void __exit ath10k_sdio_exit(void)

- sdio_unregister_driver(&ath10k_sdio_driver);

-module_init(ath10k_sdio_init);

-module_exit(ath10k_sdio_exit);

+module_sdio_driver(ath10k_sdio_driver);

MODULE_AUTHOR("Qualcomm Atheros");

MODULE_DESCRIPTION("Driver support for Qualcomm Atheros 802.11ac WLAN SDIO devices");

diff --git a/snoc.c b/snoc.c
index 26214c00cd0d..d436a874cd5a 100644
--- a/snoc.c
+++ b/snoc.c

@@ -828,12 +828,20 @@ static void ath10k_snoc_hif_get_default_pipe(struct ath10k *ar,

static inline void ath10k_snoc_irq_disable(struct ath10k *ar)

{

- ath10k_ce_disable_interrupts(ar);

+ struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);

+ int id;

+ for (id = 0; id < CE_COUNT_MAX; id++)

+ disable_irq(ar_snoc->ce_irqs[id].irq_line);

}

static inline void ath10k_snoc_irq_enable(struct ath10k *ar)

{

- ath10k_ce_enable_interrupts(ar);

+ struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);

+ int id;

+ for (id = 0; id < CE_COUNT_MAX; id++)

+ enable_irq(ar_snoc->ce_irqs[id].irq_line);

}

static void ath10k_snoc_rx_pipe_cleanup(struct ath10k_snoc_pipe *snoc_pipe)

@@ -927,7 +935,7 @@ static int ath10k_snoc_hif_start(struct ath10k *ar)

bitmap_clear(ar_snoc->pending_ce_irqs, 0, CE_COUNT_MAX);

- dev_set_threaded(&ar->napi_dev, true);

+ dev_set_threaded(ar->napi_dev, true);

ath10k_core_napi_enable(ar);

ath10k_snoc_irq_enable(ar);

ath10k_snoc_rx_post(ar);

@@ -1090,6 +1098,8 @@ static int ath10k_snoc_hif_power_up(struct ath10k *ar,

goto err_free_rri;

}

+ ath10k_ce_enable_interrupts(ar);

return 0;

err_free_rri:

@@ -1243,7 +1253,7 @@ static int ath10k_snoc_napi_poll(struct napi_struct *ctx, int budget)

static void ath10k_snoc_init_napi(struct ath10k *ar)

{

- netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_snoc_napi_poll);

+ netif_napi_add(ar->napi_dev, &ar->napi, ath10k_snoc_napi_poll);

}

static int ath10k_snoc_request_irq(struct ath10k *ar)

@@ -1253,8 +1263,8 @@ static int ath10k_snoc_request_irq(struct ath10k *ar)

for (id = 0; id < CE_COUNT_MAX; id++) {

ret = request_irq(ar_snoc->ce_irqs[id].irq_line,

- ath10k_snoc_per_engine_handler, 0,

- ce_name[id], ar);

+ ath10k_snoc_per_engine_handler,

+ IRQF_NO_AUTOEN, ce_name[id], ar);

if (ret) {

ath10k_err(ar,

"failed to register IRQ handler for CE %d: %d\n",

@@ -1328,6 +1338,9 @@ static void ath10k_snoc_quirks_init(struct ath10k *ar)

struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar);

struct device *dev = &ar_snoc->dev->dev;

+ /* ignore errors, keep NULL if there is no property */

+ of_property_read_string(dev->of_node, "firmware-name", &ar->board_name);

if (of_property_read_bool(dev->of_node, "qcom,snoc-host-cap-8bit-quirk"))

set_bit(ATH10K_SNOC_FLAG_8BIT_HOST_CAP_QUIRK, &ar_snoc->flags);

}

@@ -1622,10 +1635,10 @@ static int ath10k_fw_init(struct ath10k *ar)

ar_snoc->fw.dev = &pdev->dev;

- iommu_dom = iommu_domain_alloc(&platform_bus_type);

- if (!iommu_dom) {

+ iommu_dom = iommu_paging_domain_alloc(ar_snoc->fw.dev);

+ if (IS_ERR(iommu_dom)) {

ath10k_err(ar, "failed to allocate iommu domain\n");

- ret = -ENOMEM;

+ ret = PTR_ERR(iommu_dom);

goto err_unregister;

}

@@ -1872,11 +1885,11 @@ static void ath10k_snoc_shutdown(struct platform_device *pdev)

}

static struct platform_driver ath10k_snoc_driver = {

- .probe = ath10k_snoc_probe,

- .remove_new = ath10k_snoc_remove,

+ .probe = ath10k_snoc_probe,

+ .remove = ath10k_snoc_remove,

.shutdown = ath10k_snoc_shutdown,

.driver = {

- .name = "ath10k_snoc",

+ .name = "ath10k_snoc",

.of_match_table = ath10k_snoc_dt_match,

};

diff --git a/spectral.c b/spectral.c
index 68254a967ccb..2240994390ed 100644
--- a/spectral.c
+++ b/spectral.c

@@ -384,16 +384,11 @@ static ssize_t write_file_spectral_count(struct file *file,

{

struct ath10k *ar = file->private_data;

unsigned long val;

- char buf[32];

- ssize_t len;

- len = min(count, sizeof(buf) - 1);

- if (copy_from_user(buf, user_buf, len))

- return -EFAULT;

+ ssize_t ret;

- buf[len] = '\0';

- if (kstrtoul(buf, 0, &val))

- return -EINVAL;

+ ret = kstrtoul_from_user(user_buf, count, 0, &val);

+ if (ret)

+ return ret;

if (val > 255)

return -EINVAL;

@@ -440,16 +435,11 @@ static ssize_t write_file_spectral_bins(struct file *file,

{

struct ath10k *ar = file->private_data;

unsigned long val;

- char buf[32];

- ssize_t len;

- len = min(count, sizeof(buf) - 1);

- if (copy_from_user(buf, user_buf, len))

- return -EFAULT;

+ ssize_t ret;

- buf[len] = '\0';

- if (kstrtoul(buf, 0, &val))

- return -EINVAL;

+ ret = kstrtoul_from_user(user_buf, count, 0, &val);

+ if (ret)

+ return ret;

if (val < 64 || val > SPECTRAL_ATH10K_MAX_NUM_BINS)

return -EINVAL;

diff --git a/targaddrs.h b/targaddrs.h
index ec556bb88d65..ba37e6c7ced0 100644
--- a/targaddrs.h
+++ b/targaddrs.h

@@ -491,4 +491,7 @@ struct host_interest {

#define QCA4019_BOARD_DATA_SZ 12064

#define QCA4019_BOARD_EXT_DATA_SZ 0

+#define WCN3990_BOARD_DATA_SZ 26328

+#define WCN3990_BOARD_EXT_DATA_SZ 0

#endif /* __TARGADDRS_H__ */

diff --git a/thermal.c b/thermal.c
index cefd97323dfe..8b15ec07b107 100644
--- a/thermal.c
+++ b/thermal.c

@@ -1,6 +1,7 @@

// SPDX-License-Identifier: ISC

#include <linux/device.h>

@@ -99,7 +100,7 @@ static ssize_t ath10k_thermal_show_temp(struct device *dev,

spin_unlock_bh(&ar->data_lock);

/* display in millidegree celsius */

- ret = snprintf(buf, PAGE_SIZE, "%d\n", temperature * 1000);

+ ret = sysfs_emit(buf, "%d\n", temperature * 1000);

out:

mutex_unlock(&ar->conf_mutex);

return ret;

diff --git a/trace.h b/trace.h
index 64e7a767d963..68b78ca17eaa 100644
--- a/trace.h
+++ b/trace.h

@@ -55,8 +55,8 @@ DECLARE_EVENT_CLASS(ath10k_log_event,

__vstring(msg, vaf->fmt, vaf->va)

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__assign_vstr(msg, vaf->fmt, vaf->va);

TP_printk(

@@ -92,8 +92,8 @@ TRACE_EVENT(ath10k_log_dbg,

__vstring(msg, vaf->fmt, vaf->va)

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__entry->level = level;

__assign_vstr(msg, vaf->fmt, vaf->va);

@@ -121,10 +121,10 @@ TRACE_EVENT(ath10k_log_dbg_dump,

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

- __assign_str(msg, msg);

- __assign_str(prefix, prefix);

+ __assign_str(device);

+ __assign_str(driver);

+ __assign_str(msg);

+ __assign_str(prefix);

__entry->buf_len = buf_len;

memcpy(__get_dynamic_array(buf), buf, buf_len);

@@ -152,8 +152,8 @@ TRACE_EVENT(ath10k_wmi_cmd,

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__entry->id = id;

__entry->buf_len = buf_len;

memcpy(__get_dynamic_array(buf), buf, buf_len);

@@ -182,8 +182,8 @@ TRACE_EVENT(ath10k_wmi_event,

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__entry->id = id;

__entry->buf_len = buf_len;

memcpy(__get_dynamic_array(buf), buf, buf_len);

@@ -211,8 +211,8 @@ TRACE_EVENT(ath10k_htt_stats,

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__entry->buf_len = buf_len;

memcpy(__get_dynamic_array(buf), buf, buf_len);

@@ -239,8 +239,8 @@ TRACE_EVENT(ath10k_wmi_dbglog,

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__entry->hw_type = ar->hw_rev;

__entry->buf_len = buf_len;

memcpy(__get_dynamic_array(buf), buf, buf_len);

@@ -269,8 +269,8 @@ TRACE_EVENT(ath10k_htt_pktlog,

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__entry->hw_type = ar->hw_rev;

__entry->buf_len = buf_len;

memcpy(__get_dynamic_array(pktlog), buf, buf_len);

@@ -301,8 +301,8 @@ TRACE_EVENT(ath10k_htt_tx,

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__entry->msdu_id = msdu_id;

__entry->msdu_len = msdu_len;

__entry->vdev_id = vdev_id;

@@ -332,8 +332,8 @@ TRACE_EVENT(ath10k_txrx_tx_unref,

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__entry->msdu_id = msdu_id;

@@ -358,8 +358,8 @@ DECLARE_EVENT_CLASS(ath10k_hdr_event,

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__entry->len = ath10k_frm_hdr_len(data, len);

memcpy(__get_dynamic_array(data), data, __entry->len);

@@ -386,8 +386,8 @@ DECLARE_EVENT_CLASS(ath10k_payload_event,

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__entry->len = len - ath10k_frm_hdr_len(data, len);

memcpy(__get_dynamic_array(payload),

data + ath10k_frm_hdr_len(data, len), __entry->len);

@@ -435,8 +435,8 @@ TRACE_EVENT(ath10k_htt_rx_desc,

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__entry->hw_type = ar->hw_rev;

__entry->len = len;

memcpy(__get_dynamic_array(rxdesc), data, len);

@@ -472,8 +472,8 @@ TRACE_EVENT(ath10k_wmi_diag_container,

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__entry->type = type;

__entry->timestamp = timestamp;

__entry->code = code;

@@ -505,8 +505,8 @@ TRACE_EVENT(ath10k_wmi_diag,

TP_fast_assign(

- __assign_str(device, dev_name(ar->dev));

- __assign_str(driver, dev_driver_string(ar->dev));

+ __assign_str(device);

+ __assign_str(driver);

__entry->len = len;

memcpy(__get_dynamic_array(data), data, len);

diff --git a/usb.c b/usb.c
index b0067af685b1..3b51b7f52130 100644
--- a/usb.c
+++ b/usb.c

@@ -1014,7 +1014,7 @@ static int ath10k_usb_probe(struct usb_interface *interface,

return -ENOMEM;

}

- netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_usb_napi_poll);

+ netif_napi_add(ar->napi_dev, &ar->napi, ath10k_usb_napi_poll);

usb_get_dev(dev);

vendor_id = le16_to_cpu(dev->descriptor.idVendor);

@@ -1126,5 +1126,5 @@ static struct usb_driver ath10k_usb_driver = {

module_usb_driver(ath10k_usb_driver);

MODULE_AUTHOR("Atheros Communications, Inc.");

-MODULE_DESCRIPTION("Driver support for Qualcomm Atheros 802.11ac WLAN USB devices");

+MODULE_DESCRIPTION("Driver support for Qualcomm Atheros USB 802.11ac WLAN devices");

MODULE_LICENSE("Dual BSD/GPL");

diff --git a/usb.h b/usb.h
index 48e066ba8162..7e4cfbb673c9 100644
--- a/usb.h
+++ b/usb.h

@@ -3,6 +3,7 @@

#ifndef _USB_H_

diff --git a/wmi-ops.h b/wmi-ops.h
index aa57d807491c..f3f6b5954b27 100644
--- a/wmi-ops.h
+++ b/wmi-ops.h

@@ -226,7 +226,10 @@ struct wmi_ops {

const struct wmi_bb_timing_cfg_arg *arg);

struct sk_buff *(*gen_per_peer_per_tid_cfg)(struct ath10k *ar,

const struct wmi_per_peer_per_tid_cfg_arg *arg);

+ struct sk_buff *(*gen_gpio_config)(struct ath10k *ar, u32 gpio_num,

+ u32 input, u32 pull_type, u32 intr_mode);

+ struct sk_buff *(*gen_gpio_output)(struct ath10k *ar, u32 gpio_num, u32 set);

};

int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id);

@@ -1122,6 +1125,35 @@ ath10k_wmi_force_fw_hang(struct ath10k *ar,

return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->force_fw_hang_cmdid);

}

+static inline int ath10k_wmi_gpio_config(struct ath10k *ar, u32 gpio_num,

+ u32 input, u32 pull_type, u32 intr_mode)

+ struct sk_buff *skb;

+ if (!ar->wmi.ops->gen_gpio_config)

+ return -EOPNOTSUPP;

+ skb = ar->wmi.ops->gen_gpio_config(ar, gpio_num, input, pull_type, intr_mode);

+ if (IS_ERR(skb))

+ return PTR_ERR(skb);

+ return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->gpio_config_cmdid);

+static inline int ath10k_wmi_gpio_output(struct ath10k *ar, u32 gpio_num, u32 set)

+ struct sk_buff *skb;

+ if (!ar->wmi.ops->gen_gpio_config)

+ return -EOPNOTSUPP;

+ skb = ar->wmi.ops->gen_gpio_output(ar, gpio_num, set);

+ if (IS_ERR(skb))

+ return PTR_ERR(skb);

+ return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->gpio_output_cmdid);

static inline int

ath10k_wmi_dbglog_cfg(struct ath10k *ar, u64 module_enable, u32 log_level)

{

diff --git a/wmi-tlv.c b/wmi-tlv.c
index 6b6aa3c36744..16d07d619b4d 100644
--- a/wmi-tlv.c
+++ b/wmi-tlv.c

@@ -3,6 +3,7 @@

#include "core.h"

#include "debug.h"

@@ -851,6 +852,10 @@ ath10k_wmi_tlv_op_pull_mgmt_tx_compl_ev(struct ath10k *ar, struct sk_buff *skb,

}

ev = tb[WMI_TLV_TAG_STRUCT_MGMT_TX_COMPL_EVENT];

+ if (!ev) {

+ kfree(tb);

+ return -EPROTO;

+ }

arg->desc_id = ev->desc_id;

arg->status = ev->status;

@@ -1347,7 +1352,7 @@ static int ath10k_wmi_tlv_op_pull_svc_rdy_ev(struct ath10k *ar,

__le32_to_cpu(ev->abi.abi_ver_ns1) != WMI_TLV_ABI_VER_NS1 ||

__le32_to_cpu(ev->abi.abi_ver_ns2) != WMI_TLV_ABI_VER_NS2 ||

__le32_to_cpu(ev->abi.abi_ver_ns3) != WMI_TLV_ABI_VER_NS3) {

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

}

arg->min_tx_power = ev->hw_min_tx_power;

@@ -2119,9 +2124,9 @@ static int ath10k_wmi_tlv_op_get_vdev_subtype(struct ath10k *ar,

case WMI_VDEV_SUBTYPE_MESH_11S:

return WMI_TLV_VDEV_SUBTYPE_MESH_11S;

case WMI_VDEV_SUBTYPE_MESH_NON_11S:

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

}

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

}

static struct sk_buff *

@@ -3038,9 +3043,14 @@ ath10k_wmi_tlv_op_cleanup_mgmt_tx_send(struct ath10k *ar,

struct sk_buff *msdu)

{

struct ath10k_skb_cb *cb = ATH10K_SKB_CB(msdu);

+ struct ath10k_mgmt_tx_pkt_addr *pkt_addr;

struct ath10k_wmi *wmi = &ar->wmi;

- idr_remove(&wmi->mgmt_pending_tx, cb->msdu_id);

+ spin_lock_bh(&ar->data_lock);

+ pkt_addr = idr_remove(&wmi->mgmt_pending_tx, cb->msdu_id);

+ spin_unlock_bh(&ar->data_lock);

+ kfree(pkt_addr);

return 0;

}

@@ -4601,6 +4611,8 @@ static const struct wmi_ops wmi_tlv_ops = {

.gen_echo = ath10k_wmi_tlv_op_gen_echo,

.gen_vdev_spectral_conf = ath10k_wmi_tlv_op_gen_vdev_spectral_conf,

.gen_vdev_spectral_enable = ath10k_wmi_tlv_op_gen_vdev_spectral_enable,

+ /* .gen_gpio_config not implemented */

+ /* .gen_gpio_output not implemented */

};

static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = {

diff --git a/wmi-tlv.h b/wmi-tlv.h
index dbb48d70f2e9..8a2f87d0a3a3 100644
--- a/wmi-tlv.h
+++ b/wmi-tlv.h

@@ -3,6 +3,7 @@

#ifndef _WMI_TLV_H

#define _WMI_TLV_H

@@ -2342,7 +2343,7 @@ struct wmi_tlv_adaptive_qcs {

} __packed;

/**

- * wmi_tlv_tx_pause_id - firmware tx queue pause reason types

+ * enum wmi_tlv_tx_pause_id - firmware tx queue pause reason types

* @WMI_TLV_TX_PAUSE_ID_MCC: used for by multi-channel firmware scheduler.

* Only vdev_map is valid.

diff --git a/wmi.c b/wmi.c
index 05fa7d4c0e1a..5e061f7525a6 100644
--- a/wmi.c
+++ b/wmi.c

@@ -3,6 +3,7 @@

#include <linux/skbuff.h>

@@ -1762,12 +1763,32 @@ void ath10k_wmi_put_wmi_channel(struct ath10k *ar, struct wmi_channel *ch,

int ath10k_wmi_wait_for_service_ready(struct ath10k *ar)

{

- unsigned long time_left;

+ unsigned long time_left, i;

time_left = wait_for_completion_timeout(&ar->wmi.service_ready,

WMI_SERVICE_READY_TIMEOUT_HZ);

- if (!time_left)

- return -ETIMEDOUT;

+ if (!time_left) {

+ /* Sometimes the PCI HIF doesn't receive interrupt

+ * for the service ready message even if the buffer

+ * was completed. PCIe sniffer shows that it's

+ * because the corresponding CE ring doesn't fires

+ * it. Workaround here by polling CE rings once.

+ */

+ ath10k_warn(ar, "failed to receive service ready completion, polling..\n");

+ for (i = 0; i < CE_COUNT; i++)

+ ath10k_hif_send_complete_check(ar, i, 1);

+ time_left = wait_for_completion_timeout(&ar->wmi.service_ready,

+ WMI_SERVICE_READY_TIMEOUT_HZ);

+ if (!time_left) {

+ ath10k_warn(ar, "polling timed out\n");

+ return -ETIMEDOUT;

+ }

+ ath10k_warn(ar, "service ready completion received, continuing normally\n");

+ }

return 0;

}

@@ -2420,6 +2441,7 @@ wmi_process_mgmt_tx_comp(struct ath10k *ar, struct mgmt_tx_compl_params *param)

dma_unmap_single(ar->dev, pkt_addr->paddr,

msdu->len, DMA_TO_DEVICE);

info = IEEE80211_SKB_CB(msdu);

+ kfree(pkt_addr);

if (param->status) {

info->flags &= ~IEEE80211_TX_STAT_ACK;

@@ -3883,8 +3905,8 @@ void ath10k_wmi_event_host_swba(struct ath10k *ar, struct sk_buff *skb)

* actual channel switch is done

if (arvif->vif->bss_conf.csa_active &&

- ieee80211_beacon_cntdwn_is_complete(arvif->vif)) {

- ieee80211_csa_finish(arvif->vif);

+ ieee80211_beacon_cntdwn_is_complete(arvif->vif, 0)) {

+ ieee80211_csa_finish(arvif->vif, 0);

continue;

}

@@ -3969,7 +3991,7 @@ static void ath10k_radar_detected(struct ath10k *ar)

if (ar->dfs_block_radar_events)

ath10k_info(ar, "DFS Radar detected, but ignored as requested\n");

else

- ieee80211_radar_detected(ar->hw);

+ ieee80211_radar_detected(ar->hw, NULL);

}

static void ath10k_radar_confirmation_work(struct work_struct *work)

@@ -6926,14 +6948,14 @@ void ath10k_wmi_put_start_scan_common(struct wmi_start_scan_common *cmn,

}

static void

-ath10k_wmi_put_start_scan_tlvs(struct wmi_start_scan_tlvs *tlvs,

+ath10k_wmi_put_start_scan_tlvs(u8 *tlvs,

const struct wmi_start_scan_arg *arg)

{

struct wmi_ie_data *ie;

struct wmi_chan_list *channels;

struct wmi_ssid_list *ssids;

struct wmi_bssid_list *bssids;

- void *ptr = tlvs->tlvs;

+ void *ptr = tlvs;

int i;

if (arg->n_channels) {

@@ -7011,7 +7033,7 @@ ath10k_wmi_op_gen_start_scan(struct ath10k *ar,

cmd = (struct wmi_start_scan_cmd *)skb->data;

ath10k_wmi_put_start_scan_common(&cmd->common, arg);

- ath10k_wmi_put_start_scan_tlvs(&cmd->tlvs, arg);

+ ath10k_wmi_put_start_scan_tlvs(cmd->tlvs, arg);

cmd->burst_duration_ms = __cpu_to_le32(0);

@@ -7040,7 +7062,7 @@ ath10k_wmi_10x_op_gen_start_scan(struct ath10k *ar,

cmd = (struct wmi_10x_start_scan_cmd *)skb->data;

ath10k_wmi_put_start_scan_common(&cmd->common, arg);

- ath10k_wmi_put_start_scan_tlvs(&cmd->tlvs, arg);

+ ath10k_wmi_put_start_scan_tlvs(cmd->tlvs, arg);

ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi 10x start scan\n");

return skb;

@@ -7472,6 +7494,49 @@ ath10k_wmi_op_gen_peer_set_param(struct ath10k *ar, u32 vdev_id,

return skb;

}

+static struct sk_buff *ath10k_wmi_op_gen_gpio_config(struct ath10k *ar,

+ u32 gpio_num, u32 input,

+ u32 pull_type, u32 intr_mode)

+ struct wmi_gpio_config_cmd *cmd;

+ struct sk_buff *skb;

+ skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));

+ if (!skb)

+ return ERR_PTR(-ENOMEM);

+ cmd = (struct wmi_gpio_config_cmd *)skb->data;

+ cmd->pull_type = __cpu_to_le32(pull_type);

+ cmd->gpio_num = __cpu_to_le32(gpio_num);

+ cmd->input = __cpu_to_le32(input);

+ cmd->intr_mode = __cpu_to_le32(intr_mode);

+ ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi gpio_config gpio_num 0x%08x input 0x%08x pull_type 0x%08x intr_mode 0x%08x\n",

+ gpio_num, input, pull_type, intr_mode);

+ return skb;

+static struct sk_buff *ath10k_wmi_op_gen_gpio_output(struct ath10k *ar,

+ u32 gpio_num, u32 set)

+ struct wmi_gpio_output_cmd *cmd;

+ struct sk_buff *skb;

+ skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));

+ if (!skb)

+ return ERR_PTR(-ENOMEM);

+ cmd = (struct wmi_gpio_output_cmd *)skb->data;

+ cmd->gpio_num = __cpu_to_le32(gpio_num);

+ cmd->set = __cpu_to_le32(set);

+ ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi gpio_output gpio_num 0x%08x set 0x%08x\n",

+ gpio_num, set);

+ return skb;

static struct sk_buff *

ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id,

enum wmi_sta_ps_mode psmode)

@@ -8732,9 +8797,9 @@ int ath10k_wmi_op_get_vdev_subtype(struct ath10k *ar,

return WMI_VDEV_SUBTYPE_LEGACY_PROXY_STA;

case WMI_VDEV_SUBTYPE_MESH_11S:

case WMI_VDEV_SUBTYPE_MESH_NON_11S:

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

}

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

}

static int ath10k_wmi_10_2_4_op_get_vdev_subtype(struct ath10k *ar,

@@ -8754,9 +8819,9 @@ static int ath10k_wmi_10_2_4_op_get_vdev_subtype(struct ath10k *ar,

case WMI_VDEV_SUBTYPE_MESH_11S:

return WMI_VDEV_SUBTYPE_10_2_4_MESH_11S;

case WMI_VDEV_SUBTYPE_MESH_NON_11S:

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

}

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

}

static int ath10k_wmi_10_4_op_get_vdev_subtype(struct ath10k *ar,

@@ -8778,7 +8843,7 @@ static int ath10k_wmi_10_4_op_get_vdev_subtype(struct ath10k *ar,

case WMI_VDEV_SUBTYPE_MESH_NON_11S:

return WMI_VDEV_SUBTYPE_10_4_MESH_NON_11S;

}

- return -ENOTSUPP;

+ return -EOPNOTSUPP;

}

static struct sk_buff *

@@ -8917,8 +8982,6 @@ ath10k_wmi_10_4_gen_tdls_peer_update(struct ath10k *ar,

if (!skb)

return ERR_PTR(-ENOMEM);

- memset(skb->data, 0, sizeof(*cmd));

cmd = (struct wmi_10_4_tdls_peer_update_cmd *)skb->data;

cmd->vdev_id = __cpu_to_le32(arg->vdev_id);

ether_addr_copy(cmd->peer_macaddr.addr, arg->addr);

@@ -9138,6 +9201,9 @@ static const struct wmi_ops wmi_ops = {

.fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill,

.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,

.gen_echo = ath10k_wmi_op_gen_echo,

+ .gen_gpio_config = ath10k_wmi_op_gen_gpio_config,

+ .gen_gpio_output = ath10k_wmi_op_gen_gpio_output,

/* .gen_bcn_tmpl not implemented */

/* .gen_prb_tmpl not implemented */

/* .gen_p2p_go_bcn_ie not implemented */

@@ -9208,6 +9274,8 @@ static const struct wmi_ops wmi_10_1_ops = {

.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,

.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,

.gen_echo = ath10k_wmi_op_gen_echo,

+ .gen_gpio_config = ath10k_wmi_op_gen_gpio_config,

+ .gen_gpio_output = ath10k_wmi_op_gen_gpio_output,

/* .gen_bcn_tmpl not implemented */

/* .gen_prb_tmpl not implemented */

/* .gen_p2p_go_bcn_ie not implemented */

@@ -9280,6 +9348,8 @@ static const struct wmi_ops wmi_10_2_ops = {

.gen_delba_send = ath10k_wmi_op_gen_delba_send,

.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,

.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,

+ .gen_gpio_config = ath10k_wmi_op_gen_gpio_config,

+ .gen_gpio_output = ath10k_wmi_op_gen_gpio_output,

/* .gen_pdev_enable_adaptive_cca not implemented */

};

@@ -9351,6 +9421,8 @@ static const struct wmi_ops wmi_10_2_4_ops = {

ath10k_wmi_op_gen_pdev_enable_adaptive_cca,

.get_vdev_subtype = ath10k_wmi_10_2_4_op_get_vdev_subtype,

.gen_bb_timing = ath10k_wmi_10_2_4_op_gen_bb_timing,

+ .gen_gpio_config = ath10k_wmi_op_gen_gpio_config,

+ .gen_gpio_output = ath10k_wmi_op_gen_gpio_output,

/* .gen_bcn_tmpl not implemented */

/* .gen_prb_tmpl not implemented */

/* .gen_p2p_go_bcn_ie not implemented */

@@ -9432,6 +9504,8 @@ static const struct wmi_ops wmi_10_4_ops = {

.gen_pdev_bss_chan_info_req = ath10k_wmi_10_2_op_gen_pdev_bss_chan_info,

.gen_echo = ath10k_wmi_op_gen_echo,

.gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config,

+ .gen_gpio_config = ath10k_wmi_op_gen_gpio_config,

+ .gen_gpio_output = ath10k_wmi_op_gen_gpio_output,

};

int ath10k_wmi_attach(struct ath10k *ar)

@@ -9539,6 +9613,7 @@ static int ath10k_wmi_mgmt_tx_clean_up_pending(int msdu_id, void *ptr,

dma_unmap_single(ar->dev, pkt_addr->paddr,

msdu->len, DMA_TO_DEVICE);

ieee80211_free_txskb(ar->hw, msdu);

+ kfree(pkt_addr);

return 0;

}

diff --git a/wmi.h b/wmi.h
index 6d04a66fe5e0..0faefc0a9a40 100644
--- a/wmi.h
+++ b/wmi.h

@@ -3,6 +3,7 @@

#ifndef _WMI_H_

@@ -3007,8 +3008,11 @@ enum wmi_coex_version {

* @WMI_10_4_TDLS_UAPSD_SLEEP_STA: TDLS sleep sta support enable/disable

* @WMI_10_4_TDLS_CONN_TRACKER_IN_HOST_MODE: TDLS connection tracker in host

* enable/disable

- * @WMI_10_4_TDLS_EXPLICIT_MODE_ONLY:Explicit TDLS mode enable/disable

+ * @WMI_10_4_TDLS_EXPLICIT_MODE_ONLY: Explicit TDLS mode enable/disable

* @WMI_10_4_TX_DATA_ACK_RSSI: Enable DATA ACK RSSI if firmware is capable

+ * @WMI_10_4_EXT_PEER_TID_CONFIGS_SUPPORT: Firmware supports Extended Peer

+ * TID configuration for QoS related settings

+ * @WMI_10_4_REPORT_AIRTIME: Firmware supports transmit airtime reporting

enum wmi_10_4_feature_mask {

WMI_10_4_LTEU_SUPPORT = BIT(0),

@@ -3030,6 +3034,41 @@ enum wmi_10_4_feature_mask {

};

+/* WMI_GPIO_CONFIG_CMDID */

+enum {

+ WMI_GPIO_PULL_NONE,

+ WMI_GPIO_PULL_UP,

+ WMI_GPIO_PULL_DOWN,

+};

+enum {

+ WMI_GPIO_INTTYPE_DISABLE,

+ WMI_GPIO_INTTYPE_RISING_EDGE,

+ WMI_GPIO_INTTYPE_FALLING_EDGE,

+ WMI_GPIO_INTTYPE_BOTH_EDGE,

+ WMI_GPIO_INTTYPE_LEVEL_LOW,

+ WMI_GPIO_INTTYPE_LEVEL_HIGH

+};

+/* WMI_GPIO_CONFIG_CMDID */

+struct wmi_gpio_config_cmd {

+ __le32 gpio_num; /* GPIO number to be setup */

+ __le32 input; /* 0 - Output/ 1 - Input */

+ __le32 pull_type; /* Pull type defined above */

+ __le32 intr_mode; /* Interrupt mode defined above (Input) */

+} __packed;

+/* WMI_GPIO_OUTPUT_CMDID */

+struct wmi_gpio_output_cmd {

+ __le32 gpio_num; /* GPIO number to be setup */

+ __le32 set; /* Set the GPIO pin*/

+} __packed;

+/* WMI_GPIO_INPUT_EVENTID */

+struct wmi_gpio_input_event {

+ __le32 gpio_num; /* GPIO number which changed state */

+} __packed;

struct wmi_ext_resource_config_10_4_cmd {

/* contains enum wmi_host_platform_type */

__le32 host_platform_config;

@@ -3068,7 +3107,10 @@ struct host_memory_chunk {

struct wmi_host_mem_chunks {

__le32 count;

/* some fw revisions require at least 1 chunk regardless of count */

- struct host_memory_chunk items[1];

+ union {

+ struct host_memory_chunk item;

+ DECLARE_FLEX_ARRAY(struct host_memory_chunk, items);

+ };

} __packed;

struct wmi_init_cmd {

@@ -3214,23 +3256,16 @@ struct wmi_start_scan_common {

__le32 scan_ctrl_flags;

} __packed;

-struct wmi_start_scan_tlvs {

- /* TLV parameters. These includes channel list, ssid list, bssid list,

- * extra ies.

- */

- u8 tlvs[0];

-} __packed;

struct wmi_start_scan_cmd {

struct wmi_start_scan_common common;

__le32 burst_duration_ms;

- struct wmi_start_scan_tlvs tlvs;

+ u8 tlvs[];

} __packed;

/* This is the definition from 10.X firmware branch */

struct wmi_10x_start_scan_cmd {

struct wmi_start_scan_common common;

- struct wmi_start_scan_tlvs tlvs;

+ u8 tlvs[];

} __packed;

struct wmi_ssid_arg {

@@ -3854,9 +3889,9 @@ enum wmi_pdev_param {

* retransmitting frames.

WMI_PDEV_PARAM_DYNAMIC_BW,

- /* Non aggregrate/ 11g sw retry threshold.0-disable */

+ /* Non aggregate/ 11g sw retry threshold.0-disable */

WMI_PDEV_PARAM_NON_AGG_SW_RETRY_TH,

- /* aggregrate sw retry threshold. 0-disable*/

+ /* aggregate sw retry threshold. 0-disable*/

WMI_PDEV_PARAM_AGG_SW_RETRY_TH,

/* Station kickout threshold (non of consecutive failures).0-disable */

WMI_PDEV_PARAM_STA_KICKOUT_TH,

@@ -3953,9 +3988,9 @@ enum wmi_10x_pdev_param {

WMI_10X_PDEV_PARAM_PROTECTION_MODE,

/* Dynamic bandwidth 0: disable 1: enable */

WMI_10X_PDEV_PARAM_DYNAMIC_BW,

- /* Non aggregrate/ 11g sw retry threshold.0-disable */

+ /* Non aggregate/ 11g sw retry threshold.0-disable */

WMI_10X_PDEV_PARAM_NON_AGG_SW_RETRY_TH,

- /* aggregrate sw retry threshold. 0-disable*/

+ /* aggregate sw retry threshold. 0-disable*/

WMI_10X_PDEV_PARAM_AGG_SW_RETRY_TH,

/* Station kickout threshold (non of consecutive failures).0-disable */

WMI_10X_PDEV_PARAM_STA_KICKOUT_TH,

@@ -4259,13 +4294,6 @@ struct wmi_peer_sta_ps_state_chg_event {

__le32 peer_ps_state;

} __packed;

-struct wmi_pdev_chanlist_update_event {

- /* number of channels */

- __le32 num_chan;

- /* array of channels */

- struct wmi_channel channel_list[1];

-} __packed;

#define WMI_MAX_DEBUG_MESG (sizeof(u32) * 32)

struct wmi_debug_mesg_event {

@@ -5792,30 +5820,6 @@ struct wmi_bcn_prb_info {

/* app IE */

} __packed;

-struct wmi_bcn_tmpl_cmd {

- /* unique id identifying the VDEV, generated by the caller */

- __le32 vdev_id;

- /* TIM IE offset from the beginning of the template. */

- __le32 tim_ie_offset;

- /* beacon probe capabilities and IEs */

- struct wmi_bcn_prb_info bcn_prb_info;

- /* beacon buffer length */

- __le32 buf_len;

- /* variable length data */

- u8 data[1];

-} __packed;

-struct wmi_prb_tmpl_cmd {

- /* unique id identifying the VDEV, generated by the caller */

- __le32 vdev_id;

- /* beacon probe capabilities and IEs */

- struct wmi_bcn_prb_info bcn_prb_info;

- /* beacon buffer length */

- __le32 buf_len;

- /* Variable length data */

- u8 data[1];

-} __packed;

enum wmi_sta_ps_mode {

/* enable power save for the given STA VDEV */

WMI_STA_PS_MODE_DISABLED = 0,

@@ -7196,7 +7200,13 @@ struct wmi_tdls_peer_capabilities {

__le32 is_peer_responder;

__le32 pref_offchan_num;

__le32 pref_offchan_bw;

- struct wmi_channel peer_chan_list[1];

+ union {

+ /* to match legacy implementation allocate room for

+ * at least one record even if peer_chan_len is 0

+ */

+ struct wmi_channel peer_chan_min_allocation;

+ DECLARE_FLEX_ARRAY(struct wmi_channel, peer_chan_list);

+ };

} __packed;

struct wmi_10_4_tdls_peer_update_cmd {

diff --git a/wow.c b/wow.c
index 20b9aa8ddf7d..aa7b2e703f3d 100644
--- a/wow.c
+++ b/wow.c

@@ -2,6 +2,7 @@

#include "mac.h"