|
|
@@ -0,0 +1,645 @@
|
|
|
+From 8e1debd82466a3fe711784ab37e6b54e56011267 Mon Sep 17 00:00:00 2001
|
|
|
+From: Sebastian Gottschall <[email protected]>
|
|
|
+Date: Mon, 13 May 2024 17:22:25 +0300
|
|
|
+Subject: [PATCH] wifi: ath10k: add LED and GPIO controlling support for
|
|
|
+ various chipsets
|
|
|
+
|
|
|
+Adds LED and GPIO Control support for 988x, 9887, 9888, 99x0, 9984
|
|
|
+based chipsets with on chipset connected led's using WMI Firmware API.
|
|
|
+The LED device will get available named as "ath10k-phyX" at sysfs and
|
|
|
+can be controlled with various triggers.
|
|
|
+Adds also debugfs interface for gpio control.
|
|
|
+
|
|
|
+Signed-off-by: Sebastian Gottschall <[email protected]>
|
|
|
+Reviewed-by: Steve deRosier <[email protected]>
|
|
|
+[kvalo: major reorg and cleanup]
|
|
|
+Signed-off-by: Kalle Valo <[email protected]>
|
|
|
+[ansuel: rebase and small cleanup]
|
|
|
+Signed-off-by: Christian Marangi <[email protected]>
|
|
|
+Tested-by: Stefan Lippers-Hollmann <[email protected]>
|
|
|
+Signed-off-by: Kalle Valo <[email protected]>
|
|
|
+Link: https://msgid.link/[email protected]
|
|
|
+---
|
|
|
+ drivers/net/wireless/ath/ath10k/Kconfig | 6 ++
|
|
|
+ drivers/net/wireless/ath/ath10k/Makefile | 1 +
|
|
|
+ drivers/net/wireless/ath/ath10k/core.c | 32 ++++++++
|
|
|
+ drivers/net/wireless/ath/ath10k/core.h | 8 ++
|
|
|
+ drivers/net/wireless/ath/ath10k/hw.h | 1 +
|
|
|
+ drivers/net/wireless/ath/ath10k/leds.c | 90 +++++++++++++++++++++++
|
|
|
+ drivers/net/wireless/ath/ath10k/leds.h | 34 +++++++++
|
|
|
+ drivers/net/wireless/ath/ath10k/mac.c | 1 +
|
|
|
+ drivers/net/wireless/ath/ath10k/wmi-ops.h | 32 ++++++++
|
|
|
+ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 2 +
|
|
|
+ drivers/net/wireless/ath/ath10k/wmi.c | 54 ++++++++++++++
|
|
|
+ drivers/net/wireless/ath/ath10k/wmi.h | 35 +++++++++
|
|
|
+ 12 files changed, 296 insertions(+)
|
|
|
+ create mode 100644 drivers/net/wireless/ath/ath10k/leds.c
|
|
|
+ create mode 100644 drivers/net/wireless/ath/ath10k/leds.h
|
|
|
+
|
|
|
+diff --git a/drivers/net/wireless/ath/ath10k/Kconfig b/drivers/net/wireless/ath/ath10k/Kconfig
|
|
|
+index e6ea884cafc1..76572cd2e1ba 100644
|
|
|
+--- a/drivers/net/wireless/ath/ath10k/Kconfig
|
|
|
++++ b/drivers/net/wireless/ath/ath10k/Kconfig
|
|
|
+@@ -67,6 +67,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/drivers/net/wireless/ath/ath10k/Makefile b/drivers/net/wireless/ath/ath10k/Makefile
|
|
|
+index 142c777b287f..02bf9b629038 100644
|
|
|
+--- a/drivers/net/wireless/ath/ath10k/Makefile
|
|
|
++++ b/drivers/net/wireless/ath/ath10k/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/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
|
|
|
+index bdf0552cd1c3..b3294287bce1 100644
|
|
|
+--- a/drivers/net/wireless/ath/ath10k/core.c
|
|
|
++++ b/drivers/net/wireless/ath/ath10k/core.c
|
|
|
+@@ -27,6 +27,7 @@
|
|
|
+ #include "testmode.h"
|
|
|
+ #include "wmi-ops.h"
|
|
|
+ #include "coredump.h"
|
|
|
++#include "leds.h"
|
|
|
+
|
|
|
+ unsigned int ath10k_debug_mask;
|
|
|
+ EXPORT_SYMBOL(ath10k_debug_mask);
|
|
|
+@@ -68,6 +69,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca988x hw2.0",
|
|
|
+ .patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 7,
|
|
|
++ .led_pin = 1,
|
|
|
+ .cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,
|
|
|
+ .otp_exe_param = 0,
|
|
|
+ .channel_counters_freq_hz = 88000,
|
|
|
+@@ -108,6 +110,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca988x hw2.0 ubiquiti",
|
|
|
+ .patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 7,
|
|
|
++ .led_pin = 0,
|
|
|
+ .cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,
|
|
|
+ .otp_exe_param = 0,
|
|
|
+ .channel_counters_freq_hz = 88000,
|
|
|
+@@ -149,6 +152,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca9887 hw1.0",
|
|
|
+ .patch_load_addr = QCA9887_HW_1_0_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 7,
|
|
|
++ .led_pin = 1,
|
|
|
+ .cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL,
|
|
|
+ .otp_exe_param = 0,
|
|
|
+ .channel_counters_freq_hz = 88000,
|
|
|
+@@ -190,6 +194,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca6174 hw3.2 sdio",
|
|
|
+ .patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 19,
|
|
|
++ .led_pin = 0,
|
|
|
+ .otp_exe_param = 0,
|
|
|
+ .channel_counters_freq_hz = 88000,
|
|
|
+ .max_probe_resp_desc_thres = 0,
|
|
|
+@@ -226,6 +231,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca6164 hw2.1",
|
|
|
+ .patch_load_addr = QCA6174_HW_2_1_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 6,
|
|
|
++ .led_pin = 0,
|
|
|
+ .otp_exe_param = 0,
|
|
|
+ .channel_counters_freq_hz = 88000,
|
|
|
+ .max_probe_resp_desc_thres = 0,
|
|
|
+@@ -266,6 +272,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca6174 hw2.1",
|
|
|
+ .patch_load_addr = QCA6174_HW_2_1_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 6,
|
|
|
++ .led_pin = 0,
|
|
|
+ .otp_exe_param = 0,
|
|
|
+ .channel_counters_freq_hz = 88000,
|
|
|
+ .max_probe_resp_desc_thres = 0,
|
|
|
+@@ -306,6 +313,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca6174 hw3.0",
|
|
|
+ .patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 6,
|
|
|
++ .led_pin = 0,
|
|
|
+ .otp_exe_param = 0,
|
|
|
+ .channel_counters_freq_hz = 88000,
|
|
|
+ .max_probe_resp_desc_thres = 0,
|
|
|
+@@ -346,6 +354,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca6174 hw3.2",
|
|
|
+ .patch_load_addr = QCA6174_HW_3_0_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 6,
|
|
|
++ .led_pin = 0,
|
|
|
+ .otp_exe_param = 0,
|
|
|
+ .channel_counters_freq_hz = 88000,
|
|
|
+ .max_probe_resp_desc_thres = 0,
|
|
|
+@@ -390,6 +399,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca99x0 hw2.0",
|
|
|
+ .patch_load_addr = QCA99X0_HW_2_0_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 7,
|
|
|
++ .led_pin = 17,
|
|
|
+ .otp_exe_param = 0x00000700,
|
|
|
+ .continuous_frag_desc = true,
|
|
|
+ .cck_rate_map_rev2 = true,
|
|
|
+@@ -436,6 +446,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca9984/qca9994 hw1.0",
|
|
|
+ .patch_load_addr = QCA9984_HW_1_0_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 7,
|
|
|
++ .led_pin = 17,
|
|
|
+ .cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,
|
|
|
+ .otp_exe_param = 0x00000700,
|
|
|
+ .continuous_frag_desc = true,
|
|
|
+@@ -488,6 +499,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca9888 hw2.0",
|
|
|
+ .patch_load_addr = QCA9888_HW_2_0_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 7,
|
|
|
++ .led_pin = 17,
|
|
|
+ .cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,
|
|
|
+ .otp_exe_param = 0x00000700,
|
|
|
+ .continuous_frag_desc = true,
|
|
|
+@@ -538,6 +550,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca9377 hw1.0",
|
|
|
+ .patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 6,
|
|
|
++ .led_pin = 0,
|
|
|
+ .otp_exe_param = 0,
|
|
|
+ .channel_counters_freq_hz = 88000,
|
|
|
+ .max_probe_resp_desc_thres = 0,
|
|
|
+@@ -578,6 +591,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca9377 hw1.1",
|
|
|
+ .patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 6,
|
|
|
++ .led_pin = 0,
|
|
|
+ .otp_exe_param = 0,
|
|
|
+ .channel_counters_freq_hz = 88000,
|
|
|
+ .max_probe_resp_desc_thres = 0,
|
|
|
+@@ -620,6 +634,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca9377 hw1.1 sdio",
|
|
|
+ .patch_load_addr = QCA9377_HW_1_0_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 19,
|
|
|
++ .led_pin = 0,
|
|
|
+ .otp_exe_param = 0,
|
|
|
+ .channel_counters_freq_hz = 88000,
|
|
|
+ .max_probe_resp_desc_thres = 0,
|
|
|
+@@ -653,6 +668,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .name = "qca4019 hw1.0",
|
|
|
+ .patch_load_addr = QCA4019_HW_1_0_PATCH_LOAD_ADDR,
|
|
|
+ .uart_pin = 7,
|
|
|
++ .led_pin = 0,
|
|
|
+ .cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,
|
|
|
+ .otp_exe_param = 0x0010000,
|
|
|
+ .continuous_frag_desc = true,
|
|
|
+@@ -698,6 +714,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = {
|
|
|
+ .dev_id = 0,
|
|
|
+ .bus = ATH10K_BUS_SNOC,
|
|
|
+ .name = "wcn3990 hw1.0",
|
|
|
++ .led_pin = 0,
|
|
|
+ .continuous_frag_desc = true,
|
|
|
+ .tx_chain_mask = 0x7,
|
|
|
+ .rx_chain_mask = 0x7,
|
|
|
+@@ -3224,6 +3241,10 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode,
|
|
|
+ goto err_hif_stop;
|
|
|
+ }
|
|
|
+
|
|
|
++ status = ath10k_leds_start(ar);
|
|
|
++ if (status)
|
|
|
++ goto err_hif_stop;
|
|
|
++
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ err_hif_stop:
|
|
|
+@@ -3482,9 +3503,18 @@ static void ath10k_core_register_work(struct work_struct *work)
|
|
|
+ goto err_spectral_destroy;
|
|
|
+ }
|
|
|
+
|
|
|
++ status = ath10k_leds_register(ar);
|
|
|
++ if (status) {
|
|
|
++ ath10k_err(ar, "could not register leds: %d\n",
|
|
|
++ status);
|
|
|
++ goto err_thermal_unregister;
|
|
|
++ }
|
|
|
++
|
|
|
+ set_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags);
|
|
|
+ return;
|
|
|
+
|
|
|
++err_thermal_unregister:
|
|
|
++ ath10k_thermal_unregister(ar);
|
|
|
+ err_spectral_destroy:
|
|
|
+ ath10k_spectral_destroy(ar);
|
|
|
+ err_debug_destroy:
|
|
|
+@@ -3520,6 +3550,8 @@ void ath10k_core_unregister(struct ath10k *ar)
|
|
|
+ if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags))
|
|
|
+ return;
|
|
|
+
|
|
|
++ ath10k_leds_unregister(ar);
|
|
|
++
|
|
|
+ ath10k_thermal_unregister(ar);
|
|
|
+ /* Stop spectral before unregistering from mac80211 to remove the
|
|
|
+ * relayfs debugfs file cleanly. Otherwise the parent debugfs tree
|
|
|
+diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
|
|
|
+index b00099f0b24e..446dca74f06a 100644
|
|
|
+--- a/drivers/net/wireless/ath/ath10k/core.h
|
|
|
++++ b/drivers/net/wireless/ath/ath10k/core.h
|
|
|
+@@ -15,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"
|
|
|
+@@ -1258,6 +1259,13 @@ struct ath10k {
|
|
|
+ bool utf_monitor;
|
|
|
+ } 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;
|
|
|
+diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h
|
|
|
+index 48897e5eca06..442091c6dfd2 100644
|
|
|
+--- a/drivers/net/wireless/ath/ath10k/hw.h
|
|
|
++++ b/drivers/net/wireless/ath/ath10k/hw.h
|
|
|
+@@ -512,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
|
|
|
+diff --git a/drivers/net/wireless/ath/ath10k/leds.c b/drivers/net/wireless/ath/ath10k/leds.c
|
|
|
+new file mode 100644
|
|
|
+index 000000000000..9b1d04eb4265
|
|
|
+--- /dev/null
|
|
|
++++ b/drivers/net/wireless/ath/ath10k/leds.c
|
|
|
+@@ -0,0 +1,90 @@
|
|
|
++// SPDX-License-Identifier: ISC
|
|
|
++/*
|
|
|
++ * Copyright (c) 2005-2011 Atheros Communications Inc.
|
|
|
++ * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
|
|
|
++ * Copyright (c) 2018 Sebastian Gottschall <[email protected]>
|
|
|
++ * Copyright (c) 2018 The Linux Foundation. All rights reserved.
|
|
|
++ */
|
|
|
++
|
|
|
++#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/drivers/net/wireless/ath/ath10k/leds.h b/drivers/net/wireless/ath/ath10k/leds.h
|
|
|
+new file mode 100644
|
|
|
+index 000000000000..56325b0875e5
|
|
|
+--- /dev/null
|
|
|
++++ b/drivers/net/wireless/ath/ath10k/leds.h
|
|
|
+@@ -0,0 +1,34 @@
|
|
|
++/* SPDX-License-Identifier: ISC */
|
|
|
++/*
|
|
|
++ * Copyright (c) 2005-2011 Atheros Communications Inc.
|
|
|
++ * Copyright (c) 2011-2017 Qualcomm Atheros, Inc.
|
|
|
++ * Copyright (c) 2018 Sebastian Gottschall <[email protected]>
|
|
|
++ * Copyright (c) 2018 The Linux Foundation. All rights reserved.
|
|
|
++ */
|
|
|
++
|
|
|
++#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/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
|
|
|
+index e322b528baaf..3bf67b2ecd6d 100644
|
|
|
+--- a/drivers/net/wireless/ath/ath10k/mac.c
|
|
|
++++ b/drivers/net/wireless/ath/ath10k/mac.c
|
|
|
+@@ -25,6 +25,7 @@
|
|
|
+ #include "wmi-tlv.h"
|
|
|
+ #include "wmi-ops.h"
|
|
|
+ #include "wow.h"
|
|
|
++#include "leds.h"
|
|
|
+
|
|
|
+ /*********/
|
|
|
+ /* Rates */
|
|
|
+diff --git a/drivers/net/wireless/ath/ath10k/wmi-ops.h b/drivers/net/wireless/ath/ath10k/wmi-ops.h
|
|
|
+index aa57d807491c..f3f6b5954b27 100644
|
|
|
+--- a/drivers/net/wireless/ath/ath10k/wmi-ops.h
|
|
|
++++ b/drivers/net/wireless/ath/ath10k/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/drivers/net/wireless/ath/ath10k/wmi-tlv.c b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
|
|
|
+index aed97fd121ba..dbaf26d6a7a6 100644
|
|
|
+--- a/drivers/net/wireless/ath/ath10k/wmi-tlv.c
|
|
|
++++ b/drivers/net/wireless/ath/ath10k/wmi-tlv.c
|
|
|
+@@ -4606,6 +4606,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/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c
|
|
|
+index 80d255aaff1b..fe2344598364 100644
|
|
|
+--- a/drivers/net/wireless/ath/ath10k/wmi.c
|
|
|
++++ b/drivers/net/wireless/ath/ath10k/wmi.c
|
|
|
+@@ -7493,6 +7493,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)
|
|
|
+@@ -9157,6 +9200,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 */
|
|
|
+@@ -9227,6 +9273,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 */
|
|
|
+@@ -9299,6 +9347,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 */
|
|
|
+ };
|
|
|
+
|
|
|
+@@ -9370,6 +9420,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 */
|
|
|
+@@ -9451,6 +9503,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)
|
|
|
+diff --git a/drivers/net/wireless/ath/ath10k/wmi.h b/drivers/net/wireless/ath/ath10k/wmi.h
|
|
|
+index 2379501225a4..0faefc0a9a40 100644
|
|
|
+--- a/drivers/net/wireless/ath/ath10k/wmi.h
|
|
|
++++ b/drivers/net/wireless/ath/ath10k/wmi.h
|
|
|
+@@ -3034,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;
|
|
|
+--
|
|
|
+2.43.0
|
|
|
+
|
Christian Marangi