Merge branch 'master' of git://nbd.name/openwrt
[openwrt.git] / package / kernel / mac80211 / patches / 530-ath9k_extra_leds.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -563,6 +563,9 @@ static inline int ath9k_dump_btcoex(stru
 void ath_init_leds(struct ath_softc *sc);
 void ath_deinit_leds(struct ath_softc *sc);
 void ath_fill_led_pin(struct ath_softc *sc);
+int ath_create_gpio_led(struct ath_softc *sc, int gpio, const char *name,
+                        const char *trigger, bool active_low);
+
 #else
 static inline void ath_init_leds(struct ath_softc *sc)
 {
@@ -710,6 +713,13 @@ enum sc_op_flags {
 #define PS_BEACON_SYNC            BIT(4)
 #define PS_WAIT_FOR_ANI           BIT(5)
 
+struct ath_led {
+       struct list_head list;
+       struct ath_softc *sc;
+       const struct gpio_led *gpio;
+       struct led_classdev cdev;
+};
+
 struct ath_softc {
        struct ieee80211_hw *hw;
        struct device *dev;
@@ -751,9 +761,8 @@ struct ath_softc {
        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
 
 #ifdef CPTCFG_MAC80211_LEDS
-       bool led_registered;
-       char led_name[32];
-       struct led_classdev led_cdev;
+       const char *led_default_trigger;
+       struct list_head leds;
 #endif
 
        struct ath9k_hw_cal_data caldata;
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -24,40 +24,102 @@
 static void ath_led_brightness(struct led_classdev *led_cdev,
                               enum led_brightness brightness)
 {
-       struct ath_softc *sc = container_of(led_cdev, struct ath_softc, led_cdev);
-       ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, (brightness == LED_OFF));
+       struct ath_led *led = container_of(led_cdev, struct ath_led, cdev);
+       struct ath_softc *sc = led->sc;
+
+       ath9k_ps_wakeup(sc);
+       ath9k_hw_set_gpio(sc->sc_ah, led->gpio->gpio,
+                         (brightness != LED_OFF) ^ led->gpio->active_low);
+       ath9k_ps_restore(sc);
+}
+
+static int ath_add_led(struct ath_softc *sc, struct ath_led *led)
+{
+       const struct gpio_led *gpio = led->gpio;
+       int ret;
+
+       led->cdev.name = gpio->name;
+       led->cdev.default_trigger = gpio->default_trigger;
+       led->cdev.brightness_set = ath_led_brightness;
+
+       ret = led_classdev_register(wiphy_dev(sc->hw->wiphy), &led->cdev);
+       if (ret < 0)
+               return ret;
+
+       led->sc = sc;
+       list_add(&led->list, &sc->leds);
+
+       /* Configure gpio for output */
+       ath9k_hw_cfg_output(sc->sc_ah, gpio->gpio,
+                           AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
+
+       /* LED off */
+       ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
+
+       return 0;
+}
+
+int ath_create_gpio_led(struct ath_softc *sc, int gpio_num, const char *name,
+                       const char *trigger, bool active_low)
+{
+       struct ath_led *led;
+       struct gpio_led *gpio;
+       char *_name;
+       int ret;
+
+       led = kzalloc(sizeof(*led) + sizeof(*gpio) + strlen(name) + 1,
+                     GFP_KERNEL);
+       if (!led)
+               return -ENOMEM;
+
+       led->gpio = gpio = (struct gpio_led *) (led + 1);
+       _name = (char *) (led->gpio + 1);
+
+       strcpy(_name, name);
+       gpio->name = _name;
+       gpio->gpio = gpio_num;
+       gpio->active_low = active_low;
+       gpio->default_trigger = trigger;
+
+       ret = ath_add_led(sc, led);
+       if (unlikely(ret < 0))
+               kfree(led);
+
+       return ret;
 }
 
 void ath_deinit_leds(struct ath_softc *sc)
 {
-       if (!sc->led_registered)
-               return;
+       struct ath_led *led;
 
-       ath_led_brightness(&sc->led_cdev, LED_OFF);
-       led_classdev_unregister(&sc->led_cdev);
+       while (!list_empty(&sc->leds)) {
+               led = list_first_entry(&sc->leds, struct ath_led, list);
+               list_del(&led->list);
+               ath_led_brightness(&led->cdev, LED_OFF);
+               led_classdev_unregister(&led->cdev);
+               kfree(led);
+       }
 }
 
 void ath_init_leds(struct ath_softc *sc)
 {
-       int ret;
+       char led_name[32];
+       const char *trigger;
+
+       INIT_LIST_HEAD(&sc->leds);
 
        if (AR_SREV_9100(sc->sc_ah))
                return;
 
-       if (!led_blink)
-               sc->led_cdev.default_trigger =
-                       ieee80211_get_radio_led_name(sc->hw);
-
-       snprintf(sc->led_name, sizeof(sc->led_name),
-               "ath9k-%s", wiphy_name(sc->hw->wiphy));
-       sc->led_cdev.name = sc->led_name;
-       sc->led_cdev.brightness_set = ath_led_brightness;
+       snprintf(led_name, sizeof(led_name), "ath9k-%s",
+                wiphy_name(sc->hw->wiphy));
 
-       ret = led_classdev_register(wiphy_dev(sc->hw->wiphy), &sc->led_cdev);
-       if (ret < 0)
-               return;
+       if (led_blink)
+               trigger = sc->led_default_trigger;
+       else
+               trigger = ieee80211_get_radio_led_name(sc->hw);
 
-       sc->led_registered = true;
+       ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, 1);
 }
 
 void ath_fill_led_pin(struct ath_softc *sc)
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -1018,7 +1018,7 @@ int ath9k_init_device(u16 devid, struct 
 
 #ifdef CPTCFG_MAC80211_LEDS
        /* must be initialized before ieee80211_register_hw */
-       sc->led_cdev.default_trigger = ieee80211_create_tpt_led_trigger(sc->hw,
+       sc->led_default_trigger = ieee80211_create_tpt_led_trigger(sc->hw,
                IEEE80211_TPT_LEDTRIG_FL_RADIO, ath9k_tpt_blink,
                ARRAY_SIZE(ath9k_tpt_blink));
 #endif
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -1573,6 +1573,61 @@ static const struct file_operations fops
        .llseek = default_llseek,
 };
 
+#ifdef CONFIG_MAC80211_LEDS
+
+static ssize_t write_file_gpio_led(struct file *file, const char __user *ubuf,
+                                  size_t count, loff_t *ppos)
+{
+       struct ath_softc *sc = file->private_data;
+       char buf[32], *str, *name, *c;
+       ssize_t len;
+       unsigned int gpio;
+       bool active_low = false;
+
+       len = min(count, sizeof(buf) - 1);
+       if (copy_from_user(buf, ubuf, len))
+               return -EFAULT;
+
+       buf[len] = '\0';
+       name = strchr(buf, ',');
+       if (!name)
+               return -EINVAL;
+
+       *(name++) = 0;
+       if (!*name)
+               return -EINVAL;
+
+       c = strchr(name, '\n');
+       if (c)
+               *c = 0;
+
+       str = buf;
+       if (*str == '!') {
+               str++;
+               active_low = true;
+       }
+
+       if (kstrtouint(str, 0, &gpio) < 0)
+               return -EINVAL;
+
+       if (gpio >= sc->sc_ah->caps.num_gpio_pins)
+               return -EINVAL;
+
+       if (ath_create_gpio_led(sc, gpio, name, NULL, active_low) < 0)
+               return -EINVAL;
+
+       return count;
+}
+
+static const struct file_operations fops_gpio_led = {
+       .write = write_file_gpio_led,
+       .open = simple_open,
+       .owner = THIS_MODULE,
+       .llseek = default_llseek,
+};
+
+#endif
+
 
 int ath9k_init_debug(struct ath_hw *ah)
 {
@@ -1597,6 +1652,10 @@ int ath9k_init_debug(struct ath_hw *ah)
                            &fops_eeprom);
        debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
                            sc, &fops_chanbw);
+#ifdef CONFIG_MAC80211_LEDS
+       debugfs_create_file("gpio_led", S_IWUSR,
+                          sc->debug.debugfs_phy, sc, &fops_gpio_led);
+#endif
        debugfs_create_file("dma", S_IRUSR, sc->debug.debugfs_phy, sc,
                            &fops_dma);
        debugfs_create_file("interrupt", S_IRUSR, sc->debug.debugfs_phy, sc,
 
comments