b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | From: Sebastian Gottschall <s.gottschall@newmedia-net.de> |
| 2 | |
| 3 | Adds LED and GPIO Control support for 988x, 9887, 9888, 99x0, 9984 based |
| 4 | chipsets with on chipset connected led's using WMI Firmware API. The LED |
| 5 | device will get available named as "ath10k-phyX" at sysfs and can be controlled |
| 6 | with various triggers. adds also debugfs interface for gpio control. |
| 7 | |
| 8 | This patch is specific for OpenWRt base, as is use old backported package |
| 9 | with old wireless source. Support for QCA9984 is removed. |
| 10 | Reworked to use ath10k-ct custom source |
| 11 | |
| 12 | |
| 13 | Signed-off-by: Sebastian Gottschall <s.gottschall@dd-wrt.com> |
| 14 | Reviewed-by: Steve deRosier <derosier@cal-sierra.com> |
| 15 | [kvalo: major reorg and cleanup] |
| 16 | Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| 17 | Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> |
| 18 | --- |
| 19 | |
| 20 | v13: |
| 21 | |
| 22 | * only compile tested! |
| 23 | |
| 24 | * fix all checkpatch warnings |
| 25 | |
| 26 | * fix commit log |
| 27 | |
| 28 | * sizeof(struct ath10k_gpiocontrol) -> sizeof(*gpio) |
| 29 | |
| 30 | * unsigned -> unsigned int |
| 31 | |
| 32 | * remove GPIOLIB code, that should be added in a separate patch |
| 33 | |
| 34 | * rename gpio.c to leds.c |
| 35 | |
| 36 | * add leds.h |
| 37 | |
| 38 | * rename some functions: |
| 39 | |
| 40 | ath10k_attach_led() -> ath10k_leds_register() |
| 41 | ath10k_unregister_led() -> ath10k_leds_unregister() |
| 42 | ath10k_reset_led_pin() -> ath10k_leds_start() |
| 43 | |
| 44 | * call ath10k_leds_unregister() before ath10k_thermal_unregister() to preserve ordering |
| 45 | |
| 46 | * call ath10k_leds_start() only from ath10k_core_start() and not from mac.c |
| 47 | |
| 48 | * rename struct ath10k_gpiocontrol as anonymous function under struct |
| 49 | ath10k::leds, no need for memory allocation |
| 50 | |
| 51 | * merge ath10k_add_led() to ath10k_attach_led(), which is it's only caller |
| 52 | |
| 53 | * remove #if IS_ENABLED() checks from most of places, memory savings from those were not worth it |
| 54 | |
| 55 | * Kconfig help text improvement and move it lower in the menu, also don't enable it by default |
| 56 | |
| 57 | * switch to set_brightness_blocking() so that the callback can sleep, |
| 58 | then no need to use ath10k_wmi_cmd_send_nowait() and can take mutex |
| 59 | to access ar->state |
| 60 | |
| 61 | * don't touch ath10k_wmi_pdev_get_temperature() |
| 62 | |
| 63 | * as QCA6174/QCA9377 are not (yet) supported don't add the command to WMI-TLV interface |
| 64 | |
| 65 | * remove debugfs interface, that should be added in another patch |
| 66 | |
| 67 | * cleanup includes |
| 68 | |
| 69 | ath10k-5.10/Kconfig | 10 +++ |
| 70 | ath10k-5.10/Makefile | 1 + |
| 71 | ath10k-5.10/core.c | 22 +++++++ |
| 72 | ath10k-5.10/core.h | 9 ++- |
| 73 | ath10k-5.10/hw.h | 1 + |
| 74 | ath10k-5.10/leds.c | 103 ++++++++++++++++++++++++++++++ |
| 75 | ath10k-5.10/leds.h | 45 +++++++++++++ |
| 76 | ath10k-5.10/mac.c | 1 + |
| 77 | ath10k-5.10/wmi-ops.h | 32 ++++++++++ |
| 78 | ath10k-5.10/wmi-tlv.c | 2 + |
| 79 | ath10k-5.10/wmi.c | 54 ++++++++++++++++ |
| 80 | ath10k-5.10/wmi.h | 35 ++++++++++ |
| 81 | 12 files changed, 314 insertions(+), 1 deletion(-) |
| 82 | create mode 100644 ath10k-5.10/leds.c |
| 83 | create mode 100644 ath10k-5.10/leds.h |
| 84 | |
| 85 | --- a/ath10k-5.10/Kconfig |
| 86 | +++ b/ath10k-5.10/Kconfig |
| 87 | @@ -65,6 +65,16 @@ config ATH10K_DEBUGFS |
| 88 | |
| 89 | If unsure, say Y to make it easier to debug problems. |
| 90 | |
| 91 | +config ATH10K_LEDS |
| 92 | + bool "Atheros ath10k LED support" |
| 93 | + depends on ATH10K |
| 94 | + select MAC80211_LEDS |
| 95 | + select LEDS_CLASS |
| 96 | + select NEW_LEDS |
| 97 | + default y |
| 98 | + ---help--- |
| 99 | + This option is necessary, if you want LED support for chipset connected led pins. If unsure, say N. |
| 100 | + |
| 101 | config ATH10K_SPECTRAL |
| 102 | bool "Atheros ath10k spectral scan support" |
| 103 | depends on ATH10K_DEBUGFS |
| 104 | --- a/ath10k-5.10/Makefile |
| 105 | +++ b/ath10k-5.10/Makefile |
| 106 | @@ -20,6 +20,7 @@ ath10k_core-$(CONFIG_ATH10K_SPECTRAL) += |
| 107 | ath10k_core-$(CONFIG_NL80211_TESTMODE) += testmode.o |
| 108 | ath10k_core-$(CONFIG_ATH10K_TRACING) += trace.o |
| 109 | ath10k_core-$(CONFIG_THERMAL) += thermal.o |
| 110 | +ath10k_core-$(CONFIG_ATH10K_LEDS) += leds.o |
| 111 | ath10k_core-$(CONFIG_MAC80211_DEBUGFS) += debugfs_sta.o |
| 112 | ath10k_core-$(CONFIG_PM) += wow.o |
| 113 | ath10k_core-$(CONFIG_ATH10K_CE) += ce.o |
| 114 | --- a/ath10k-5.10/core.c |
| 115 | +++ b/ath10k-5.10/core.c |
| 116 | @@ -26,6 +26,7 @@ |
| 117 | #include "testmode.h" |
| 118 | #include "wmi-ops.h" |
| 119 | #include "coredump.h" |
| 120 | +#include "leds.h" |
| 121 | |
| 122 | /* Disable ath10k-ct DBGLOG output by default */ |
| 123 | unsigned int ath10k_debug_mask = ATH10K_DBG_NO_DBGLOG; |
| 124 | @@ -68,6 +69,7 @@ static const struct ath10k_hw_params ath |
| 125 | .dev_id = QCA988X_2_0_DEVICE_ID, |
| 126 | .bus = ATH10K_BUS_PCI, |
| 127 | .name = "qca988x hw2.0", |
| 128 | + .led_pin = 1, |
| 129 | .patch_load_addr = QCA988X_HW_2_0_PATCH_LOAD_ADDR, |
| 130 | .uart_pin = 7, |
| 131 | .cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL, |
| 132 | @@ -137,6 +139,7 @@ static const struct ath10k_hw_params ath |
| 133 | .dev_id = QCA9887_1_0_DEVICE_ID, |
| 134 | .bus = ATH10K_BUS_PCI, |
| 135 | .name = "qca9887 hw1.0", |
| 136 | + .led_pin = 1, |
| 137 | .patch_load_addr = QCA9887_HW_1_0_PATCH_LOAD_ADDR, |
| 138 | .uart_pin = 7, |
| 139 | .cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_ALL, |
| 140 | @@ -342,6 +345,7 @@ static const struct ath10k_hw_params ath |
| 141 | .dev_id = QCA99X0_2_0_DEVICE_ID, |
| 142 | .bus = ATH10K_BUS_PCI, |
| 143 | .name = "qca99x0 hw2.0", |
| 144 | + .led_pin = 17, |
| 145 | .patch_load_addr = QCA99X0_HW_2_0_PATCH_LOAD_ADDR, |
| 146 | .uart_pin = 7, |
| 147 | .otp_exe_param = 0x00000700, |
| 148 | @@ -382,6 +386,7 @@ static const struct ath10k_hw_params ath |
| 149 | .dev_id = QCA9984_1_0_DEVICE_ID, |
| 150 | .bus = ATH10K_BUS_PCI, |
| 151 | .name = "qca9984/qca9994 hw1.0", |
| 152 | + .led_pin = 17, |
| 153 | .patch_load_addr = QCA9984_HW_1_0_PATCH_LOAD_ADDR, |
| 154 | .uart_pin = 7, |
| 155 | .cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH, |
| 156 | @@ -429,6 +434,7 @@ static const struct ath10k_hw_params ath |
| 157 | .dev_id = QCA9888_2_0_DEVICE_ID, |
| 158 | .bus = ATH10K_BUS_PCI, |
| 159 | .name = "qca9888 hw2.0", |
| 160 | + .led_pin = 17, |
| 161 | .patch_load_addr = QCA9888_HW_2_0_PATCH_LOAD_ADDR, |
| 162 | .uart_pin = 7, |
| 163 | .cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH, |
| 164 | @@ -3705,6 +3711,10 @@ int ath10k_core_start(struct ath10k *ar, |
| 165 | ath10k_wmi_check_apply_board_power_ctl_table(ar); |
| 166 | } |
| 167 | |
| 168 | + status = ath10k_leds_start(ar); |
| 169 | + if (status) |
| 170 | + goto err_hif_stop; |
| 171 | + |
| 172 | return 0; |
| 173 | |
| 174 | err_hif_stop: |
| 175 | @@ -3963,9 +3973,18 @@ static void ath10k_core_register_work(st |
| 176 | goto err_spectral_destroy; |
| 177 | } |
| 178 | |
| 179 | + status = ath10k_leds_register(ar); |
| 180 | + if (status) { |
| 181 | + ath10k_err(ar, "could not register leds: %d\n", |
| 182 | + status); |
| 183 | + goto err_thermal_unregister; |
| 184 | + } |
| 185 | + |
| 186 | set_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags); |
| 187 | return; |
| 188 | |
| 189 | +err_thermal_unregister: |
| 190 | + ath10k_thermal_unregister(ar); |
| 191 | err_spectral_destroy: |
| 192 | ath10k_spectral_destroy(ar); |
| 193 | err_debug_destroy: |
| 194 | @@ -4025,6 +4044,8 @@ void ath10k_core_unregister(struct ath10 |
| 195 | if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags)) |
| 196 | return; |
| 197 | |
| 198 | + ath10k_leds_unregister(ar); |
| 199 | + |
| 200 | ath10k_thermal_unregister(ar); |
| 201 | /* Stop spectral before unregistering from mac80211 to remove the |
| 202 | * relayfs debugfs file cleanly. Otherwise the parent debugfs tree |
| 203 | --- a/ath10k-5.10/core.h |
| 204 | +++ b/ath10k-5.10/core.h |
| 205 | @@ -14,6 +14,7 @@ |
| 206 | #include <linux/pci.h> |
| 207 | #include <linux/uuid.h> |
| 208 | #include <linux/time.h> |
| 209 | +#include <linux/leds.h> |
| 210 | |
| 211 | #include "htt.h" |
| 212 | #include "htc.h" |
| 213 | @@ -1557,6 +1558,13 @@ struct ath10k { |
| 214 | } testmode; |
| 215 | |
| 216 | struct { |
| 217 | + struct gpio_led wifi_led; |
| 218 | + struct led_classdev cdev; |
| 219 | + char label[48]; |
| 220 | + u32 gpio_state_pin; |
| 221 | + } leds; |
| 222 | + |
| 223 | + struct { |
| 224 | /* protected by data_lock */ |
| 225 | u32 rx_crc_err_drop; |
| 226 | u32 fw_crash_counter; |
| 227 | --- a/ath10k-5.10/hw.h |
| 228 | +++ b/ath10k-5.10/hw.h |
| 229 | @@ -521,6 +521,7 @@ struct ath10k_hw_params { |
| 230 | const char *name; |
| 231 | u32 patch_load_addr; |
| 232 | int uart_pin; |
| 233 | + int led_pin; |
| 234 | u32 otp_exe_param; |
| 235 | |
| 236 | /* Type of hw cycle counter wraparound logic, for more info |
| 237 | --- /dev/null |
| 238 | +++ b/ath10k-5.10/leds.c |
| 239 | @@ -0,0 +1,103 @@ |
| 240 | +/* |
| 241 | + * Copyright (c) 2005-2011 Atheros Communications Inc. |
| 242 | + * Copyright (c) 2011-2017 Qualcomm Atheros, Inc. |
| 243 | + * Copyright (c) 2018 Sebastian Gottschall <s.gottschall@dd-wrt.com> |
| 244 | + * Copyright (c) 2018, The Linux Foundation. All rights reserved. |
| 245 | + * |
| 246 | + * Permission to use, copy, modify, and/or distribute this software for any |
| 247 | + * purpose with or without fee is hereby granted, provided that the above |
| 248 | + * copyright notice and this permission notice appear in all copies. |
| 249 | + * |
| 250 | + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
| 251 | + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
| 252 | + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
| 253 | + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
| 254 | + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
| 255 | + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
| 256 | + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 257 | + */ |
| 258 | + |
| 259 | +#include <linux/leds.h> |
| 260 | + |
| 261 | +#include "core.h" |
| 262 | +#include "wmi.h" |
| 263 | +#include "wmi-ops.h" |
| 264 | + |
| 265 | +#include "leds.h" |
| 266 | + |
| 267 | +static int ath10k_leds_set_brightness_blocking(struct led_classdev *led_cdev, |
| 268 | + enum led_brightness brightness) |
| 269 | +{ |
| 270 | + struct ath10k *ar = container_of(led_cdev, struct ath10k, |
| 271 | + leds.cdev); |
| 272 | + struct gpio_led *led = &ar->leds.wifi_led; |
| 273 | + |
| 274 | + mutex_lock(&ar->conf_mutex); |
| 275 | + |
| 276 | + if (ar->state != ATH10K_STATE_ON) |
| 277 | + goto out; |
| 278 | + |
| 279 | + ar->leds.gpio_state_pin = (brightness != LED_OFF) ^ led->active_low; |
| 280 | + ath10k_wmi_gpio_output(ar, led->gpio, ar->leds.gpio_state_pin); |
| 281 | + |
| 282 | +out: |
| 283 | + mutex_unlock(&ar->conf_mutex); |
| 284 | + |
| 285 | + return 0; |
| 286 | +} |
| 287 | + |
| 288 | +int ath10k_leds_start(struct ath10k *ar) |
| 289 | +{ |
| 290 | + if (ar->hw_params.led_pin == 0) |
| 291 | + /* leds not supported */ |
| 292 | + return 0; |
| 293 | + |
| 294 | + /* under some circumstances, the gpio pin gets reconfigured |
| 295 | + * to default state by the firmware, so we need to |
| 296 | + * reconfigure it this behaviour has only ben seen on |
| 297 | + * QCA9984 and QCA99XX devices so far |
| 298 | + */ |
| 299 | + ath10k_wmi_gpio_config(ar, ar->hw_params.led_pin, 0, |
| 300 | + WMI_GPIO_PULL_NONE, WMI_GPIO_INTTYPE_DISABLE); |
| 301 | + ath10k_wmi_gpio_output(ar, ar->hw_params.led_pin, 1); |
| 302 | + |
| 303 | + return 0; |
| 304 | +} |
| 305 | + |
| 306 | +int ath10k_leds_register(struct ath10k *ar) |
| 307 | +{ |
| 308 | + int ret; |
| 309 | + |
| 310 | + if (ar->hw_params.led_pin == 0) |
| 311 | + /* leds not supported */ |
| 312 | + return 0; |
| 313 | + |
| 314 | + snprintf(ar->leds.label, sizeof(ar->leds.label), "ath10k-%s", |
| 315 | + wiphy_name(ar->hw->wiphy)); |
| 316 | + ar->leds.wifi_led.active_low = 1; |
| 317 | + ar->leds.wifi_led.gpio = ar->hw_params.led_pin; |
| 318 | + ar->leds.wifi_led.name = ar->leds.label; |
| 319 | + ar->leds.wifi_led.default_state = LEDS_GPIO_DEFSTATE_KEEP; |
| 320 | + |
| 321 | + ar->leds.cdev.name = ar->leds.label; |
| 322 | + ar->leds.cdev.brightness_set_blocking = ath10k_leds_set_brightness_blocking; |
| 323 | + |
| 324 | + /* FIXME: this assignment doesn't make sense as it's NULL, remove it? */ |
| 325 | + ar->leds.cdev.default_trigger = ar->leds.wifi_led.default_trigger; |
| 326 | + |
| 327 | + ret = led_classdev_register(wiphy_dev(ar->hw->wiphy), &ar->leds.cdev); |
| 328 | + if (ret) |
| 329 | + return ret; |
| 330 | + |
| 331 | + return 0; |
| 332 | +} |
| 333 | + |
| 334 | +void ath10k_leds_unregister(struct ath10k *ar) |
| 335 | +{ |
| 336 | + if (ar->hw_params.led_pin == 0) |
| 337 | + /* leds not supported */ |
| 338 | + return; |
| 339 | + |
| 340 | + led_classdev_unregister(&ar->leds.cdev); |
| 341 | +} |
| 342 | + |
| 343 | --- /dev/null |
| 344 | +++ b/ath10k-5.10/leds.h |
| 345 | @@ -0,0 +1,41 @@ |
| 346 | +/* |
| 347 | + * Copyright (c) 2018, The Linux Foundation. All rights reserved. |
| 348 | + * |
| 349 | + * Permission to use, copy, modify, and/or distribute this software for any |
| 350 | + * purpose with or without fee is hereby granted, provided that the above |
| 351 | + * copyright notice and this permission notice appear in all copies. |
| 352 | + * |
| 353 | + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
| 354 | + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
| 355 | + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
| 356 | + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
| 357 | + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
| 358 | + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
| 359 | + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 360 | + */ |
| 361 | +#ifndef _LEDS_H_ |
| 362 | +#define _LEDS_H_ |
| 363 | + |
| 364 | +#include "core.h" |
| 365 | + |
| 366 | +#ifdef CONFIG_ATH10K_LEDS |
| 367 | +void ath10k_leds_unregister(struct ath10k *ar); |
| 368 | +int ath10k_leds_start(struct ath10k *ar); |
| 369 | +int ath10k_leds_register(struct ath10k *ar); |
| 370 | +#else |
| 371 | +static inline void ath10k_leds_unregister(struct ath10k *ar) |
| 372 | +{ |
| 373 | +} |
| 374 | + |
| 375 | +static inline int ath10k_leds_start(struct ath10k *ar) |
| 376 | +{ |
| 377 | + return 0; |
| 378 | +} |
| 379 | + |
| 380 | +static inline int ath10k_leds_register(struct ath10k *ar) |
| 381 | +{ |
| 382 | + return 0; |
| 383 | +} |
| 384 | + |
| 385 | +#endif |
| 386 | +#endif /* _LEDS_H_ */ |
| 387 | --- a/ath10k-5.10/mac.c |
| 388 | +++ b/ath10k-5.10/mac.c |
| 389 | @@ -25,6 +25,7 @@ |
| 390 | #include "wmi-tlv.h" |
| 391 | #include "wmi-ops.h" |
| 392 | #include "wow.h" |
| 393 | +#include "leds.h" |
| 394 | |
| 395 | /*********/ |
| 396 | /* Rates */ |
| 397 | --- a/ath10k-5.10/wmi-ops.h |
| 398 | +++ b/ath10k-5.10/wmi-ops.h |
| 399 | @@ -228,7 +228,10 @@ struct wmi_ops { |
| 400 | const struct wmi_bb_timing_cfg_arg *arg); |
| 401 | struct sk_buff *(*gen_per_peer_per_tid_cfg)(struct ath10k *ar, |
| 402 | const struct wmi_per_peer_per_tid_cfg_arg *arg); |
| 403 | + struct sk_buff *(*gen_gpio_config)(struct ath10k *ar, u32 gpio_num, |
| 404 | + u32 input, u32 pull_type, u32 intr_mode); |
| 405 | |
| 406 | + struct sk_buff *(*gen_gpio_output)(struct ath10k *ar, u32 gpio_num, u32 set); |
| 407 | }; |
| 408 | |
| 409 | int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id); |
| 410 | @@ -1147,6 +1150,35 @@ ath10k_wmi_force_fw_hang(struct ath10k * |
| 411 | return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->force_fw_hang_cmdid); |
| 412 | } |
| 413 | |
| 414 | +static inline int ath10k_wmi_gpio_config(struct ath10k *ar, u32 gpio_num, |
| 415 | + u32 input, u32 pull_type, u32 intr_mode) |
| 416 | +{ |
| 417 | + struct sk_buff *skb; |
| 418 | + |
| 419 | + if (!ar->wmi.ops->gen_gpio_config) |
| 420 | + return -EOPNOTSUPP; |
| 421 | + |
| 422 | + skb = ar->wmi.ops->gen_gpio_config(ar, gpio_num, input, pull_type, intr_mode); |
| 423 | + if (IS_ERR(skb)) |
| 424 | + return PTR_ERR(skb); |
| 425 | + |
| 426 | + return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->gpio_config_cmdid); |
| 427 | +} |
| 428 | + |
| 429 | +static inline int ath10k_wmi_gpio_output(struct ath10k *ar, u32 gpio_num, u32 set) |
| 430 | +{ |
| 431 | + struct sk_buff *skb; |
| 432 | + |
| 433 | + if (!ar->wmi.ops->gen_gpio_config) |
| 434 | + return -EOPNOTSUPP; |
| 435 | + |
| 436 | + skb = ar->wmi.ops->gen_gpio_output(ar, gpio_num, set); |
| 437 | + if (IS_ERR(skb)) |
| 438 | + return PTR_ERR(skb); |
| 439 | + |
| 440 | + return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->gpio_output_cmdid); |
| 441 | +} |
| 442 | + |
| 443 | static inline int |
| 444 | ath10k_wmi_dbglog_cfg(struct ath10k *ar, u64 module_enable, u32 log_level) |
| 445 | { |
| 446 | --- a/ath10k-5.10/wmi-tlv.c |
| 447 | +++ b/ath10k-5.10/wmi-tlv.c |
| 448 | @@ -4594,6 +4594,8 @@ static const struct wmi_ops wmi_tlv_ops |
| 449 | .gen_echo = ath10k_wmi_tlv_op_gen_echo, |
| 450 | .gen_vdev_spectral_conf = ath10k_wmi_tlv_op_gen_vdev_spectral_conf, |
| 451 | .gen_vdev_spectral_enable = ath10k_wmi_tlv_op_gen_vdev_spectral_enable, |
| 452 | + /* .gen_gpio_config not implemented */ |
| 453 | + /* .gen_gpio_output not implemented */ |
| 454 | }; |
| 455 | |
| 456 | static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = { |
| 457 | --- a/ath10k-5.10/wmi.c |
| 458 | +++ b/ath10k-5.10/wmi.c |
| 459 | @@ -8409,6 +8409,49 @@ ath10k_wmi_op_gen_peer_set_param(struct |
| 460 | return skb; |
| 461 | } |
| 462 | |
| 463 | +static struct sk_buff *ath10k_wmi_op_gen_gpio_config(struct ath10k *ar, |
| 464 | + u32 gpio_num, u32 input, |
| 465 | + u32 pull_type, u32 intr_mode) |
| 466 | +{ |
| 467 | + struct wmi_gpio_config_cmd *cmd; |
| 468 | + struct sk_buff *skb; |
| 469 | + |
| 470 | + skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd)); |
| 471 | + if (!skb) |
| 472 | + return ERR_PTR(-ENOMEM); |
| 473 | + |
| 474 | + cmd = (struct wmi_gpio_config_cmd *)skb->data; |
| 475 | + cmd->pull_type = __cpu_to_le32(pull_type); |
| 476 | + cmd->gpio_num = __cpu_to_le32(gpio_num); |
| 477 | + cmd->input = __cpu_to_le32(input); |
| 478 | + cmd->intr_mode = __cpu_to_le32(intr_mode); |
| 479 | + |
| 480 | + 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", |
| 481 | + gpio_num, input, pull_type, intr_mode); |
| 482 | + |
| 483 | + return skb; |
| 484 | +} |
| 485 | + |
| 486 | +static struct sk_buff *ath10k_wmi_op_gen_gpio_output(struct ath10k *ar, |
| 487 | + u32 gpio_num, u32 set) |
| 488 | +{ |
| 489 | + struct wmi_gpio_output_cmd *cmd; |
| 490 | + struct sk_buff *skb; |
| 491 | + |
| 492 | + skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd)); |
| 493 | + if (!skb) |
| 494 | + return ERR_PTR(-ENOMEM); |
| 495 | + |
| 496 | + cmd = (struct wmi_gpio_output_cmd *)skb->data; |
| 497 | + cmd->gpio_num = __cpu_to_le32(gpio_num); |
| 498 | + cmd->set = __cpu_to_le32(set); |
| 499 | + |
| 500 | + ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi gpio_output gpio_num 0x%08x set 0x%08x\n", |
| 501 | + gpio_num, set); |
| 502 | + |
| 503 | + return skb; |
| 504 | +} |
| 505 | + |
| 506 | static struct sk_buff * |
| 507 | ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id, |
| 508 | enum wmi_sta_ps_mode psmode) |
| 509 | @@ -10238,6 +10281,9 @@ static const struct wmi_ops wmi_ops = { |
| 510 | .fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill, |
| 511 | .get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype, |
| 512 | .gen_echo = ath10k_wmi_op_gen_echo, |
| 513 | + .gen_gpio_config = ath10k_wmi_op_gen_gpio_config, |
| 514 | + .gen_gpio_output = ath10k_wmi_op_gen_gpio_output, |
| 515 | + |
| 516 | /* .gen_bcn_tmpl not implemented */ |
| 517 | /* .gen_prb_tmpl not implemented */ |
| 518 | /* .gen_p2p_go_bcn_ie not implemented */ |
| 519 | @@ -10308,6 +10354,8 @@ static const struct wmi_ops wmi_10_1_ops |
| 520 | .fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill, |
| 521 | .get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype, |
| 522 | .gen_echo = ath10k_wmi_op_gen_echo, |
| 523 | + .gen_gpio_config = ath10k_wmi_op_gen_gpio_config, |
| 524 | + .gen_gpio_output = ath10k_wmi_op_gen_gpio_output, |
| 525 | /* .gen_bcn_tmpl not implemented */ |
| 526 | /* .gen_prb_tmpl not implemented */ |
| 527 | /* .gen_p2p_go_bcn_ie not implemented */ |
| 528 | @@ -10387,6 +10435,8 @@ static const struct wmi_ops wmi_10_2_ops |
| 529 | .gen_delba_send = ath10k_wmi_op_gen_delba_send, |
| 530 | .fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill, |
| 531 | .get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype, |
| 532 | + .gen_gpio_config = ath10k_wmi_op_gen_gpio_config, |
| 533 | + .gen_gpio_output = ath10k_wmi_op_gen_gpio_output, |
| 534 | /* .gen_pdev_enable_adaptive_cca not implemented */ |
| 535 | }; |
| 536 | |
| 537 | @@ -10458,6 +10508,8 @@ static const struct wmi_ops wmi_10_2_4_o |
| 538 | ath10k_wmi_op_gen_pdev_enable_adaptive_cca, |
| 539 | .get_vdev_subtype = ath10k_wmi_10_2_4_op_get_vdev_subtype, |
| 540 | .gen_bb_timing = ath10k_wmi_10_2_4_op_gen_bb_timing, |
| 541 | + .gen_gpio_config = ath10k_wmi_op_gen_gpio_config, |
| 542 | + .gen_gpio_output = ath10k_wmi_op_gen_gpio_output, |
| 543 | /* .gen_bcn_tmpl not implemented */ |
| 544 | /* .gen_prb_tmpl not implemented */ |
| 545 | /* .gen_p2p_go_bcn_ie not implemented */ |
| 546 | @@ -10540,6 +10592,8 @@ static const struct wmi_ops wmi_10_4_ops |
| 547 | .gen_pdev_bss_chan_info_req = ath10k_wmi_10_2_op_gen_pdev_bss_chan_info, |
| 548 | .gen_echo = ath10k_wmi_op_gen_echo, |
| 549 | .gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config, |
| 550 | + .gen_gpio_config = ath10k_wmi_op_gen_gpio_config, |
| 551 | + .gen_gpio_output = ath10k_wmi_op_gen_gpio_output, |
| 552 | }; |
| 553 | |
| 554 | int ath10k_wmi_attach(struct ath10k *ar) |
| 555 | --- a/ath10k-5.10/wmi.h |
| 556 | +++ b/ath10k-5.10/wmi.h |
| 557 | @@ -3133,6 +3133,41 @@ enum wmi_10_4_feature_mask { |
| 558 | |
| 559 | }; |
| 560 | |
| 561 | +/* WMI_GPIO_CONFIG_CMDID */ |
| 562 | +enum { |
| 563 | + WMI_GPIO_PULL_NONE, |
| 564 | + WMI_GPIO_PULL_UP, |
| 565 | + WMI_GPIO_PULL_DOWN, |
| 566 | +}; |
| 567 | + |
| 568 | +enum { |
| 569 | + WMI_GPIO_INTTYPE_DISABLE, |
| 570 | + WMI_GPIO_INTTYPE_RISING_EDGE, |
| 571 | + WMI_GPIO_INTTYPE_FALLING_EDGE, |
| 572 | + WMI_GPIO_INTTYPE_BOTH_EDGE, |
| 573 | + WMI_GPIO_INTTYPE_LEVEL_LOW, |
| 574 | + WMI_GPIO_INTTYPE_LEVEL_HIGH |
| 575 | +}; |
| 576 | + |
| 577 | +/* WMI_GPIO_CONFIG_CMDID */ |
| 578 | +struct wmi_gpio_config_cmd { |
| 579 | + __le32 gpio_num; /* GPIO number to be setup */ |
| 580 | + __le32 input; /* 0 - Output/ 1 - Input */ |
| 581 | + __le32 pull_type; /* Pull type defined above */ |
| 582 | + __le32 intr_mode; /* Interrupt mode defined above (Input) */ |
| 583 | +} __packed; |
| 584 | + |
| 585 | +/* WMI_GPIO_OUTPUT_CMDID */ |
| 586 | +struct wmi_gpio_output_cmd { |
| 587 | + __le32 gpio_num; /* GPIO number to be setup */ |
| 588 | + __le32 set; /* Set the GPIO pin*/ |
| 589 | +} __packed; |
| 590 | + |
| 591 | +/* WMI_GPIO_INPUT_EVENTID */ |
| 592 | +struct wmi_gpio_input_event { |
| 593 | + __le32 gpio_num; /* GPIO number which changed state */ |
| 594 | +} __packed; |
| 595 | + |
| 596 | struct wmi_ext_resource_config_10_4_cmd { |
| 597 | /* contains enum wmi_host_platform_type */ |
| 598 | __le32 host_platform_config; |