wireless:ath9k Fix ath_print in xmit.c
PATCH 1/1 wireless:ath9k Fix ath_print in xmit.c
ath_print in xmit.c should say "Reseting hardware" instead of Reaseting HAL!(since HAL is being fazed out). dmesg shows:
[ 8660.899624] ath: Failed to stop TX DMA in 100 msec after killing last frame [ 8660.899676] ath: Unable to stop TxDMA. Reset HAL!
--- drivers/net/wireless/ath/ath9k/xmit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath9k/xmit.c +1 -1
@@ -1198,7 +1198,7 @@ void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)int r;ath_print (common,ATH_DBG_FATAL , -"Unable to stop TxDMA. Reset HAL!\n" ); +"Unable to stop TxDMA. Reseting hardware!\n" );spin_lock_bh (&sc->sc_resetlock); r =ath9k_hw_reset (ah, sc->sc_ah->curchan, false);
Signature · 1 line
1.6.5.GIT
PATCH 1/1 wireless:ath9k Disable leds for Apple products.
Disable the leds on ath9k for Apple products, since
there is no leds on any of there machines(or non that I can find!!).
--- drivers/net/wireless/ath/ath9k/gpio.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-)
drivers/net/wireless/ath/ath9k/gpio.c +20 -0
@@ -15,6 +15,7 @@*/ #include "ath9k.h" +#include <linux/dmi.h> /********************************/ /* LED functions */
@@ -127,11 +128,30 @@ void ath_deinit_leds(struct ath_softc *sc)ath9k_hw_set_gpio (sc->sc_ah, sc->sc_ah->led_pin,1 ); } +static struct dmi_system_id __initdata dmi_system_table[] = { + { + .matches = { +DMI_MATCH (DMI_BIOS_VENDOR ,"Apple Computer, Inc." ) + }, + }, + { + .matches = { +DMI_MATCH (DMI_BIOS_VENDOR ,"Apple Inc." ) + }, + }, + {} +}; +void ath_init_leds (struct ath_softc *sc) {char *trigger;int ret; +/* Apple has no leds lights for their wireless. */ +if (dmi_check_system (dmi_system_table) >0 ) +return -ENODEV ; +else +if (AR_SREV_9287 (sc->sc_ah)) sc->sc_ah->led_pin =ATH_LED_PIN_9287 ;else
Signature · 1 line
1.6.5.GIT
Re: [PATCH]wireless:ath9k Disable leds for Apple products.
Note: This e-mail is on a public mailing list.
David, Vinod, is it true, no Apple devices have LEDs?
Quoted 56 lines · Justin P. Mattock
Disable the leds on ath9k for Apple products, since
there is no leds on any of there machines(or non that I can find!!).Signed-off-by Justin P. Mattock <[email protected]>---
drivers/net/wireless/ath/ath9k/gpio.c | 20 ++++++++++++++++++++1 files changed, 20 insertions(+), 0 deletions(-)drivers/net/wireless/ath/ath9k/gpio.c +20
-0@@ -15,6 +15,7 @@*/ #include "ath9k.h" +#include <linux/dmi.h> /********************************/ /* LED functions */@@ -127,11 +128,30 @@ void ath_deinit_leds(struct ath_softc *sc) ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, 1); } +static struct dmi_system_id __initdata dmi_system_table[] = { + { + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "Apple Computer, Inc.") + }, + }, + { + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "Apple Inc.") + }, + }, + {} +}; + void ath_init_leds(struct ath_softc *sc) { char *trigger; int ret; + /* Apple has no leds lights for their wireless. */ + if (dmi_check_system(dmi_system_table) > 0) + return -ENODEV; + else + if (AR_SREV_9287(sc->sc_ah)) sc->sc_ah->led_pin = ATH_LED_PIN_9287;else
--
1.6.5.GIT
Re: [PATCH]wireless:ath9k Disable leds for Apple products.
In reply to Justin P. MattockQuoted 9 lines · Justin P. Mattock
Disable the leds on ath9k for Apple products, since
there is no leds on any of there machines(or non that I can find!!).Signed-off-by Justin P. Mattock <[email protected]>void
ath_init_leds(struct ath_softc *sc)
{drivers/net/wireless/ath/ath9k/gpio.c +0
-0char *trigger;
drivers/net/wireless/ath/ath9k/gpio.c void ath_deinit_leds(struct ath_softc *sc) · line 157
Quoted 10 lines
drivers/net/wireless/ath/ath9k/gpio.c +5
-0int ret; +/* Apple has no leds lights for their wireless. */ +if (dmi_check_system (dmi_system_table) >0 ) +return -ENODEV ; +else +if (AR_SREV_9287 (sc->sc_ah)) sc->sc_ah->led_pin =ATH_LED_PIN_9287 ;else
Surely we don't need the 'else'.
Does enabling the LEDs on these systems cause any problems?
John
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
Re: [PATCH]wireless:ath9k Disable leds for Apple products.
Quoted 25 lines · John W. Linville
Quoted 13 lines · Justin P. Mattock
Disable the leds on ath9k for Apple products, since
there is no leds on any of there machines(or non that I can find!!).Signed-off-by Justin P. Mattock<[email protected]>void ath_init_leds(struct ath_softc *sc) { char *trigger; int ret;drivers/net/wireless/ath/ath9k/gpio.c void ath_deinit_leds(struct ath_softc *sc) · line 157
Quoted 8 lines
drivers/net/wireless/ath/ath9k/gpio.c +5
-0+/* Apple has no leds lights for their wireless. */ +if (dmi_check_system (dmi_system_table)>0 ) +return -ENODEV ; +else +if (AR_SREV_9287 (sc->sc_ah)) sc->sc_ah->led_pin =ATH_LED_PIN_9287 ;else Surely we don't need the 'else'.
Quoted 4 lines
Does enabling the LEDs on these systems cause any problems?
John
I picked up the idea, from this patch:
http://kerneltrap.org/mailarchive/linux-kernel/2010/1/20/4530535
while looking into a bug for ath9k(thinking maybe leds are causing something, which want the case)
so Id have to say I don't think the leds cause issue's, if anything just a wasted symlink, call, or whatever in /sys/class/leds/*
Justin P. mattock
Re: [PATCH]wireless:ath9k Disable leds for Apple products.
Quoted 9 lines · Justin P. Mattock
Quoted 8 lines · John W. Linville
Quoted 5 lines · Justin P. Mattock
Disable the leds on ath9k for Apple products, since
there is no leds on any of there machines(or non that I can find!!).Signed-off-by Justin P. Mattock<[email protected]>
Our team has confirmed Apple devices do not have LEDs so a change like this is OK but this patch is wrong anyway. More details below.
Quoted 23 lines
Quoted 16 lines
Quoted 6 lines
void
ath_init_leds(struct ath_softc *sc)
{
char *trigger;
int ret;Quoted 9 lines
+ /* Apple has no leds lights for their wireless. */
+ if (dmi_check_system(dmi_system_table)> 0)
+ return-ENODEV;
+ else
+
if (AR_SREV_9287(sc->sc_ah))sc->sc_ah->led_pin=ATH_LED_PIN_9287; elseQuoted 6 lines
Surely we don't need the 'else'.
Does enabling the LEDs on these systems cause any problems?
John
Quoted 8 lines
I picked up the idea, from this patch:
http://kerneltrap.org/mailarchive/linux-kernel/2010/1/20/4530535
while looking into a bug forath9k(thinking maybe leds are causing something, which want the case)so Id have to say I don't think the leds cause issue's, if anything just a wasted symlink, call, or whatever in
/sys/class/leds/*
The patch is wrong anyway, ath_init_leds() is void and yet you return a value. If this is really needed I'd also prefer if you define a bool or something and use a ah->ignore_leds and set this to true if the DMI stuff checks out for Apple up hw init. Then check for ignore_leds prior to calling ath_init_leds() and also avoid it if set. Also check for ingore_leds upon device cleanup and ignore the acancel_delayed_work_sync(&sc->ath_led_blink_work) and ath_deinit_leds() and skip that.
But given that it is not needed it seems a lot of work for something that is a non-issue.
Luis
Re: [PATCH]wireless:ath9k Disable leds for Apple products.
Quoted 57 lines · Luis R. Rodriguez
Quoted 10 lines · Justin P. Mattock
Quoted 8 lines · John W. Linville
Quoted 5 lines · Justin P. Mattock
Disable the leds on ath9k for Apple products, since
there is no leds on any of there machines(or non that I can find!!).Signed-off-by Justin P. Mattock<[email protected]>Our team has confirmed Apple devices do not have LEDs so a change like this is OK but this patch is wrong anyway. More details below.
Quoted 22 lines
Quoted 15 lines
Quoted 7 lines
void ath_init_leds(struct ath_softc *sc) { char *trigger; int ret;drivers/net/wireless/ath/ath9k/gpio.c void ath_deinit_leds(struct ath_softc *sc) · line 157
Quoted 8 lines
drivers/net/wireless/ath/ath9k/gpio.c +5
-0+/* Apple has no leds lights for their wireless. */ +if (dmi_check_system (dmi_system_table)>0 ) +return -ENODEV ; +else +if (AR_SREV_9287 (sc->sc_ah)) sc->sc_ah->led_pin =ATH_LED_PIN_9287 ;else Quoted 7 lines
Surely we don't need the 'else'.
Does enabling the LEDs on these systems cause any problems?
John
Quoted 9 lines
I picked up the idea, from this patch:
http://kerneltrap.org/mailarchive/linux-kernel/2010/1/20/4530535
while looking into a bug forath9k(thinking maybe leds are causing something, which want the case)so Id have to say I don't think the leds cause issue's, if anything just a wasted symlink, call, or whatever in
/sys/class/leds/*The patch is wrong anyway,
ath_init_leds()is void and yet you return a value. If this is really needed I'd also prefer if you define a bool or something and use aah->ignore_ledsand set this to true if the DMI stuff checks out for Apple up hw init. Then check forignore_ledsprior to callingath_init_leds()and also avoid it if set. Also check foringore_ledsupon device cleanup and ignore theacancel_delayed_work_sync(&sc->ath_led_blink_work)andath_deinit_leds()and skip that.
Quoted 6 lines
But given that it is not needed it seems a lot of work for something that is a non-issue.
Luis
tough to say!! I was looking into a bug a few months back, and thought hmm.. maybe something is being called with the leds but the leds are not there causing some thing to crap out..
so out of curiosity I remembered the dmi disable patch, and
semi somewhat pieced it together(just to see the results of disabling the leds). unfortunately still hit the strange thing with wpa_supplicant and ath9k(the disconnect thing).
as for the above procedure(I can give that a try.. but it might take a while...)
Justin P. Mattock
Re: [PATCH]wireless:ath9k Disable leds for Apple products.
Quoted 78 lines · Justin P. Mattock
Quoted 66 lines · Luis R. Rodriguez
Quoted 8 lines · Justin P. Mattock
Quoted 5 lines · John W. Linville
Quoted 1 line · Justin P. Mattock
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Disable the leds on ath9k for Apple products, since
there is no leds on any of there machines(or non that I can find!!).Signed-off-by Justin P. Mattock<[email protected]>Our team has confirmed Apple devices do not have LEDs so a change like this is OK but this patch is wrong anyway. More details below.
Quoted 25 lines
Quoted 17 lines
Quoted 6 lines
void
ath_init_leds(struct ath_softc *sc)
{
char *trigger;
int ret;Quoted 10 lines
+ /* Apple has no leds lights for their wireless. */
+ if (dmi_check_system(dmi_system_table)> 0)
+ return-ENODEV;
+ else
+
if (AR_SREV_9287(sc->sc_ah))sc->sc_ah->led_pin=ATH_LED_PIN_9287; elseQuoted 7 lines
Surely we don't need the 'else'.
Does enabling the LEDs on these systems cause any problems?
John
Quoted 9 lines
I picked up the idea, from this patch:
http://kerneltrap.org/mailarchive/linux-kernel/2010/1/20/4530535
while looking into a bug forath9k(thinking maybe leds are causing something, which want the case)so Id have to say I don't think the leds cause issue's, if anything just a wasted symlink, call, or whatever in
/sys/class/leds/*The patch is wrong anyway,
ath_init_leds()is void and yet you return a value. If this is really needed I'd also prefer if you define a bool or something and use aah->ignore_ledsand set this to true if the DMI stuff checks out for Apple up hw init. Then check forignore_ledsprior to callingath_init_leds()and also avoid it if set. Also check foringore_ledsupon device cleanup and ignore theacancel_delayed_work_sync(&sc->ath_led_blink_work)andath_deinit_leds()and skip that.Quoted 6 lines
But given that it is not needed it seems a lot of work for something that is a non-issue.
Luis
tough to say!! I was looking into a bug a few months back, and thought hmm.. maybe something is being called with the leds but the leds are not there causing some thing to crap out..
Quoted 8 lines
so out of curiosity I remembered the dmi disable patch, and semi somewhat pieced it together(just to see the results of disabling the leds).
unfortunately still hit the strange thing withwpa_supplicantand ath9k(the disconnect thing).as for the above procedure(I can give that a try.. but it might take a while...)
OK thanks for the details, best just ignore it unless you can prove it fixes an issue.
Luis
Re: [PATCH]wireless:ath9k Disable leds for Apple products.
Quoted 87 lines · Luis R. Rodriguez
Quoted 84 lines · Justin P. Mattock
Quoted 65 lines · Luis R. Rodriguez
Quoted 7 lines · Justin P. Mattock
Quoted 4 lines · John W. Linville
On Wed, May 26, 2010 at 10:14:16AM -0700, Justin P. Mattock wrote:
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Disable the leds on ath9k for Apple products, since
there is no leds on any of there machines(or non that I can find!!).Signed-off-by Justin P. Mattock<[email protected]>Our team has confirmed Apple devices do not have LEDs so a change like this is OK but this patch is wrong anyway. More details below.
Quoted 24 lines
Quoted 16 lines
Quoted 8 lines
void ath_init_leds(struct ath_softc *sc) { char *trigger; int ret;drivers/net/wireless/ath/ath9k/gpio.c void ath_deinit_leds(struct ath_softc *sc) · line 157
Quoted 8 lines
drivers/net/wireless/ath/ath9k/gpio.c +5
-0+/* Apple has no leds lights for their wireless. */ +if (dmi_check_system (dmi_system_table)>0 ) +return -ENODEV ; +else +if (AR_SREV_9287 (sc->sc_ah)) sc->sc_ah->led_pin =ATH_LED_PIN_9287 ;else Quoted 8 lines
Surely we don't need the 'else'.
Does enabling the LEDs on these systems cause any problems?
John
Quoted 10 lines
I picked up the idea, from this patch:
http://kerneltrap.org/mailarchive/linux-kernel/2010/1/20/4530535
while looking into a bug forath9k(thinking maybe leds are causing something, which want the case)so Id have to say I don't think the leds cause issue's, if anything just a wasted symlink, call, or whatever in
/sys/class/leds/*The patch is wrong anyway,
ath_init_leds()is void and yet you return a value. If this is really needed I'd also prefer if you define a bool or something and use aah->ignore_ledsand set this to true if the DMI stuff checks out for Apple up hw init. Then check forignore_ledsprior to callingath_init_leds()and also avoid it if set. Also check foringore_ledsupon device cleanup and ignore theacancel_delayed_work_sync(&sc->ath_led_blink_work)andath_deinit_leds()and skip that.Quoted 7 lines
But given that it is not needed it seems a lot of work for something that is a non-issue.
Luis
tough to say!! I was looking into a bug a few months back, and thought hmm.. maybe something is being called with the leds but the leds are not there causing some thing to crap out..
so out of curiosity I remembered the dmi disable patch, and semi somewhat pieced it together(just to see the results of disabling the leds).
unfortunately still hit the strange thing withwpa_supplicantand ath9k(the disconnect thing).
Quoted 9 lines
Quoted 3 lines
as for the above procedure(I can give that a try.. but it might take a while...)
OK thanks for the details, best just ignore it unless you can prove it fixes an issue.
Luis
at this point the only thing I can think of(if anything), would maybe a wakeup with powertop or something in the area of power management(but haven't looked into it).
In any case Thanks for having a look at the ath_print earlier..
cheers,
Justin P. Mattock
Subject should just be
ath9k: Fix ath_print in xmit for hardware reset
Quoted 8 lines · Justin P. Mattock
ath_printinxmit.cshould say "Reseting hardware" instead of Reaseting HAL!(since HAL is being fazed out). dmesg shows:[ 8660.899624] ath: Failed to stop TX DMA in 100 msec after killing last frame [ 8660.899676] ath: Unable to stop TxDMA. Reset HAL!Signed-off-by Justin P. Mattock <[email protected]>
Looks good. You want to address patches To john, and cc the rest.
Quoted 21 lines
---
drivers/net/wireless/ath/ath9k/xmit.c | 2 +-1 files changed, 1 insertions(+), 1 deletions(-)drivers/net/wireless/ath/ath9k/xmit.c +1
-2@@ -1198,7 +1198,7 @@ void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx) int r; ath_print(common, ATH_DBG_FATAL, - "Unable to stop TxDMA. Reset HAL!\n"); + "Unable to stop TxDMA. Reseting hardware!\n"); spin_lock_bh(&sc->sc_resetlock); r = ath9k_hw_reset(ah, sc->sc_ah->curchan, false); --1.6.5.GIT
Am 26.05.2010 19:14, schrieb Justin P. Mattock:
Quoted 18 lines
ath_printinxmit.cshould say "Reseting hardware" instead of Reaseting HAL!(since HAL is being fazed out). dmesg shows:[ 8660.899624] ath: Failed to stop TX DMA in 100 msec after killing last frame [ 8660.899676] ath: Unable to stop TxDMA. Reset HAL!Signed-off-by Justin P. Mattock <[email protected]>--- drivers/net/wireless/ath/ath9k/xmit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/net/wireless/ath/ath9k/xmit.c +0
-0
drivers/net/wireless/ath/ath9k/xmit.c void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx) · line 1202
Quoted 6 lines
drivers/net/wireless/ath/ath9k/xmit.c +1
-1@@ -1198,7 +1198,7 @@ void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)int r;ath_print (common,ATH_DBG_FATAL , -"Unable to stop TxDMA. Reset HAL!\n" ); +"Unable to stop TxDMA. Reseting hardware!\n" );
1.) Should'nt it read "Resetting"
2.) Why "common" ? Seems it is ath9k specific so message should read "ath9k: Failed to stop TX DMA"
3.) While we are at it write "TX DMA" instead of "TxDMA" just to be consistent...
drivers/net/wireless/ath/ath9k/xmit.c void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx) · line 1204
Quoted 4 lines
drivers/net/wireless/ath/ath9k/xmit.c +0
-0spin_lock_bh (&sc->sc_resetlock); r =ath9k_hw_reset (ah, sc->sc_ah->curchan, false);
Best regards,
Arnd
Quoted 22 lines · Arnd Hannemann
Am 26.05.2010 19:14, schrieb Justin P. Mattock:
Quoted 20 lines
ath_printinxmit.cshould say "Reseting hardware" instead of Reaseting HAL!(since HAL is being fazed out). dmesg shows:[ 8660.899624] ath: Failed to stop TX DMA in 100 msec after killing last frame [ 8660.899676] ath: Unable to stop TxDMA. Reset HAL!Signed-off-by Justin P. Mattock<[email protected]>--- drivers/net/wireless/ath/ath9k/xmit.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/net/wireless/ath/ath9k/xmit.c +0
-0@@ -1198,7 +1198,7 @@ void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)int r;
Quoted 11 lines
drivers/net/wireless/ath/ath9k/xmit.c void ath_drain_all_txq(struct ath_softc *sc, bool retry_tx)
Quoted 5 lines
drivers/net/wireless/ath/ath9k/xmit.c +1
-1ath_print (common,ATH_DBG_FATAL , -"Unable to stop TxDMA. Reset HAL!\n" ); +"Unable to stop TxDMA. Reseting hardware!\n" );1.) Should'nt it read "Resetting"
2.) Why "common" ? Seems it is ath9k specific so message should read "ath9k: Failed to stop TX DMA"
3.) While we are at it write "TX DMA" instead of "TxDMA" just to be consistent...
pretty bad!! I cant spell.
Quoted 10 lines
Quoted 5 lines
drivers/net/wireless/ath/ath9k/xmit.c +0
-0spin_lock_bh (&sc->sc_resetlock);r = ath9k_hw_reset(ah, sc->sc_ah->curchan, false);Best regards,
Arnd
o.k. re-submitted, with the above fixes, if good let me know..(a bit confused with the signed off stuff(if I need to re-du to add the correct signed-off's let me know))
Justin P. mattock