package/kernel/ath10k-ct/patches/201-ath10k-4.16_add-LED-and-GPIO-controlling-support-for-various-chipsets.patch

   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
  70  ath10k-4.16/Kconfig   |  10 +++
  71  ath10k-4.16/Makefile  |   1 +
  72  ath10k-4.16/core.c    |  22 +++++++
  73  ath10k-4.16/core.h    |   9 ++-
  74  ath10k-4.16/hw.h      |   1 +
  75  ath10k-4.16/leds.c    | 103 ++++++++++++++++++++++++++++++
  76  ath10k-4.16/leds.h    |  45 +++++++++++++
  77  ath10k-4.16/mac.c     |   1 +
  78  ath10k-4.16/wmi-ops.h |  32 ++++++++++
  79  ath10k-4.16/wmi-tlv.c |   2 +
  80  ath10k-4.16/wmi.c     |  54 ++++++++++++++++
  81  ath10k-4.16/wmi.h     |  35 ++++++++++
  82  12 files changed, 314 insertions(+), 1 deletion(-)
  83  create mode 100644 ath10k-4.16/leds.c
  84  create mode 100644 ath10k-4.16/leds.h
  85 --- a/ath10k-4.16/Kconfig
  86 +++ b/ath10k-4.16/Kconfig
  87 @@ -60,6 +60,16 @@ config ATH10K_SPECTRAL
  88         ---help---
  89           Say Y to enable access to the FFT/spectral data via debugfs.
  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_TRACING
 102         bool "Atheros ath10k tracing support"
 103         depends on ATH10K
 104 --- a/ath10k-4.16/Makefile
 105 +++ b/ath10k-4.16/Makefile
 106 @@ -19,6 +19,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_DEV_COREDUMP) += coredump.o
 114 --- a/ath10k-4.16/core.c
 115 +++ b/ath10k-4.16/core.c
 116 @@ -34,6 +34,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 @@ -73,6 +74,7 @@ static const struct ath10k_hw_params ath
 125                 .id = QCA988X_HW_2_0_VERSION,
 126                 .dev_id = QCA988X_2_0_DEVICE_ID,
 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 @@ -131,6 +133,7 @@ static const struct ath10k_hw_params ath
 133                 .id = QCA9887_HW_1_0_VERSION,
 134                 .dev_id = QCA9887_1_0_DEVICE_ID,
 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 @@ -275,6 +278,7 @@ static const struct ath10k_hw_params ath
 141                 .id = QCA99X0_HW_2_0_DEV_VERSION,
 142                 .dev_id = QCA99X0_2_0_DEVICE_ID,
 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 @@ -309,6 +313,7 @@ static const struct ath10k_hw_params ath
 149                 .id = QCA9984_HW_1_0_DEV_VERSION,
 150                 .dev_id = QCA9984_1_0_DEVICE_ID,
 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 @@ -348,6 +353,7 @@ static const struct ath10k_hw_params ath
 157                 .id = QCA9888_HW_2_0_DEV_VERSION,
 158                 .dev_id = QCA9888_2_0_DEVICE_ID,
 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 @@ -3039,6 +3045,10 @@ int ath10k_core_start(struct ath10k *ar,
 165                                                    ar->eeprom_overrides.rc_txbf_probe);
 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 @@ -3285,9 +3295,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 @@ -3345,6 +3364,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-4.16/core.h
 204 +++ b/ath10k-4.16/core.h
 205 @@ -24,6 +24,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 @@ -1229,6 +1230,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 fw_crash_counter;
 226                 u32 fw_warm_reset_counter;
 227 --- a/ath10k-4.16/hw.h
 228 +++ b/ath10k-4.16/hw.h
 229 @@ -499,6 +499,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-4.16/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-4.16/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-4.16/mac.c
 388 +++ b/ath10k-4.16/mac.c
 389 @@ -33,6 +33,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-4.16/wmi-ops.h
 398 +++ b/ath10k-4.16/wmi-ops.h
 399 @@ -199,6 +199,9 @@ struct wmi_ops {
 400                                         (struct ath10k *ar,
 401                                          enum wmi_bss_survey_req_type type);
 402         struct sk_buff *(*gen_echo)(struct ath10k *ar, u32 value);
 403 +       struct sk_buff *(*gen_gpio_config)(struct ath10k *ar, u32 gpio_num,
 404 +                                          u32 input, u32 pull_type, u32 intr_mode);
 405 +       struct sk_buff *(*gen_gpio_output)(struct ath10k *ar, u32 gpio_num, u32 set);
 406  };
 407
 408  int ath10k_wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb, u32 cmd_id);
 409 @@ -975,6 +978,35 @@ ath10k_wmi_force_fw_hang(struct ath10k *
 410         return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->force_fw_hang_cmdid);
 411  }
 412
 413 +static inline int ath10k_wmi_gpio_config(struct ath10k *ar, u32 gpio_num,
 414 +                                        u32 input, u32 pull_type, u32 intr_mode)
 415 +{
 416 +       struct sk_buff *skb;
 417 +
 418 +       if (!ar->wmi.ops->gen_gpio_config)
 419 +               return -EOPNOTSUPP;
 420 +
 421 +       skb = ar->wmi.ops->gen_gpio_config(ar, gpio_num, input, pull_type, intr_mode);
 422 +       if (IS_ERR(skb))
 423 +               return PTR_ERR(skb);
 424 +
 425 +       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->gpio_config_cmdid);
 426 +}
 427 +
 428 +static inline int ath10k_wmi_gpio_output(struct ath10k *ar, u32 gpio_num, u32 set)
 429 +{
 430 +       struct sk_buff *skb;
 431 +
 432 +       if (!ar->wmi.ops->gen_gpio_config)
 433 +               return -EOPNOTSUPP;
 434 +
 435 +       skb = ar->wmi.ops->gen_gpio_output(ar, gpio_num, set);
 436 +       if (IS_ERR(skb))
 437 +               return PTR_ERR(skb);
 438 +
 439 +       return ath10k_wmi_cmd_send(ar, skb, ar->wmi.cmd->gpio_output_cmdid);
 440 +}
 441 +
 442  static inline int
 443  ath10k_wmi_dbglog_cfg(struct ath10k *ar, u64 module_enable, u32 log_level)
 444  {
 445 --- a/ath10k-4.16/wmi-tlv.c
 446 +++ b/ath10k-4.16/wmi-tlv.c
 447 @@ -3729,6 +3729,8 @@ static const struct wmi_ops wmi_tlv_ops
 448         .gen_echo = ath10k_wmi_tlv_op_gen_echo,
 449         .gen_vdev_spectral_conf = ath10k_wmi_tlv_op_gen_vdev_spectral_conf,
 450         .gen_vdev_spectral_enable = ath10k_wmi_tlv_op_gen_vdev_spectral_enable,
 451 +       /* .gen_gpio_config not implemented */
 452 +       /* .gen_gpio_output not implemented */
 453  };
 454
 455  static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = {
 456 --- a/ath10k-4.16/wmi.c
 457 +++ b/ath10k-4.16/wmi.c
 458 @@ -7301,6 +7301,49 @@ ath10k_wmi_op_gen_peer_set_param(struct
 459         return skb;
 460  }
 461
 462 +static struct sk_buff *ath10k_wmi_op_gen_gpio_config(struct ath10k *ar,
 463 +                                                    u32 gpio_num, u32 input,
 464 +                                                    u32 pull_type, u32 intr_mode)
 465 +{
 466 +       struct wmi_gpio_config_cmd *cmd;
 467 +       struct sk_buff *skb;
 468 +
 469 +       skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
 470 +       if (!skb)
 471 +               return ERR_PTR(-ENOMEM);
 472 +
 473 +       cmd = (struct wmi_gpio_config_cmd *)skb->data;
 474 +       cmd->pull_type = __cpu_to_le32(pull_type);
 475 +       cmd->gpio_num = __cpu_to_le32(gpio_num);
 476 +       cmd->input = __cpu_to_le32(input);
 477 +       cmd->intr_mode = __cpu_to_le32(intr_mode);
 478 +
 479 +       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",
 480 +                  gpio_num, input, pull_type, intr_mode);
 481 +
 482 +       return skb;
 483 +}
 484 +
 485 +static struct sk_buff *ath10k_wmi_op_gen_gpio_output(struct ath10k *ar,
 486 +                                                    u32 gpio_num, u32 set)
 487 +{
 488 +       struct wmi_gpio_output_cmd *cmd;
 489 +       struct sk_buff *skb;
 490 +
 491 +       skb = ath10k_wmi_alloc_skb(ar, sizeof(*cmd));
 492 +       if (!skb)
 493 +               return ERR_PTR(-ENOMEM);
 494 +
 495 +       cmd = (struct wmi_gpio_output_cmd *)skb->data;
 496 +       cmd->gpio_num = __cpu_to_le32(gpio_num);
 497 +       cmd->set = __cpu_to_le32(set);
 498 +
 499 +       ath10k_dbg(ar, ATH10K_DBG_WMI, "wmi gpio_output gpio_num 0x%08x set 0x%08x\n",
 500 +                  gpio_num, set);
 501 +
 502 +       return skb;
 503 +}
 504 +
 505  static struct sk_buff *
 506  ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id,
 507                              enum wmi_sta_ps_mode psmode)
 508 @@ -8916,6 +8959,9 @@ static const struct wmi_ops wmi_ops = {
 509         .fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill,
 510         .get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
 511         .gen_echo = ath10k_wmi_op_gen_echo,
 512 +       .gen_gpio_config = ath10k_wmi_op_gen_gpio_config,
 513 +       .gen_gpio_output = ath10k_wmi_op_gen_gpio_output,
 514 +
 515         /* .gen_bcn_tmpl not implemented */
 516         /* .gen_prb_tmpl not implemented */
 517         /* .gen_p2p_go_bcn_ie not implemented */
 518 @@ -8986,6 +9032,8 @@ static const struct wmi_ops wmi_10_1_ops
 519         .fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
 520         .get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
 521         .gen_echo = ath10k_wmi_op_gen_echo,
 522 +       .gen_gpio_config = ath10k_wmi_op_gen_gpio_config,
 523 +       .gen_gpio_output = ath10k_wmi_op_gen_gpio_output,
 524         /* .gen_bcn_tmpl not implemented */
 525         /* .gen_prb_tmpl not implemented */
 526         /* .gen_p2p_go_bcn_ie not implemented */
 527 @@ -9063,6 +9111,8 @@ static const struct wmi_ops wmi_10_2_ops
 528         .gen_delba_send = ath10k_wmi_op_gen_delba_send,
 529         .fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
 530         .get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
 531 +       .gen_gpio_config = ath10k_wmi_op_gen_gpio_config,
 532 +       .gen_gpio_output = ath10k_wmi_op_gen_gpio_output,
 533         /* .gen_pdev_enable_adaptive_cca not implemented */
 534  };
 535
 536 @@ -9133,6 +9183,8 @@ static const struct wmi_ops wmi_10_2_4_o
 537         .gen_pdev_enable_adaptive_cca =
 538                 ath10k_wmi_op_gen_pdev_enable_adaptive_cca,
 539         .get_vdev_subtype = ath10k_wmi_10_2_4_op_get_vdev_subtype,
 540 +       .gen_gpio_config = ath10k_wmi_op_gen_gpio_config,
 541 +       .gen_gpio_output = ath10k_wmi_op_gen_gpio_output,
 542         /* .gen_bcn_tmpl not implemented */
 543         /* .gen_prb_tmpl not implemented */
 544         /* .gen_p2p_go_bcn_ie not implemented */
 545 @@ -9209,6 +9261,8 @@ static const struct wmi_ops wmi_10_4_ops
 546         .gen_pdev_bss_chan_info_req = ath10k_wmi_10_2_op_gen_pdev_bss_chan_info,
 547         .gen_echo = ath10k_wmi_op_gen_echo,
 548         .gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config,
 549 +       .gen_gpio_config = ath10k_wmi_op_gen_gpio_config,
 550 +       .gen_gpio_output = ath10k_wmi_op_gen_gpio_output,
 551  };
 552
 553  int ath10k_wmi_attach(struct ath10k *ar)
 554 --- a/ath10k-4.16/wmi.h
 555 +++ b/ath10k-4.16/wmi.h
 556 @@ -2999,6 +2999,41 @@ enum wmi_10_4_feature_mask {
 557
 558  };
 559
 560 +/* WMI_GPIO_CONFIG_CMDID */
 561 +enum {
 562 +       WMI_GPIO_PULL_NONE,
 563 +       WMI_GPIO_PULL_UP,
 564 +       WMI_GPIO_PULL_DOWN,
 565 +};
 566 +
 567 +enum {
 568 +       WMI_GPIO_INTTYPE_DISABLE,
 569 +       WMI_GPIO_INTTYPE_RISING_EDGE,
 570 +       WMI_GPIO_INTTYPE_FALLING_EDGE,
 571 +       WMI_GPIO_INTTYPE_BOTH_EDGE,
 572 +       WMI_GPIO_INTTYPE_LEVEL_LOW,
 573 +       WMI_GPIO_INTTYPE_LEVEL_HIGH
 574 +};
 575 +
 576 +/* WMI_GPIO_CONFIG_CMDID */
 577 +struct wmi_gpio_config_cmd {
 578 +       __le32 gpio_num;             /* GPIO number to be setup */
 579 +       __le32 input;                /* 0 - Output/ 1 - Input */
 580 +       __le32 pull_type;            /* Pull type defined above */
 581 +       __le32 intr_mode;            /* Interrupt mode defined above (Input) */
 582 +} __packed;
 583 +
 584 +/* WMI_GPIO_OUTPUT_CMDID */
 585 +struct wmi_gpio_output_cmd {
 586 +       __le32 gpio_num;    /* GPIO number to be setup */
 587 +       __le32 set;         /* Set the GPIO pin*/
 588 +} __packed;
 589 +
 590 +/* WMI_GPIO_INPUT_EVENTID */
 591 +struct wmi_gpio_input_event {
 592 +       __le32 gpio_num;    /* GPIO number which changed state */
 593 +} __packed;
 594 +
 595  struct wmi_ext_resource_config_10_4_cmd {
 596         /* contains enum wmi_host_platform_type */
 597         __le32 host_platform_config;