mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-10-31 05:54:26 -04:00 
			
		
		
		
	The mac80211 driver backport has been updated to version 6.11. Let's also push ath10k-ct driver forward. The unsupported feature 'NL80211_EXT_FEATURE_ETHTOOL_VDEV_STATS' has been dropped since it looks like something for debugging and not supported by the mainline. Signed-off-by: Shiji Yang <yangshiji66@qq.com> Link: https://github.com/openwrt/openwrt/pull/16514 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
		
			
				
	
	
		
			617 lines
		
	
	
		
			19 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			617 lines
		
	
	
		
			19 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
| From 8e1debd82466a3fe711784ab37e6b54e56011267 Mon Sep 17 00:00:00 2001
 | |
| From: Sebastian Gottschall <s.gottschall@dd-wrt.com>
 | |
| 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 <s.gottschall@dd-wrt.com>
 | |
| Reviewed-by: Steve deRosier <derosier@cal-sierra.com>
 | |
| [kvalo: major reorg and cleanup]
 | |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 | |
| [ansuel: rebase and small cleanup]
 | |
| Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
 | |
| Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
 | |
| Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
 | |
| Link: https://msgid.link/20230611080505.17393-1-ansuelsmth@gmail.com
 | |
| ---
 | |
|  ath10k-6.10/Kconfig   |  6 ++
 | |
|  ath10k-6.10/Makefile  |  1 +
 | |
|  ath10k-6.10/core.c    | 32 ++++++++
 | |
|  ath10k-6.10/core.h    |  8 ++
 | |
|  ath10k-6.10/hw.h      |  1 +
 | |
|  ath10k-6.10/leds.c    | 90 +++++++++++++++++++++++
 | |
|  ath10k-6.10/leds.h    | 34 +++++++++
 | |
|  ath10k-6.10/mac.c     |  1 +
 | |
|  ath10k-6.10/wmi-ops.h | 32 ++++++++
 | |
|  ath10k-6.10/wmi-tlv.c |  2 +
 | |
|  ath10k-6.10/wmi.c     | 54 ++++++++++++++
 | |
|  ath10k-6.10/wmi.h     | 35 +++++++++
 | |
|  12 files changed, 296 insertions(+)
 | |
|  create mode 100644 ath10k-6.10/leds.c
 | |
|  create mode 100644 ath10k-6.10/leds.h
 | |
| 
 | |
| --- a/ath10k-6.10/Kconfig
 | |
| +++ b/ath10k-6.10/Kconfig
 | |
| @@ -68,6 +68,12 @@ config ATH10K_DEBUGFS
 | |
|  
 | |
|  	  If unsure, say Y to make it easier to debug problems.
 | |
|  
 | |
| +config ATH10K_LEDS
 | |
| +	bool
 | |
| +	depends on ATH10K
 | |
| +	depends on LEDS_CLASS=y || LEDS_CLASS=MAC80211
 | |
| +	default y
 | |
| +
 | |
|  config ATH10K_SPECTRAL
 | |
|  	bool "Atheros ath10k spectral scan support"
 | |
|  	depends on ATH10K_DEBUGFS
 | |
| --- a/ath10k-6.10/Makefile
 | |
| +++ b/ath10k-6.10/Makefile
 | |
| @@ -20,6 +20,7 @@ ath10k_core-$(CONFIG_ATH10K_SPECTRAL) +=
 | |
|  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_ATH10K_CE) += ce.o
 | |
| --- a/ath10k-6.10/core.c
 | |
| +++ b/ath10k-6.10/core.c
 | |
| @@ -29,6 +29,7 @@
 | |
|  #include "testmode.h"
 | |
|  #include "wmi-ops.h"
 | |
|  #include "coredump.h"
 | |
| +#include "leds.h"
 | |
|  
 | |
|  /* Disable ath10k-ct DBGLOG output by default */
 | |
|  unsigned int ath10k_debug_mask = ATH10K_DBG_NO_DBGLOG;
 | |
| @@ -81,6 +82,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -121,6 +123,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -162,6 +165,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -203,6 +207,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -239,6 +244,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -279,6 +285,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -319,6 +326,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -359,6 +367,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -403,6 +412,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -449,6 +459,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -501,6 +512,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -551,6 +563,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -591,6 +604,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -633,6 +647,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -666,6 +681,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -711,6 +727,7 @@ static const struct ath10k_hw_params ath
 | |
|  		.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,
 | |
| @@ -4073,6 +4090,10 @@ int ath10k_core_start(struct ath10k *ar,
 | |
|  			ath10k_wmi_check_apply_board_power_ctl_table(ar);
 | |
|  	}
 | |
|  
 | |
| +	status = ath10k_leds_start(ar);
 | |
| +	if (status)
 | |
| +		goto err_hif_stop;
 | |
| +
 | |
|  	return 0;
 | |
|  
 | |
|  err_hif_stop:
 | |
| @@ -4334,9 +4355,18 @@ static void ath10k_core_register_work(st
 | |
|  		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:
 | |
| @@ -4396,6 +4426,8 @@ void ath10k_core_unregister(struct ath10
 | |
|  	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
 | |
| --- a/ath10k-6.10/core.h
 | |
| +++ b/ath10k-6.10/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"
 | |
| @@ -1592,6 +1593,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;
 | |
| --- a/ath10k-6.10/hw.h
 | |
| +++ b/ath10k-6.10/hw.h
 | |
| @@ -516,6 +516,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
 | |
| --- /dev/null
 | |
| +++ b/ath10k-6.10/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 <s.gottschall@dd-wrt.com>
 | |
| + * 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);
 | |
| +}
 | |
| +
 | |
| --- /dev/null
 | |
| +++ b/ath10k-6.10/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 <s.gottschall@dd-wrt.com>
 | |
| + * 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_ */
 | |
| --- a/ath10k-6.10/mac.c
 | |
| +++ b/ath10k-6.10/mac.c
 | |
| @@ -26,6 +26,7 @@
 | |
|  #include "wmi-tlv.h"
 | |
|  #include "wmi-ops.h"
 | |
|  #include "wow.h"
 | |
| +#include "leds.h"
 | |
|  
 | |
|  /*********/
 | |
|  /* Rates */
 | |
| --- a/ath10k-6.10/wmi-ops.h
 | |
| +++ b/ath10k-6.10/wmi-ops.h
 | |
| @@ -228,7 +228,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);
 | |
| @@ -1147,6 +1150,35 @@ ath10k_wmi_force_fw_hang(struct ath10k *
 | |
|  	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)
 | |
|  {
 | |
| --- a/ath10k-6.10/wmi-tlv.c
 | |
| +++ b/ath10k-6.10/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 = {
 | |
| --- a/ath10k-6.10/wmi.c
 | |
| +++ b/ath10k-6.10/wmi.c
 | |
| @@ -8467,6 +8467,49 @@ ath10k_wmi_op_gen_peer_set_param(struct
 | |
|  	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)
 | |
| @@ -10274,6 +10317,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 */
 | |
| @@ -10344,6 +10390,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 */
 | |
| @@ -10423,6 +10471,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 */
 | |
|  };
 | |
|  
 | |
| @@ -10494,6 +10544,8 @@ static const struct wmi_ops wmi_10_2_4_o
 | |
|  		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 */
 | |
| @@ -10576,6 +10628,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)
 | |
| --- a/ath10k-6.10/wmi.h
 | |
| +++ b/ath10k-6.10/wmi.h
 | |
| @@ -3137,6 +3137,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;
 |