aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/ath/ath9k/ar9003_paprd.c3
-rw-r--r--drivers/net/wireless/ath/ath9k/link.c10
2 files changed, 11 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
index df9158f53feb..4945fdf61bac 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
@@ -169,6 +169,9 @@ static int ar9003_paprd_setup_single_table(struct ath_hw *ah)
169 REG_RMW_FIELD(ah, AR_PHY_PAPRD_HT40, AR_PHY_PAPRD_HT40_MASK, 169 REG_RMW_FIELD(ah, AR_PHY_PAPRD_HT40, AR_PHY_PAPRD_HT40_MASK,
170 ah->paprd_ratemask_ht40); 170 ah->paprd_ratemask_ht40);
171 171
172 ath_dbg(common, CALIBRATE, "PAPRD HT20 mask: 0x%x, HT40 mask: 0x%x\n",
173 ah->paprd_ratemask, ah->paprd_ratemask_ht40);
174
172 for (i = 0; i < ah->caps.max_txchains; i++) { 175 for (i = 0; i < ah->caps.max_txchains; i++) {
173 REG_RMW_FIELD(ah, ctrl0[i], 176 REG_RMW_FIELD(ah, ctrl0[i],
174 AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK, 1); 177 AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK, 1);
diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c
index fc6b075ad635..3c996ffe63c3 100644
--- a/drivers/net/wireless/ath/ath9k/link.c
+++ b/drivers/net/wireless/ath/ath9k/link.c
@@ -179,11 +179,14 @@ void ath_rx_poll(unsigned long data)
179static void ath_paprd_activate(struct ath_softc *sc) 179static void ath_paprd_activate(struct ath_softc *sc)
180{ 180{
181 struct ath_hw *ah = sc->sc_ah; 181 struct ath_hw *ah = sc->sc_ah;
182 struct ath_common *common = ath9k_hw_common(ah);
182 struct ath9k_hw_cal_data *caldata = ah->caldata; 183 struct ath9k_hw_cal_data *caldata = ah->caldata;
183 int chain; 184 int chain;
184 185
185 if (!caldata || !caldata->paprd_done) 186 if (!caldata || !caldata->paprd_done) {
187 ath_dbg(common, CALIBRATE, "Failed to activate PAPRD\n");
186 return; 188 return;
189 }
187 190
188 ath9k_ps_wakeup(sc); 191 ath9k_ps_wakeup(sc);
189 ar9003_paprd_enable(ah, false); 192 ar9003_paprd_enable(ah, false);
@@ -194,6 +197,7 @@ static void ath_paprd_activate(struct ath_softc *sc)
194 ar9003_paprd_populate_single_table(ah, caldata, chain); 197 ar9003_paprd_populate_single_table(ah, caldata, chain);
195 } 198 }
196 199
200 ath_dbg(common, CALIBRATE, "Activating PAPRD\n");
197 ar9003_paprd_enable(ah, true); 201 ar9003_paprd_enable(ah, true);
198 ath9k_ps_restore(sc); 202 ath9k_ps_restore(sc);
199} 203}
@@ -253,8 +257,10 @@ void ath_paprd_calibrate(struct work_struct *work)
253 int len = 1800; 257 int len = 1800;
254 int ret; 258 int ret;
255 259
256 if (!caldata || !caldata->paprd_packet_sent || caldata->paprd_done) 260 if (!caldata || !caldata->paprd_packet_sent || caldata->paprd_done) {
261 ath_dbg(common, CALIBRATE, "Skipping PAPRD calibration\n");
257 return; 262 return;
263 }
258 264
259 ath9k_ps_wakeup(sc); 265 ath9k_ps_wakeup(sc);
260 266