EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ath9k: fix unloading the module

Browse Source 
Registering a GPIO chip with the ath9k device as parent prevents unload,
because the gpiochip core increases the module use count.
Unfortunately, the only way to avoid this at the moment seems to be to
register the GPIO chip without a parent device

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2018-09-20 10:06:49 +02:00
parent 5efd080e20
commit ccab68f2d3
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
View File

@ -45,7 +45,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#ifdef CPTCFG_ATH9K_DEBUGFS #ifdef CPTCFG_ATH9K_DEBUGFS
--- a/drivers/net/wireless/ath/ath9k/gpio.c --- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c +++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -16,13 +16,135 @@ @@ -16,13 +16,130 @@
#include "ath9k.h" #include "ath9k.h"
#include <linux/ath9k_platform.h> #include <linux/ath9k_platform.h>
@ -126,11 +126,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ gc->sc = sc; + gc->sc = sc;
+ snprintf(gc->label, sizeof(gc->label), "ath9k-%s", + snprintf(gc->label, sizeof(gc->label), "ath9k-%s",
+ wiphy_name(sc->hw->wiphy)); + wiphy_name(sc->hw->wiphy));
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0) +
+ gc->gchip.parent = sc->dev;
+#else
+ gc->gchip.dev = sc->dev;
+#endif
+ gc->gchip.label = gc->label; + gc->gchip.label = gc->label;
+ gc->gchip.base = -1; /* determine base automatically */ + gc->gchip.base = -1; /* determine base automatically */
+ gc->gchip.ngpio = ah->caps.num_gpio_pins; + gc->gchip.ngpio = ah->caps.num_gpio_pins;
@ -145,7 +141,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+ return; + return;
+ } + }
+ +
+ gc->gchip.owner = NULL;
+ sc->gpiochip = gc; + sc->gpiochip = gc;
+} +}
+ +
@ -183,7 +178,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static void ath_fill_led_pin(struct ath_softc *sc) static void ath_fill_led_pin(struct ath_softc *sc)
{ {
struct ath_hw *ah = sc->sc_ah; struct ath_hw *ah = sc->sc_ah;
@@ -80,6 +202,12 @@ static int ath_add_led(struct ath_softc @@ -80,6 +197,12 @@ static int ath_add_led(struct ath_softc
else else
ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low); ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
@ -196,7 +191,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return 0; return 0;
} }
@@ -136,17 +264,24 @@ void ath_deinit_leds(struct ath_softc *s @@ -136,17 +259,24 @@ void ath_deinit_leds(struct ath_softc *s
while (!list_empty(&sc->leds)) { while (!list_empty(&sc->leds)) {
led = list_first_entry(&sc->leds, struct ath_led, list); led = list_first_entry(&sc->leds, struct ath_led, list);
@ -221,7 +216,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
char led_name[32]; char led_name[32];
const char *trigger; const char *trigger;
int i; int i;
@@ -156,6 +291,15 @@ void ath_init_leds(struct ath_softc *sc) @@ -156,6 +286,15 @@ void ath_init_leds(struct ath_softc *sc)
if (AR_SREV_9100(sc->sc_ah)) if (AR_SREV_9100(sc->sc_ah))
return; return;
@ -237,7 +232,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
ath_fill_led_pin(sc); ath_fill_led_pin(sc);
if (pdata && pdata->leds && pdata->num_leds) if (pdata && pdata->leds && pdata->num_leds)
@@ -180,6 +324,7 @@ void ath_init_leds(struct ath_softc *sc) @@ -180,6 +319,7 @@ void ath_init_leds(struct ath_softc *sc)
ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
!sc->sc_ah->config.led_active_high); !sc->sc_ah->config.led_active_high);
} }

8
package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
View File

@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#ifdef CPTCFG_MAC80211_LEDS #ifdef CPTCFG_MAC80211_LEDS
@@ -129,6 +131,67 @@ static void ath9k_unregister_gpio_chip(s @@ -124,6 +126,67 @@ static void ath9k_unregister_gpio_chip(s
sc->gpiochip = NULL; sc->gpiochip = NULL;
} }
@ -97,7 +97,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#else /* CONFIG_GPIOLIB */ #else /* CONFIG_GPIOLIB */
static inline void ath9k_register_gpio_chip(struct ath_softc *sc) static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
@@ -139,6 +202,14 @@ static inline void ath9k_unregister_gpio @@ -134,6 +197,14 @@ static inline void ath9k_unregister_gpio
{ {
} }
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#endif /* CONFIG_GPIOLIB */ #endif /* CONFIG_GPIOLIB */
/********************************/ /********************************/
@@ -262,6 +333,7 @@ void ath_deinit_leds(struct ath_softc *s @@ -257,6 +328,7 @@ void ath_deinit_leds(struct ath_softc *s
{ {
struct ath_led *led; struct ath_led *led;
@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
while (!list_empty(&sc->leds)) { while (!list_empty(&sc->leds)) {
led = list_first_entry(&sc->leds, struct ath_led, list); led = list_first_entry(&sc->leds, struct ath_led, list);
#ifdef CONFIG_GPIOLIB #ifdef CONFIG_GPIOLIB
@@ -301,6 +373,7 @@ void ath_init_leds(struct ath_softc *sc) @@ -296,6 +368,7 @@ void ath_init_leds(struct ath_softc *sc)
} }
ath_fill_led_pin(sc); ath_fill_led_pin(sc);