ath9k: Cleanup debug messages

Clean debug messages to use appropriate levels,
remove useless messages, and trim the number of
debug levels.

Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 44 insertions, 57 deletions

diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
index 22ef93f3d47c..169d8efa69dc 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -97,7 +97,7 @@ bool ath9k_hw_wait(struct ath_hw *ah, u32 reg, u32 mask, u32 val, u32 timeout)
                 udelay(AH_TIME_QUANTUM);
         }
 
-        DPRINTF(ah->ah_sc, ATH_DBG_REG_IO,
+        DPRINTF(ah->ah_sc, ATH_DBG_ANY,
                 "timeout (%d us) on reg 0x%x: 0x%08x & 0x%08x != 0x%08x\n",
                 timeout, reg, REG_READ(ah, reg), mask, val);
 
@@ -181,7 +181,7 @@ u16 ath9k_hw_computetxtime(struct ath_hw *ah,
                 }
                 break;
         default:
-                DPRINTF(ah->ah_sc, ATH_DBG_REG_IO,
+                DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
                         "Unknown phy %u (rate ix %u)\n",
                         rates->info[rateix].phy, rateix);
                 txTime = 0;
@@ -306,7 +306,7 @@ static bool ath9k_hw_chip_test(struct ath_hw *ah)
                         REG_WRITE(ah, addr, wrData);
                         rdData = REG_READ(ah, addr);
                         if (rdData != wrData) {
-                                DPRINTF(ah->ah_sc, ATH_DBG_REG_IO,
+                                DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
                                         "address test failed "
                                         "addr: 0x%08x - wr:0x%08x != rd:0x%08x\n",
                                         addr, wrData, rdData);
@@ -318,7 +318,7 @@ static bool ath9k_hw_chip_test(struct ath_hw *ah)
                         REG_WRITE(ah, addr, wrData);
                         rdData = REG_READ(ah, addr);
                         if (wrData != rdData) {
-                                DPRINTF(ah->ah_sc, ATH_DBG_REG_IO,
+                                DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
                                         "address test failed "
                                         "addr: 0x%08x - wr:0x%08x != rd:0x%08x\n",
                                         addr, wrData, rdData);
@@ -453,8 +453,8 @@ static int ath9k_hw_rfattach(struct ath_hw *ah)
 
         rfStatus = ath9k_hw_init_rf(ah, &ecode);
         if (!rfStatus) {
-                DPRINTF(ah->ah_sc, ATH_DBG_RESET,
-                        "RF setup failed, status %u\n", ecode);
+                DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
+                        "RF setup failed, status: %u\n", ecode);
                 return ecode;
         }
 
@@ -478,10 +478,9 @@ static int ath9k_hw_rf_claim(struct ath_hw *ah)
         case AR_RAD2122_SREV_MAJOR:
                 break;
         default:
-                DPRINTF(ah->ah_sc, ATH_DBG_CHANNEL,
-                        "5G Radio Chip Rev 0x%02X is not "
-                        "supported by this driver\n",
-                        ah->hw_version.analog5GhzRev);
+                DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
+                        "Radio Chip Rev 0x%02X not supported\n",
+                        val & AR_RADIO_SREV_MAJOR);
                 return -EOPNOTSUPP;
         }
 
@@ -503,12 +502,8 @@ static int ath9k_hw_init_macaddr(struct ath_hw *ah)
                 ah->macaddr[2 * i] = eeval >> 8;
                 ah->macaddr[2 * i + 1] = eeval & 0xff;
         }
-        if (sum == 0 || sum == 0xffff * 3) {
-                DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
-                        "mac address read failed: %pM\n",
-                        ah->macaddr);
+        if (sum == 0 || sum == 0xffff * 3)
                 return -EADDRNOTAVAIL;
-        }
 
         return 0;
 }
@@ -565,11 +560,8 @@ static int ath9k_hw_post_attach(struct ath_hw *ah)
 {
         int ecode;
 
-        if (!ath9k_hw_chip_test(ah)) {
-                DPRINTF(ah->ah_sc, ATH_DBG_REG_IO,
-                        "hardware self-test failed\n");
+        if (!ath9k_hw_chip_test(ah))
                 return -ENODEV;
-        }
 
         ecode = ath9k_hw_rf_claim(ah);
         if (ecode != 0)
@@ -611,13 +603,13 @@ static struct ath_hw *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc,
                 ah->intr_mitigation = true;
 
         if (!ath9k_hw_set_reset_reg(ah, ATH9K_RESET_POWER_ON)) {
-                DPRINTF(sc, ATH_DBG_RESET, "Couldn't reset chip\n");
+                DPRINTF(sc, ATH_DBG_FATAL, "Couldn't reset chip\n");
                 ecode = -EIO;
                 goto bad;
         }
 
         if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE)) {
-                DPRINTF(sc, ATH_DBG_RESET, "Couldn't wakeup chip\n");
+                DPRINTF(sc, ATH_DBG_FATAL, "Couldn't wakeup chip\n");
                 ecode = -EIO;
                 goto bad;
         }
@@ -640,7 +632,7 @@ static struct ath_hw *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc,
             (ah->hw_version.macVersion != AR_SREV_VERSION_5416_PCIE) &&
             (ah->hw_version.macVersion != AR_SREV_VERSION_9160) &&
             (!AR_SREV_9100(ah)) && (!AR_SREV_9280(ah)) && (!AR_SREV_9285(ah))) {
-                DPRINTF(sc, ATH_DBG_RESET,
+                DPRINTF(sc, ATH_DBG_FATAL,
                         "Mac Chip Rev 0x%02x.%x is not supported by "
                         "this driver\n", ah->hw_version.macVersion,
                         ah->hw_version.macRev);
@@ -680,10 +672,6 @@ static struct ath_hw *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc,
         if (AR_SREV_9280_10_OR_LATER(ah))
                 ah->ani_function &= ~ATH9K_ANI_NOISE_IMMUNITY_LEVEL;
 
-        DPRINTF(sc, ATH_DBG_RESET,
-                "This Mac Chip Rev 0x%02x.%x is \n",
-                ah->hw_version.macVersion, ah->hw_version.macRev);
-
         if (AR_SREV_9285_12_OR_LATER(ah)) {
 
                 INIT_INI_ARRAY(&ah->iniModes, ar9285Modes_9285_1_2,
@@ -875,8 +863,8 @@ static struct ath_hw *ath9k_hw_do_attach(u16 devid, struct ath_softc *sc,
 
         ecode = ath9k_hw_init_macaddr(ah);
         if (ecode != 0) {
-                DPRINTF(sc, ATH_DBG_RESET,
-                        "failed initializing mac address\n");
+                DPRINTF(sc, ATH_DBG_FATAL,
+                        "Failed to initialize MAC address\n");
                 goto bad;
         }
 
@@ -1193,23 +1181,23 @@ static u32 ath9k_hw_def_ini_fixup(struct ath_hw *ah,
         switch (ah->hw_version.devid) {
         case AR9280_DEVID_PCI:
                 if (reg == 0x7894) {
-                        DPRINTF(ah->ah_sc, ATH_DBG_ANY,
+                        DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
                                 "ini VAL: %x  EEPROM: %x\n", value,
                                 (pBase->version & 0xff));
 
                         if ((pBase->version & 0xff) > 0x0a) {
-                                DPRINTF(ah->ah_sc, ATH_DBG_ANY,
+                                DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
                                         "PWDCLKIND: %d\n",
                                         pBase->pwdclkind);
                                 value &= ~AR_AN_TOP2_PWDCLKIND;
                                 value |= AR_AN_TOP2_PWDCLKIND &
                                         (pBase->pwdclkind << AR_AN_TOP2_PWDCLKIND_S);
                         } else {
-                                DPRINTF(ah->ah_sc, ATH_DBG_ANY,
+                                DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
                                         "PWDCLKIND Earlier Rev\n");
                         }
 
-                        DPRINTF(ah->ah_sc, ATH_DBG_ANY,
+                        DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
                                 "final ini VAL: %x\n", value);
                 }
                 break;
@@ -1356,13 +1344,13 @@ static int ath9k_hw_process_ini(struct ath_hw *ah,
                                   min((u32) MAX_RATE_POWER,
                                       (u32) ah->regulatory.power_limit));
         if (status != 0) {
-                DPRINTF(ah->ah_sc, ATH_DBG_POWER_MGMT,
-                        "error init'ing transmit power\n");
+                DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
+                        "Error initializing transmit power\n");
                 return -EIO;
         }
 
         if (!ath9k_hw_set_rf_regs(ah, chan, freqIndex)) {
-                DPRINTF(ah->ah_sc, ATH_DBG_REG_IO,
+                DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
                         "ar5416SetRfRegs failed\n");
                 return -EIO;
         }
@@ -1668,7 +1656,7 @@ static bool ath9k_hw_channel_change(struct ath_hw *ah,
         REG_WRITE(ah, AR_PHY_RFBUS_REQ, AR_PHY_RFBUS_REQ_EN);
         if (!ath9k_hw_wait(ah, AR_PHY_RFBUS_GRANT, AR_PHY_RFBUS_GRANT_EN,
                            AR_PHY_RFBUS_GRANT_EN, AH_WAIT_TIMEOUT)) {
-                DPRINTF(ah->ah_sc, ATH_DBG_REG_IO,
+                DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
                         "Could not kill baseband RX\n");
                 return false;
         }
@@ -1677,14 +1665,14 @@ static bool ath9k_hw_channel_change(struct ath_hw *ah,
 
         if (AR_SREV_9280_10_OR_LATER(ah)) {
                 if (!(ath9k_hw_ar9280_set_channel(ah, chan))) {
-                        DPRINTF(ah->ah_sc, ATH_DBG_CHANNEL,
-                                "failed to set channel\n");
+                        DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
+                                "Failed to set channel\n");
                         return false;
                 }
         } else {
                 if (!(ath9k_hw_set_channel(ah, chan))) {
-                        DPRINTF(ah->ah_sc, ATH_DBG_CHANNEL,
-                                "failed to set channel\n");
+                        DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
+                                "Failed to set channel\n");
                         return false;
                 }
         }
@@ -1696,7 +1684,7 @@ static bool ath9k_hw_channel_change(struct ath_hw *ah,
                              min((u32) MAX_RATE_POWER,
                                  (u32) ah->regulatory.power_limit)) != 0) {
                 DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
-                        "error init'ing transmit power\n");
+                        "Error initializing transmit power\n");
                 return false;
         }
 
@@ -2224,7 +2212,7 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
         ath9k_hw_mark_phy_inactive(ah);
 
         if (!ath9k_hw_chip_reset(ah, chan)) {
-                DPRINTF(ah->ah_sc, ATH_DBG_RESET, "chip reset failed\n");
+                DPRINTF(ah->ah_sc, ATH_DBG_FATAL, "Chip reset failed\n");
                 return -EINVAL;
         }
 
@@ -2367,8 +2355,8 @@ bool ath9k_hw_keyreset(struct ath_hw *ah, u16 entry)
         u32 keyType;
 
         if (entry >= ah->caps.keycache_size) {
-                DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE,
-                        "entry %u out of range\n", entry);
+                DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
+                        "keychache entry %u out of range\n", entry);
                 return false;
         }
 
@@ -2404,8 +2392,8 @@ bool ath9k_hw_keysetmac(struct ath_hw *ah, u16 entry, const u8 *mac)
         u32 macHi, macLo;
 
         if (entry >= ah->caps.keycache_size) {
-                DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE,
-                        "entry %u out of range\n", entry);
+                DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
+                        "keychache entry %u out of range\n", entry);
                 return false;
         }
 
@@ -2436,8 +2424,8 @@ bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry,
         u32 keyType;
 
         if (entry >= pCap->keycache_size) {
-                DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE,
-                        "entry %u out of range\n", entry);
+                DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
+                        "keycache entry %u out of range\n", entry);
                 return false;
         }
 
@@ -2447,7 +2435,7 @@ bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry,
                 break;
         case ATH9K_CIPHER_AES_CCM:
                 if (!(pCap->hw_caps & ATH9K_HW_CAP_CIPHER_AESCCM)) {
-                        DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE,
+                        DPRINTF(ah->ah_sc, ATH_DBG_ANY,
                                 "AES-CCM not supported by mac rev 0x%x\n",
                                 ah->hw_version.macRev);
                         return false;
@@ -2458,14 +2446,14 @@ bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry,
                 keyType = AR_KEYTABLE_TYPE_TKIP;
                 if (ATH9K_IS_MIC_ENABLED(ah)
                     && entry + 64 >= pCap->keycache_size) {
-                        DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE,
+                        DPRINTF(ah->ah_sc, ATH_DBG_ANY,
                                 "entry %u inappropriate for TKIP\n", entry);
                         return false;
                 }
                 break;
         case ATH9K_CIPHER_WEP:
                 if (k->kv_len < LEN_WEP40) {
-                        DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE,
+                        DPRINTF(ah->ah_sc, ATH_DBG_ANY,
                                 "WEP key length %u too small\n", k->kv_len);
                         return false;
                 }
@@ -2480,7 +2468,7 @@ bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry,
                 keyType = AR_KEYTABLE_TYPE_CLR;
                 break;
         default:
-                DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE,
+                DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
                         "cipher %u not supported\n", k->kv_type);
                 return false;
         }
@@ -2698,7 +2686,7 @@ static bool ath9k_hw_set_power_awake(struct ath_hw *ah, int setChip)
                                     AR_RTC_FORCE_WAKE_EN);
                 }
                 if (i == 0) {
-                        DPRINTF(ah->ah_sc, ATH_DBG_POWER_MGMT,
+                        DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
                                 "Failed to wakeup in %uus\n", POWER_UP_TIME / 20);
                         return false;
                 }
@@ -2719,9 +2707,8 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
                 "UNDEFINED"
         };
 
-        DPRINTF(ah->ah_sc, ATH_DBG_POWER_MGMT, "%s -> %s (%s)\n",
-                modes[ah->power_mode], modes[mode],
-                setChip ? "set chip " : "");
+        DPRINTF(ah->ah_sc, ATH_DBG_RESET, "%s -> %s\n",
+                modes[ah->power_mode], modes[mode]);
 
         switch (mode) {
         case ATH9K_PM_AWAKE:
@@ -2735,7 +2722,7 @@ bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode)
                 ath9k_set_power_network_sleep(ah, setChip);
                 break;
         default:
-                DPRINTF(ah->ah_sc, ATH_DBG_POWER_MGMT,
+                DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
                         "Unknown power mode %u\n", mode);
                 return false;
         }