Skip to contentSkip to conversation

WDEV: ath5k, test single chip before reset

PATCH NAK Jiri Slaby 2 participants 3 messages Feb 15, 2008 Networking drivers (wireless)

lore
Share & tools
lore

Jiri Slaby

author
#0 lore raw

PATCH 1/1 WDEV: ath5k, test single chip before reset

Move ath5k_hw_nic_wakeup after ah_single_chip being set, because we test the value in there and decides whether reset or not.

Cc Nick Kossifidis <[email protected]>
Cc Luis R. Rodriguez <[email protected]>
---
 drivers/net/wireless/ath5k/hw.c |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)
drivers/net/wireless/ath5k/hw.c +7 -11
index 3a4bf40..9cdd27f 100644
@@ -181,11 +181,6 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)
 	else if (ah->ah_version <= AR5K_AR5211)
 		ah->ah_proc_rx_desc = ath5k_hw_proc_old_rx_status;
 
-	/* Bring device out of sleep and reset it's units */
-	ret = ath5k_hw_nic_wakeup(ah, AR5K_INIT_MODE, true);
-	if (ret)
-		goto err_free;
-
 	/* Get MAC, PHY and RADIO revisions */
 	srev = ath5k_hw_reg_read(ah, AR5K_SREV);
 	ah->ah_mac_srev = srev;
@@ -210,12 +205,13 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)
 	}
 
 	/* Identify single chip solutions */
-	if((srev <= AR5K_SREV_VER_AR5414) &&
-	(srev >= AR5K_SREV_VER_AR2424)) {
-		ah->ah_single_chip = true;
-	} else {
-		ah->ah_single_chip = false;
-	}
+	ah->ah_single_chip = srev >= AR5K_SREV_VER_AR2424 &&
+			srev <= AR5K_SREV_VER_AR5414;
+
+	/* Bring device out of sleep and reset it's units */
+	ret = ath5k_hw_nic_wakeup(ah, AR5K_INIT_MODE, true);
+	if (ret)
+		goto err_free;
 
 	/* Single chip radio */
 	if (ah->ah_radio_2ghz_revision == ah->ah_radio_5ghz_revision)
Signature · 1 line
1.5.3.8
#1 lore raw

2008/2/15, Jiri Slaby <[email protected]>:

Quoted 42 lines

Move ath5k_hw_nic_wakeup after ah_single_chip being set, because we
test the value in there and decides whether reset or not.

Cc Nick Kossifidis <[email protected]>
Cc Luis R. Rodriguez <[email protected]>

---

  drivers/net/wireless/ath5k/hw.c |   21 ++++++++++-----------
  1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c index 3a4bf40..9cdd27f 100644
--- a/drivers/net/wireless/ath5k/hw.c
+++ b/drivers/net/wireless/ath5k/hw.c
@@ -181,11 +181,6 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)

        else if (ah->ah_version <= AR5K_AR5211)
                ah->ah_proc_rx_desc = ath5k_hw_proc_old_rx_status;
 -       /* Bring device out of sleep and reset it's units */
 -       ret = ath5k_hw_nic_wakeup(ah, AR5K_INIT_MODE, true);
 -       if (ret)
 -               goto err_free;
 -
        /* Get MAC, PHY and RADIO revisions */
        srev = ath5k_hw_reg_read(ah, AR5K_SREV);
        ah->ah_mac_srev = srev;
 @@ -210,12 +205,13 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)
        }

        /* Identify single chip solutions */
 -       if((srev <= AR5K_SREV_VER_AR5414) &&
 -       (srev >= AR5K_SREV_VER_AR2424)) {
 -               ah->ah_single_chip = true;
 -       } else {
 -               ah->ah_single_chip = false;
 -       }
 +       ah->ah_single_chip = srev >= AR5K_SREV_VER_AR2424 &&
 +                       srev <= AR5K_SREV_VER_AR5414;
 +
 +       /* Bring device out of sleep and reset it's units */
 +       ret = ath5k_hw_nic_wakeup(ah, AR5K_INIT_MODE, true);
 +       if (ret)
Quoted 5 lines

+ goto err_free;

        /* Single chip radio */
        if (ah->ah_radio_2ghz_revision == ah->ah_radio_5ghz_revision)

NACK, single chip flag is going out since only needed check is for 5424/2424 during nic_wakeup, 5413/2413 behave like the rest 5211/5212-combatible cards.

Sorry for delaying the relevant patches, i'm working with the 2413 card i got from Mike to make it work and it'll take some time (not as easy as i thought, i probably miss something)...

Signature · 3 lines
GPG ID: 0xD21DB2DB
As you read this post global entropy rises. Have Fun ;-)
Nick
author
#2 lore raw
Quoted 15 lines · Nick Kossifidis

2008/2/15, Jiri Slaby <[email protected]>:

Quoted 14 lines

Move ath5k_hw_nic_wakeup after ah_single_chip being set, because we
test the value in there and decides whether reset or not.

Cc Nick Kossifidis <[email protected]>
Cc Luis R. Rodriguez <[email protected]>

---

  drivers/net/wireless/ath5k/hw.c |   21 ++++++++++-----------
  1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c index 3a4bf40..9cdd27f 100644
--- a/drivers/net/wireless/ath5k/hw.c
+++ b/drivers/net/wireless/ath5k/hw.c

[...]

Quoted 18 lines
Quoted 18 lines

@@ -210,12 +205,13 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)

        }

        /* Identify single chip solutions */
 -       if((srev <= AR5K_SREV_VER_AR5414) &&
 -       (srev >= AR5K_SREV_VER_AR2424)) {
 -               ah->ah_single_chip = true;
 -       } else {
 -               ah->ah_single_chip = false;
 -       }
 +       ah->ah_single_chip = srev >= AR5K_SREV_VER_AR2424 &&
 +                       srev <= AR5K_SREV_VER_AR5414;
 +
 +       /* Bring device out of sleep and reset it's units */
 +       ret = ath5k_hw_nic_wakeup(ah, AR5K_INIT_MODE, true);
 +       if (ret)

+ goto err_free;

Quoted 7 lines
Quoted 3 lines
        /* Single chip radio */
        if (ah->ah_radio_2ghz_revision == ah->ah_radio_5ghz_revision)

NACK, single chip flag is going out since only needed check is for 5424/2424 during nic_wakeup, 5413/2413 behave like the rest 5211/5212-combatible cards.

Ok, thanks.

Quoted 3 lines

Sorry for delaying the relevant patches, i'm working with the 2413 card i got from Mike to make it work and it'll take some time (not as easy as i thought, i probably miss something)...

No problem, if I could do anything for you in this area, don't hesitate to drop a message.