aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalle Valo <kvalo@qca.qualcomm.com>2011-10-13 08:21:15 -0400
committerKalle Valo <kvalo@qca.qualcomm.com>2011-11-11 05:50:57 -0500
commitebf29c95cfc6f7309ce999af4aa91ba22323f80d (patch)
tree7cf7e9f63ecd96c52354e5086a64b79b2795cd8d
parent8fffd9e5ec9ea046ff45c7974395ffbcb4bbef14 (diff)
ath6kl: merge htc debug levels
It's not really necessary to have separate debug levels for htc tx and rx so combine them. Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/ath6kl/debug.c5
-rw-r--r--drivers/net/wireless/ath/ath6kl/debug.h4
-rw-r--r--drivers/net/wireless/ath/ath6kl/hif.c6
-rw-r--r--drivers/net/wireless/ath/ath6kl/htc.c84
4 files changed, 50 insertions, 49 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
index 460f211bb40c..e109f29f5862 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.c
+++ b/drivers/net/wireless/ath/ath6kl/debug.c
@@ -180,9 +180,10 @@ void dump_cred_dist_stats(struct htc_target *target)
180 list_for_each_entry(ep_list, &target->cred_dist_list, list) 180 list_for_each_entry(ep_list, &target->cred_dist_list, list)
181 dump_cred_dist(ep_list); 181 dump_cred_dist(ep_list);
182 182
183 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "ctxt:%p dist:%p\n", 183 ath6kl_dbg(ATH6KL_DBG_HTC, "ctxt:%p dist:%p\n",
184 target->cred_dist_cntxt, NULL); 184 target->cred_dist_cntxt, NULL);
185 ath6kl_dbg(ATH6KL_DBG_TRC, "credit distribution, total : %d, free : %d\n", 185 ath6kl_dbg(ATH6KL_DBG_HTC,
186 "credit distribution, total : %d, free : %d\n",
186 target->cred_dist_cntxt->total_avail_credits, 187 target->cred_dist_cntxt->total_avail_credits,
187 target->cred_dist_cntxt->cur_free_credits); 188 target->cred_dist_cntxt->cur_free_credits);
188} 189}
diff --git a/drivers/net/wireless/ath/ath6kl/debug.h b/drivers/net/wireless/ath/ath6kl/debug.h
index 7d5323d34df7..01f4015071ec 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.h
+++ b/drivers/net/wireless/ath/ath6kl/debug.h
@@ -25,8 +25,8 @@ enum ATH6K_DEBUG_MASK {
25 ATH6KL_DBG_WLAN_TX = BIT(2), /* wlan tx */ 25 ATH6KL_DBG_WLAN_TX = BIT(2), /* wlan tx */
26 ATH6KL_DBG_WLAN_RX = BIT(3), /* wlan rx */ 26 ATH6KL_DBG_WLAN_RX = BIT(3), /* wlan rx */
27 ATH6KL_DBG_BMI = BIT(4), /* bmi tracing */ 27 ATH6KL_DBG_BMI = BIT(4), /* bmi tracing */
28 ATH6KL_DBG_HTC_SEND = BIT(5), /* htc send */ 28 ATH6KL_DBG_HTC = BIT(5),
29 ATH6KL_DBG_HTC_RECV = BIT(6), /* htc recv */ 29 /* hole */
30 ATH6KL_DBG_IRQ = BIT(7), /* interrupt processing */ 30 ATH6KL_DBG_IRQ = BIT(7), /* interrupt processing */
31 ATH6KL_DBG_PM = BIT(8), /* power management */ 31 ATH6KL_DBG_PM = BIT(8), /* power management */
32 ATH6KL_DBG_WLAN_NODE = BIT(9), /* general wlan node tracing */ 32 ATH6KL_DBG_WLAN_NODE = BIT(9), /* general wlan node tracing */
diff --git a/drivers/net/wireless/ath/ath6kl/hif.c b/drivers/net/wireless/ath/ath6kl/hif.c
index 57c9aff0dc6d..7cc6cec1c077 100644
--- a/drivers/net/wireless/ath/ath6kl/hif.c
+++ b/drivers/net/wireless/ath/ath6kl/hif.c
@@ -51,7 +51,7 @@ int ath6kl_hif_rw_comp_handler(void *context, int status)
51{ 51{
52 struct htc_packet *packet = context; 52 struct htc_packet *packet = context;
53 53
54 ath6kl_dbg(ATH6KL_DBG_HTC_RECV, 54 ath6kl_dbg(ATH6KL_DBG_HTC,
55 "ath6kl_hif_rw_comp_handler (pkt:0x%p , status: %d\n", 55 "ath6kl_hif_rw_comp_handler (pkt:0x%p , status: %d\n",
56 packet, status); 56 packet, status);
57 57
@@ -119,7 +119,7 @@ int ath6kl_hif_poll_mboxmsg_rx(struct ath6kl_device *dev, u32 *lk_ahd,
119 119
120 /* delay a little */ 120 /* delay a little */
121 mdelay(ATH6KL_TIME_QUANTUM); 121 mdelay(ATH6KL_TIME_QUANTUM);
122 ath6kl_dbg(ATH6KL_DBG_HTC_RECV, "retry mbox poll : %d\n", i); 122 ath6kl_dbg(ATH6KL_DBG_HTC, "retry mbox poll : %d\n", i);
123 } 123 }
124 124
125 if (i == 0) { 125 if (i == 0) {
@@ -186,7 +186,7 @@ int ath6kl_hif_submit_scat_req(struct ath6kl_device *dev,
186 dev->ar->mbox_info.htc_addr; 186 dev->ar->mbox_info.htc_addr;
187 } 187 }
188 188
189 ath6kl_dbg((ATH6KL_DBG_HTC_RECV | ATH6KL_DBG_HTC_SEND), 189 ath6kl_dbg(ATH6KL_DBG_HTC,
190 "ath6kl_hif_submit_scat_req, entries: %d, total len: %d mbox:0x%X (mode: %s : %s)\n", 190 "ath6kl_hif_submit_scat_req, entries: %d, total len: %d mbox:0x%X (mode: %s : %s)\n",
191 scat_req->scat_entries, scat_req->len, 191 scat_req->scat_entries, scat_req->len,
192 scat_req->addr, !read ? "async" : "sync", 192 scat_req->addr, !read ? "async" : "sync",
diff --git a/drivers/net/wireless/ath/ath6kl/htc.c b/drivers/net/wireless/ath/ath6kl/htc.c
index 9b8cb22eba9e..241a7cec9f4a 100644
--- a/drivers/net/wireless/ath/ath6kl/htc.c
+++ b/drivers/net/wireless/ath/ath6kl/htc.c
@@ -102,7 +102,7 @@ static void htc_tx_comp_update(struct htc_target *target,
102 packet->info.tx.cred_used; 102 packet->info.tx.cred_used;
103 endpoint->cred_dist.txq_depth = get_queue_depth(&endpoint->txq); 103 endpoint->cred_dist.txq_depth = get_queue_depth(&endpoint->txq);
104 104
105 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "ctxt:0x%p dist:0x%p\n", 105 ath6kl_dbg(ATH6KL_DBG_HTC, "ctxt:0x%p dist:0x%p\n",
106 target->cred_dist_cntxt, &target->cred_dist_list); 106 target->cred_dist_cntxt, &target->cred_dist_list);
107 107
108 ath6k_credit_distribute(target->cred_dist_cntxt, 108 ath6k_credit_distribute(target->cred_dist_cntxt,
@@ -118,7 +118,7 @@ static void htc_tx_complete(struct htc_endpoint *endpoint,
118 if (list_empty(txq)) 118 if (list_empty(txq))
119 return; 119 return;
120 120
121 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 121 ath6kl_dbg(ATH6KL_DBG_HTC,
122 "send complete ep %d, (%d pkts)\n", 122 "send complete ep %d, (%d pkts)\n",
123 endpoint->eid, get_queue_depth(txq)); 123 endpoint->eid, get_queue_depth(txq));
124 124
@@ -148,7 +148,7 @@ static void htc_async_tx_scat_complete(struct htc_target *target,
148 148
149 INIT_LIST_HEAD(&tx_compq); 149 INIT_LIST_HEAD(&tx_compq);
150 150
151 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 151 ath6kl_dbg(ATH6KL_DBG_HTC,
152 "htc_async_tx_scat_complete total len: %d entries: %d\n", 152 "htc_async_tx_scat_complete total len: %d entries: %d\n",
153 scat_req->len, scat_req->scat_entries); 153 scat_req->len, scat_req->scat_entries);
154 154
@@ -190,12 +190,12 @@ static int ath6kl_htc_tx_issue(struct htc_target *target,
190 190
191 send_len = packet->act_len + HTC_HDR_LENGTH; 191 send_len = packet->act_len + HTC_HDR_LENGTH;
192 192
193 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "%s: transmit len : %d (%s)\n", 193 ath6kl_dbg(ATH6KL_DBG_HTC, "%s: transmit len : %d (%s)\n",
194 __func__, send_len, sync ? "sync" : "async"); 194 __func__, send_len, sync ? "sync" : "async");
195 195
196 padded_len = CALC_TXRX_PADDED_LEN(target, send_len); 196 padded_len = CALC_TXRX_PADDED_LEN(target, send_len);
197 197
198 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 198 ath6kl_dbg(ATH6KL_DBG_HTC,
199 "DevSendPacket, padded len: %d mbox:0x%X (mode:%s)\n", 199 "DevSendPacket, padded len: %d mbox:0x%X (mode:%s)\n",
200 padded_len, 200 padded_len,
201 target->dev->ar->mbox_info.htc_addr, 201 target->dev->ar->mbox_info.htc_addr,
@@ -227,7 +227,7 @@ static int htc_check_credits(struct htc_target *target,
227 *req_cred = (len > target->tgt_cred_sz) ? 227 *req_cred = (len > target->tgt_cred_sz) ?
228 DIV_ROUND_UP(len, target->tgt_cred_sz) : 1; 228 DIV_ROUND_UP(len, target->tgt_cred_sz) : 1;
229 229
230 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "creds required:%d got:%d\n", 230 ath6kl_dbg(ATH6KL_DBG_HTC, "creds required:%d got:%d\n",
231 *req_cred, ep->cred_dist.credits); 231 *req_cred, ep->cred_dist.credits);
232 232
233 if (ep->cred_dist.credits < *req_cred) { 233 if (ep->cred_dist.credits < *req_cred) {
@@ -237,7 +237,7 @@ static int htc_check_credits(struct htc_target *target,
237 /* Seek more credits */ 237 /* Seek more credits */
238 ep->cred_dist.seek_cred = *req_cred - ep->cred_dist.credits; 238 ep->cred_dist.seek_cred = *req_cred - ep->cred_dist.credits;
239 239
240 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "ctxt:0x%p dist:0x%p\n", 240 ath6kl_dbg(ATH6KL_DBG_HTC, "ctxt:0x%p dist:0x%p\n",
241 target->cred_dist_cntxt, &ep->cred_dist); 241 target->cred_dist_cntxt, &ep->cred_dist);
242 242
243 ath6k_seek_credits(target->cred_dist_cntxt, &ep->cred_dist); 243 ath6k_seek_credits(target->cred_dist_cntxt, &ep->cred_dist);
@@ -245,7 +245,7 @@ static int htc_check_credits(struct htc_target *target,
245 ep->cred_dist.seek_cred = 0; 245 ep->cred_dist.seek_cred = 0;
246 246
247 if (ep->cred_dist.credits < *req_cred) { 247 if (ep->cred_dist.credits < *req_cred) {
248 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 248 ath6kl_dbg(ATH6KL_DBG_HTC,
249 "not enough credits for ep %d - leaving packet in queue\n", 249 "not enough credits for ep %d - leaving packet in queue\n",
250 eid); 250 eid);
251 return -EINVAL; 251 return -EINVAL;
@@ -260,7 +260,7 @@ static int htc_check_credits(struct htc_target *target,
260 ep->cred_dist.seek_cred = 260 ep->cred_dist.seek_cred =
261 ep->cred_dist.cred_per_msg - ep->cred_dist.credits; 261 ep->cred_dist.cred_per_msg - ep->cred_dist.credits;
262 262
263 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "ctxt:0x%p dist:0x%p\n", 263 ath6kl_dbg(ATH6KL_DBG_HTC, "ctxt:0x%p dist:0x%p\n",
264 target->cred_dist_cntxt, &ep->cred_dist); 264 target->cred_dist_cntxt, &ep->cred_dist);
265 265
266 ath6k_seek_credits(target->cred_dist_cntxt, &ep->cred_dist); 266 ath6k_seek_credits(target->cred_dist_cntxt, &ep->cred_dist);
@@ -270,7 +270,7 @@ static int htc_check_credits(struct htc_target *target,
270 /* tell the target we need credits ASAP! */ 270 /* tell the target we need credits ASAP! */
271 *flags |= HTC_FLAGS_NEED_CREDIT_UPDATE; 271 *flags |= HTC_FLAGS_NEED_CREDIT_UPDATE;
272 ep->ep_st.cred_low_indicate += 1; 272 ep->ep_st.cred_low_indicate += 1;
273 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "host needs credits\n"); 273 ath6kl_dbg(ATH6KL_DBG_HTC, "host needs credits\n");
274 } 274 }
275 } 275 }
276 276
@@ -295,7 +295,7 @@ static void ath6kl_htc_tx_pkts_get(struct htc_target *target,
295 packet = list_first_entry(&endpoint->txq, struct htc_packet, 295 packet = list_first_entry(&endpoint->txq, struct htc_packet,
296 list); 296 list);
297 297
298 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 298 ath6kl_dbg(ATH6KL_DBG_HTC,
299 "got head pkt:0x%p , queue depth: %d\n", 299 "got head pkt:0x%p , queue depth: %d\n",
300 packet, get_queue_depth(&endpoint->txq)); 300 packet, get_queue_depth(&endpoint->txq));
301 301
@@ -404,7 +404,7 @@ static int ath6kl_htc_tx_setup_scat_list(struct htc_target *target,
404 404
405 scat_req->len += len; 405 scat_req->len += len;
406 scat_req->scat_entries++; 406 scat_req->scat_entries++;
407 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 407 ath6kl_dbg(ATH6KL_DBG_HTC,
408 "%d, adding pkt : 0x%p len:%d (remaining space:%d)\n", 408 "%d, adding pkt : 0x%p len:%d (remaining space:%d)\n",
409 i, packet, len, rem_scat); 409 i, packet, len, rem_scat);
410 } 410 }
@@ -455,12 +455,12 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint,
455 455
456 if (!scat_req) { 456 if (!scat_req) {
457 /* no scatter resources */ 457 /* no scatter resources */
458 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 458 ath6kl_dbg(ATH6KL_DBG_HTC,
459 "no more scatter resources\n"); 459 "no more scatter resources\n");
460 break; 460 break;
461 } 461 }
462 462
463 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "pkts to scatter: %d\n", 463 ath6kl_dbg(ATH6KL_DBG_HTC, "pkts to scatter: %d\n",
464 n_scat); 464 n_scat);
465 465
466 scat_req->len = 0; 466 scat_req->len = 0;
@@ -479,7 +479,7 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint,
479 n_sent_bundle++; 479 n_sent_bundle++;
480 tot_pkts_bundle += scat_req->scat_entries; 480 tot_pkts_bundle += scat_req->scat_entries;
481 481
482 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 482 ath6kl_dbg(ATH6KL_DBG_HTC,
483 "send scatter total bytes: %d , entries: %d\n", 483 "send scatter total bytes: %d , entries: %d\n",
484 scat_req->len, scat_req->scat_entries); 484 scat_req->len, scat_req->scat_entries);
485 ath6kl_hif_submit_scat_req(target->dev, scat_req, false); 485 ath6kl_hif_submit_scat_req(target->dev, scat_req, false);
@@ -490,7 +490,7 @@ static void ath6kl_htc_tx_bundle(struct htc_endpoint *endpoint,
490 490
491 *sent_bundle = n_sent_bundle; 491 *sent_bundle = n_sent_bundle;
492 *n_bundle_pkts = tot_pkts_bundle; 492 *n_bundle_pkts = tot_pkts_bundle;
493 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "%s (sent:%d)\n", 493 ath6kl_dbg(ATH6KL_DBG_HTC, "%s (sent:%d)\n",
494 __func__, n_sent_bundle); 494 __func__, n_sent_bundle);
495 495
496 return; 496 return;
@@ -510,7 +510,7 @@ static void ath6kl_htc_tx_from_queue(struct htc_target *target,
510 if (endpoint->tx_proc_cnt > 1) { 510 if (endpoint->tx_proc_cnt > 1) {
511 endpoint->tx_proc_cnt--; 511 endpoint->tx_proc_cnt--;
512 spin_unlock_bh(&target->tx_lock); 512 spin_unlock_bh(&target->tx_lock);
513 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "htc_try_send (busy)\n"); 513 ath6kl_dbg(ATH6KL_DBG_HTC, "htc_try_send (busy)\n");
514 return; 514 return;
515 } 515 }
516 516
@@ -588,13 +588,13 @@ static bool ath6kl_htc_tx_try(struct htc_target *target,
588 overflow = true; 588 overflow = true;
589 589
590 if (overflow) 590 if (overflow)
591 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 591 ath6kl_dbg(ATH6KL_DBG_HTC,
592 "ep %d, tx queue will overflow :%d , tx depth:%d, max:%d\n", 592 "ep %d, tx queue will overflow :%d , tx depth:%d, max:%d\n",
593 endpoint->eid, overflow, txq_depth, 593 endpoint->eid, overflow, txq_depth,
594 endpoint->max_txq_depth); 594 endpoint->max_txq_depth);
595 595
596 if (overflow && ep_cb.tx_full) { 596 if (overflow && ep_cb.tx_full) {
597 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 597 ath6kl_dbg(ATH6KL_DBG_HTC,
598 "indicating overflowed tx packet: 0x%p\n", tx_pkt); 598 "indicating overflowed tx packet: 0x%p\n", tx_pkt);
599 599
600 if (ep_cb.tx_full(endpoint->target, tx_pkt) == 600 if (ep_cb.tx_full(endpoint->target, tx_pkt) ==
@@ -629,7 +629,7 @@ static void htc_chk_ep_txq(struct htc_target *target)
629 629
630 spin_lock_bh(&target->tx_lock); 630 spin_lock_bh(&target->tx_lock);
631 if (!list_empty(&endpoint->txq)) { 631 if (!list_empty(&endpoint->txq)) {
632 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 632 ath6kl_dbg(ATH6KL_DBG_HTC,
633 "ep %d has %d credits and %d packets in tx queue\n", 633 "ep %d has %d credits and %d packets in tx queue\n",
634 cred_dist->endpoint, 634 cred_dist->endpoint,
635 endpoint->cred_dist.credits, 635 endpoint->cred_dist.credits,
@@ -736,7 +736,7 @@ int ath6kl_htc_tx(struct htc_target *target, struct htc_packet *packet)
736 struct htc_endpoint *endpoint; 736 struct htc_endpoint *endpoint;
737 struct list_head queue; 737 struct list_head queue;
738 738
739 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 739 ath6kl_dbg(ATH6KL_DBG_HTC,
740 "htc_tx: ep id: %d, buf: 0x%p, len: %d\n", 740 "htc_tx: ep id: %d, buf: 0x%p, len: %d\n",
741 packet->endpoint, packet->buf, packet->act_len); 741 packet->endpoint, packet->buf, packet->act_len);
742 742
@@ -787,7 +787,7 @@ void ath6kl_htc_flush_txep(struct htc_target *target,
787 list_for_each_entry_safe(packet, tmp_pkt, &discard_q, list) { 787 list_for_each_entry_safe(packet, tmp_pkt, &discard_q, list) {
788 packet->status = -ECANCELED; 788 packet->status = -ECANCELED;
789 list_del(&packet->list); 789 list_del(&packet->list);
790 ath6kl_dbg(ATH6KL_DBG_TRC, 790 ath6kl_dbg(ATH6KL_DBG_HTC,
791 "flushing tx pkt:0x%p, len:%d, ep:%d tag:0x%X\n", 791 "flushing tx pkt:0x%p, len:%d, ep:%d tag:0x%X\n",
792 packet, packet->act_len, 792 packet, packet->act_len,
793 packet->endpoint, packet->info.tx.tag); 793 packet->endpoint, packet->info.tx.tag);
@@ -844,7 +844,7 @@ void ath6kl_htc_indicate_activity_change(struct htc_target *target,
844 endpoint->cred_dist.txq_depth = 844 endpoint->cred_dist.txq_depth =
845 get_queue_depth(&endpoint->txq); 845 get_queue_depth(&endpoint->txq);
846 846
847 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "ctxt:0x%p dist:0x%p\n", 847 ath6kl_dbg(ATH6KL_DBG_HTC, "ctxt:0x%p dist:0x%p\n",
848 target->cred_dist_cntxt, &target->cred_dist_list); 848 target->cred_dist_cntxt, &target->cred_dist_list);
849 849
850 ath6k_credit_distribute(target->cred_dist_cntxt, 850 ath6k_credit_distribute(target->cred_dist_cntxt,
@@ -924,7 +924,7 @@ static int ath6kl_htc_rx_packet(struct htc_target *target,
924 return -ENOMEM; 924 return -ENOMEM;
925 } 925 }
926 926
927 ath6kl_dbg(ATH6KL_DBG_HTC_RECV, 927 ath6kl_dbg(ATH6KL_DBG_HTC,
928 "dev_rx_pkt (0x%p : hdr:0x%X) padded len: %d mbox:0x%X (mode:%s)\n", 928 "dev_rx_pkt (0x%p : hdr:0x%X) padded len: %d mbox:0x%X (mode:%s)\n",
929 packet, packet->info.rx.exp_hdr, 929 packet, packet->info.rx.exp_hdr,
930 padded_len, dev->ar->mbox_info.htc_addr, "sync"); 930 padded_len, dev->ar->mbox_info.htc_addr, "sync");
@@ -1137,7 +1137,7 @@ static int ath6kl_htc_rx_alloc(struct htc_target *target,
1137 } 1137 }
1138 1138
1139 endpoint->ep_st.rx_bundle_from_hdr += 1; 1139 endpoint->ep_st.rx_bundle_from_hdr += 1;
1140 ath6kl_dbg(ATH6KL_DBG_HTC_RECV, 1140 ath6kl_dbg(ATH6KL_DBG_HTC,
1141 "htc hdr indicates :%d msg can be fetched as a bundle\n", 1141 "htc hdr indicates :%d msg can be fetched as a bundle\n",
1142 n_msg); 1142 n_msg);
1143 } else 1143 } else
@@ -1209,7 +1209,7 @@ static void htc_proc_cred_rpt(struct htc_target *target,
1209 int tot_credits = 0, i; 1209 int tot_credits = 0, i;
1210 bool dist = false; 1210 bool dist = false;
1211 1211
1212 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 1212 ath6kl_dbg(ATH6KL_DBG_HTC,
1213 "htc_proc_cred_rpt, credit report entries:%d\n", n_entries); 1213 "htc_proc_cred_rpt, credit report entries:%d\n", n_entries);
1214 1214
1215 spin_lock_bh(&target->tx_lock); 1215 spin_lock_bh(&target->tx_lock);
@@ -1223,7 +1223,7 @@ static void htc_proc_cred_rpt(struct htc_target *target,
1223 1223
1224 endpoint = &target->endpoint[rpt->eid]; 1224 endpoint = &target->endpoint[rpt->eid];
1225 1225
1226 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, " ep %d got %d credits\n", 1226 ath6kl_dbg(ATH6KL_DBG_HTC, " ep %d got %d credits\n",
1227 rpt->eid, rpt->credits); 1227 rpt->eid, rpt->credits);
1228 1228
1229 endpoint->ep_st.tx_cred_rpt += 1; 1229 endpoint->ep_st.tx_cred_rpt += 1;
@@ -1264,7 +1264,7 @@ static void htc_proc_cred_rpt(struct htc_target *target,
1264 tot_credits += rpt->credits; 1264 tot_credits += rpt->credits;
1265 } 1265 }
1266 1266
1267 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, 1267 ath6kl_dbg(ATH6KL_DBG_HTC,
1268 "report indicated %d credits to distribute\n", 1268 "report indicated %d credits to distribute\n",
1269 tot_credits); 1269 tot_credits);
1270 1270
@@ -1273,7 +1273,7 @@ static void htc_proc_cred_rpt(struct htc_target *target,
1273 * This was a credit return based on a completed send 1273 * This was a credit return based on a completed send
1274 * operations note, this is done with the lock held 1274 * operations note, this is done with the lock held
1275 */ 1275 */
1276 ath6kl_dbg(ATH6KL_DBG_HTC_SEND, "ctxt:0x%p dist:0x%p\n", 1276 ath6kl_dbg(ATH6KL_DBG_HTC, "ctxt:0x%p dist:0x%p\n",
1277 target->cred_dist_cntxt, &target->cred_dist_list); 1277 target->cred_dist_cntxt, &target->cred_dist_list);
1278 1278
1279 ath6k_credit_distribute(target->cred_dist_cntxt, 1279 ath6k_credit_distribute(target->cred_dist_cntxt,
@@ -1320,7 +1320,7 @@ static int htc_parse_trailer(struct htc_target *target,
1320 if ((lk_ahd->pre_valid == ((~lk_ahd->post_valid) & 0xFF)) 1320 if ((lk_ahd->pre_valid == ((~lk_ahd->post_valid) & 0xFF))
1321 && next_lk_ahds) { 1321 && next_lk_ahds) {
1322 1322
1323 ath6kl_dbg(ATH6KL_DBG_HTC_RECV, 1323 ath6kl_dbg(ATH6KL_DBG_HTC,
1324 "lk_ahd report found (pre valid:0x%X, post valid:0x%X)\n", 1324 "lk_ahd report found (pre valid:0x%X, post valid:0x%X)\n",
1325 lk_ahd->pre_valid, lk_ahd->post_valid); 1325 lk_ahd->pre_valid, lk_ahd->post_valid);
1326 1326
@@ -1378,7 +1378,7 @@ static int htc_proc_trailer(struct htc_target *target,
1378 u8 *record_buf; 1378 u8 *record_buf;
1379 u8 *orig_buf; 1379 u8 *orig_buf;
1380 1380
1381 ath6kl_dbg(ATH6KL_DBG_HTC_RECV, "+htc_proc_trailer (len:%d)\n", len); 1381 ath6kl_dbg(ATH6KL_DBG_HTC, "+htc_proc_trailer (len:%d)\n", len);
1382 1382
1383 ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES, "Recv Trailer", "", 1383 ath6kl_dbg_dump(ATH6KL_DBG_RAW_BYTES, "Recv Trailer", "",
1384 buf, len); 1384 buf, len);
@@ -1534,7 +1534,7 @@ fail_rx:
1534static void ath6kl_htc_rx_complete(struct htc_endpoint *endpoint, 1534static void ath6kl_htc_rx_complete(struct htc_endpoint *endpoint,
1535 struct htc_packet *packet) 1535 struct htc_packet *packet)
1536{ 1536{
1537 ath6kl_dbg(ATH6KL_DBG_HTC_RECV, 1537 ath6kl_dbg(ATH6KL_DBG_HTC,
1538 "htc calling ep %d recv callback on packet 0x%p\n", 1538 "htc calling ep %d recv callback on packet 0x%p\n",
1539 endpoint->eid, packet); 1539 endpoint->eid, packet);
1540 endpoint->ep_cb.rx(endpoint->target, packet); 1540 endpoint->ep_cb.rx(endpoint->target, packet);
@@ -1571,7 +1571,7 @@ static int ath6kl_htc_rx_bundle(struct htc_target *target,
1571 1571
1572 len = 0; 1572 len = 0;
1573 1573
1574 ath6kl_dbg(ATH6KL_DBG_HTC_RECV, 1574 ath6kl_dbg(ATH6KL_DBG_HTC,
1575 "%s(): (numpackets: %d , actual : %d)\n", 1575 "%s(): (numpackets: %d , actual : %d)\n",
1576 __func__, get_queue_depth(rxq), n_scat_pkt); 1576 __func__, get_queue_depth(rxq), n_scat_pkt);
1577 1577
@@ -1897,7 +1897,7 @@ static struct htc_packet *htc_wait_for_ctrl_msg(struct htc_target *target)
1897 HTC_TARGET_RESPONSE_TIMEOUT)) 1897 HTC_TARGET_RESPONSE_TIMEOUT))
1898 return NULL; 1898 return NULL;
1899 1899
1900 ath6kl_dbg(ATH6KL_DBG_HTC_RECV, 1900 ath6kl_dbg(ATH6KL_DBG_HTC,
1901 "htc_wait_for_ctrl_msg: look_ahead : 0x%X\n", look_ahead); 1901 "htc_wait_for_ctrl_msg: look_ahead : 0x%X\n", look_ahead);
1902 1902
1903 htc_hdr = (struct htc_frame_hdr *)&look_ahead; 1903 htc_hdr = (struct htc_frame_hdr *)&look_ahead;
@@ -1962,7 +1962,7 @@ int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,
1962 1962
1963 depth = get_queue_depth(pkt_queue); 1963 depth = get_queue_depth(pkt_queue);
1964 1964
1965 ath6kl_dbg(ATH6KL_DBG_HTC_RECV, 1965 ath6kl_dbg(ATH6KL_DBG_HTC,
1966 "htc_add_rxbuf_multiple: ep id: %d, cnt:%d, len: %d\n", 1966 "htc_add_rxbuf_multiple: ep id: %d, cnt:%d, len: %d\n",
1967 first_pkt->endpoint, depth, first_pkt->buf_len); 1967 first_pkt->endpoint, depth, first_pkt->buf_len);
1968 1968
@@ -1988,7 +1988,7 @@ int ath6kl_htc_add_rxbuf_multiple(struct htc_target *target,
1988 /* check if we are blocked waiting for a new buffer */ 1988 /* check if we are blocked waiting for a new buffer */
1989 if (target->rx_st_flags & HTC_RECV_WAIT_BUFFERS) { 1989 if (target->rx_st_flags & HTC_RECV_WAIT_BUFFERS) {
1990 if (target->ep_waiting == first_pkt->endpoint) { 1990 if (target->ep_waiting == first_pkt->endpoint) {
1991 ath6kl_dbg(ATH6KL_DBG_HTC_RECV, 1991 ath6kl_dbg(ATH6KL_DBG_HTC,
1992 "receiver was blocked on ep:%d, unblocking.\n", 1992 "receiver was blocked on ep:%d, unblocking.\n",
1993 target->ep_waiting); 1993 target->ep_waiting);
1994 target->rx_st_flags &= ~HTC_RECV_WAIT_BUFFERS; 1994 target->rx_st_flags &= ~HTC_RECV_WAIT_BUFFERS;
@@ -2023,7 +2023,7 @@ void ath6kl_htc_flush_rx_buf(struct htc_target *target)
2023 &endpoint->rx_bufq, list) { 2023 &endpoint->rx_bufq, list) {
2024 list_del(&packet->list); 2024 list_del(&packet->list);
2025 spin_unlock_bh(&target->rx_lock); 2025 spin_unlock_bh(&target->rx_lock);
2026 ath6kl_dbg(ATH6KL_DBG_HTC_RECV, 2026 ath6kl_dbg(ATH6KL_DBG_HTC,
2027 "flushing rx pkt:0x%p, len:%d, ep:%d\n", 2027 "flushing rx pkt:0x%p, len:%d, ep:%d\n",
2028 packet, packet->buf_len, 2028 packet, packet->buf_len,
2029 packet->endpoint); 2029 packet->endpoint);
@@ -2047,7 +2047,7 @@ int ath6kl_htc_conn_service(struct htc_target *target,
2047 unsigned int max_msg_sz = 0; 2047 unsigned int max_msg_sz = 0;
2048 int status = 0; 2048 int status = 0;
2049 2049
2050 ath6kl_dbg(ATH6KL_DBG_TRC, 2050 ath6kl_dbg(ATH6KL_DBG_HTC,
2051 "htc_conn_service, target:0x%p service id:0x%X\n", 2051 "htc_conn_service, target:0x%p service id:0x%X\n",
2052 target, conn_req->svc_id); 2052 target, conn_req->svc_id);
2053 2053
@@ -2220,7 +2220,7 @@ static void htc_setup_msg_bndl(struct htc_target *target)
2220 target->msg_per_bndl_max = min(target->max_scat_entries, 2220 target->msg_per_bndl_max = min(target->max_scat_entries,
2221 target->msg_per_bndl_max); 2221 target->msg_per_bndl_max);
2222 2222
2223 ath6kl_dbg(ATH6KL_DBG_TRC, 2223 ath6kl_dbg(ATH6KL_DBG_HTC,
2224 "htc bundling allowed. max msg per htc bundle: %d\n", 2224 "htc bundling allowed. max msg per htc bundle: %d\n",
2225 target->msg_per_bndl_max); 2225 target->msg_per_bndl_max);
2226 2226
@@ -2230,7 +2230,7 @@ static void htc_setup_msg_bndl(struct htc_target *target)
2230 target->max_tx_bndl_sz = min(HIF_MBOX0_EXT_WIDTH, 2230 target->max_tx_bndl_sz = min(HIF_MBOX0_EXT_WIDTH,
2231 target->max_xfer_szper_scatreq); 2231 target->max_xfer_szper_scatreq);
2232 2232
2233 ath6kl_dbg(ATH6KL_DBG_ANY, "max recv: %d max send: %d\n", 2233 ath6kl_dbg(ATH6KL_DBG_HTC, "max recv: %d max send: %d\n",
2234 target->max_rx_bndl_sz, target->max_tx_bndl_sz); 2234 target->max_rx_bndl_sz, target->max_tx_bndl_sz);
2235 2235
2236 if (target->max_tx_bndl_sz) 2236 if (target->max_tx_bndl_sz)
@@ -2284,7 +2284,7 @@ int ath6kl_htc_wait_target(struct htc_target *target)
2284 target->tgt_creds = le16_to_cpu(rdy_msg->ver2_0_info.cred_cnt); 2284 target->tgt_creds = le16_to_cpu(rdy_msg->ver2_0_info.cred_cnt);
2285 target->tgt_cred_sz = le16_to_cpu(rdy_msg->ver2_0_info.cred_sz); 2285 target->tgt_cred_sz = le16_to_cpu(rdy_msg->ver2_0_info.cred_sz);
2286 2286
2287 ath6kl_dbg(ATH6KL_DBG_HTC_RECV, 2287 ath6kl_dbg(ATH6KL_DBG_HTC,
2288 "target ready: credits: %d credit size: %d\n", 2288 "target ready: credits: %d credit size: %d\n",
2289 target->tgt_creds, target->tgt_cred_sz); 2289 target->tgt_creds, target->tgt_cred_sz);
2290 2290
@@ -2299,7 +2299,7 @@ int ath6kl_htc_wait_target(struct htc_target *target)
2299 target->msg_per_bndl_max = 0; 2299 target->msg_per_bndl_max = 0;
2300 } 2300 }
2301 2301
2302 ath6kl_dbg(ATH6KL_DBG_TRC, "using htc protocol version : %s (%d)\n", 2302 ath6kl_dbg(ATH6KL_DBG_HTC, "using htc protocol version : %s (%d)\n",
2303 (target->htc_tgt_ver == HTC_VERSION_2P0) ? "2.0" : ">= 2.1", 2303 (target->htc_tgt_ver == HTC_VERSION_2P0) ? "2.0" : ">= 2.1",
2304 target->htc_tgt_ver); 2304 target->htc_tgt_ver);
2305 2305