diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-6000.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-6000.c | 116 |
1 files changed, 102 insertions, 14 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-6000.c b/drivers/net/wireless/iwlwifi/iwl-6000.c index 54b59dadf2a8..e4873cc2a57a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-6000.c +++ b/drivers/net/wireless/iwlwifi/iwl-6000.c | |||
@@ -221,17 +221,17 @@ static void iwl6000g2b_send_bt_config(struct iwl_priv *priv) | |||
221 | struct iwl6000g2b_bt_cmd bt_cmd = { | 221 | struct iwl6000g2b_bt_cmd bt_cmd = { |
222 | .max_kill = IWL6000G2B_BT_MAX_KILL_DEFAULT, | 222 | .max_kill = IWL6000G2B_BT_MAX_KILL_DEFAULT, |
223 | .bt3_timer_t7_value = IWL6000G2B_BT3_T7_DEFAULT, | 223 | .bt3_timer_t7_value = IWL6000G2B_BT3_T7_DEFAULT, |
224 | .kill_ack_mask = IWL6000G2B_BT_KILL_ACK_MASK_DEFAULT, | ||
225 | .kill_cts_mask = IWL6000G2B_BT_KILL_CTS_MASK_DEFAULT, | ||
226 | .bt3_prio_sample_time = IWL6000G2B_BT3_PRIO_SAMPLE_DEFAULT, | 224 | .bt3_prio_sample_time = IWL6000G2B_BT3_PRIO_SAMPLE_DEFAULT, |
227 | .bt3_timer_t2_value = IWL6000G2B_BT3_T2_DEFAULT, | 225 | .bt3_timer_t2_value = IWL6000G2B_BT3_T2_DEFAULT, |
228 | .valid = IWL6000G2B_BT_VALID_ENABLE_FLAGS, | ||
229 | }; | 226 | }; |
230 | 227 | ||
231 | BUILD_BUG_ON(sizeof(iwl6000g2b_def_3w_lookup) != | 228 | BUILD_BUG_ON(sizeof(iwl6000g2b_def_3w_lookup) != |
232 | sizeof(bt_cmd.bt3_lookup_table)); | 229 | sizeof(bt_cmd.bt3_lookup_table)); |
233 | 230 | ||
234 | bt_cmd.prio_boost = priv->cfg->bt_prio_boost; | 231 | bt_cmd.prio_boost = priv->cfg->bt_prio_boost; |
232 | bt_cmd.kill_ack_mask = priv->kill_ack_mask; | ||
233 | bt_cmd.kill_cts_mask = priv->kill_cts_mask; | ||
234 | bt_cmd.valid = priv->bt_valid; | ||
235 | 235 | ||
236 | /* | 236 | /* |
237 | * Configure BT coex mode to "no coexistence" when the | 237 | * Configure BT coex mode to "no coexistence" when the |
@@ -245,7 +245,6 @@ static void iwl6000g2b_send_bt_config(struct iwl_priv *priv) | |||
245 | bt_cmd.flags = IWL6000G2B_BT_FLAG_CHANNEL_INHIBITION | | 245 | bt_cmd.flags = IWL6000G2B_BT_FLAG_CHANNEL_INHIBITION | |
246 | IWL6000G2B_BT_FLAG_COEX_MODE_3W << | 246 | IWL6000G2B_BT_FLAG_COEX_MODE_3W << |
247 | IWL6000G2B_BT_FLAG_COEX_MODE_SHIFT; | 247 | IWL6000G2B_BT_FLAG_COEX_MODE_SHIFT; |
248 | bt_cmd.valid |= IWL6000G2B_BT_ALL_VALID_MSK; | ||
249 | } | 248 | } |
250 | 249 | ||
251 | if (priv->bt_full_concurrent) | 250 | if (priv->bt_full_concurrent) |
@@ -453,6 +452,93 @@ static void iwl6000g2b_bt_traffic_change_work(struct work_struct *work) | |||
453 | mutex_unlock(&priv->mutex); | 452 | mutex_unlock(&priv->mutex); |
454 | } | 453 | } |
455 | 454 | ||
455 | static void iwlagn_print_uartmsg(struct iwl_priv *priv, | ||
456 | struct iwl_bt_uart_msg *uart_msg) | ||
457 | { | ||
458 | IWL_DEBUG_NOTIF(priv, "Message Type = 0x%X, SSN = 0x%X, " | ||
459 | "Update Req = 0x%X", | ||
460 | (BT_UART_MSG_FRAME1MSGTYPE_MSK & uart_msg->frame1) >> | ||
461 | BT_UART_MSG_FRAME1MSGTYPE_POS, | ||
462 | (BT_UART_MSG_FRAME1SSN_MSK & uart_msg->frame1) >> | ||
463 | BT_UART_MSG_FRAME1SSN_POS, | ||
464 | (BT_UART_MSG_FRAME1UPDATEREQ_MSK & uart_msg->frame1) >> | ||
465 | BT_UART_MSG_FRAME1UPDATEREQ_POS); | ||
466 | |||
467 | IWL_DEBUG_NOTIF(priv, "Open connections = 0x%X, Traffic load = 0x%X, " | ||
468 | "Chl_SeqN = 0x%X, In band = 0x%X", | ||
469 | (BT_UART_MSG_FRAME2OPENCONNECTIONS_MSK & uart_msg->frame2) >> | ||
470 | BT_UART_MSG_FRAME2OPENCONNECTIONS_POS, | ||
471 | (BT_UART_MSG_FRAME2TRAFFICLOAD_MSK & uart_msg->frame2) >> | ||
472 | BT_UART_MSG_FRAME2TRAFFICLOAD_POS, | ||
473 | (BT_UART_MSG_FRAME2CHLSEQN_MSK & uart_msg->frame2) >> | ||
474 | BT_UART_MSG_FRAME2CHLSEQN_POS, | ||
475 | (BT_UART_MSG_FRAME2INBAND_MSK & uart_msg->frame2) >> | ||
476 | BT_UART_MSG_FRAME2INBAND_POS); | ||
477 | |||
478 | IWL_DEBUG_NOTIF(priv, "SCO/eSCO = 0x%X, Sniff = 0x%X, A2DP = 0x%X, " | ||
479 | "ACL = 0x%X, Master = 0x%X, OBEX = 0x%X", | ||
480 | (BT_UART_MSG_FRAME3SCOESCO_MSK & uart_msg->frame3) >> | ||
481 | BT_UART_MSG_FRAME3SCOESCO_POS, | ||
482 | (BT_UART_MSG_FRAME3SNIFF_MSK & uart_msg->frame3) >> | ||
483 | BT_UART_MSG_FRAME3SNIFF_POS, | ||
484 | (BT_UART_MSG_FRAME3A2DP_MSK & uart_msg->frame3) >> | ||
485 | BT_UART_MSG_FRAME3A2DP_POS, | ||
486 | (BT_UART_MSG_FRAME3ACL_MSK & uart_msg->frame3) >> | ||
487 | BT_UART_MSG_FRAME3ACL_POS, | ||
488 | (BT_UART_MSG_FRAME3MASTER_MSK & uart_msg->frame3) >> | ||
489 | BT_UART_MSG_FRAME3MASTER_POS, | ||
490 | (BT_UART_MSG_FRAME3OBEX_MSK & uart_msg->frame3) >> | ||
491 | BT_UART_MSG_FRAME3OBEX_POS); | ||
492 | |||
493 | IWL_DEBUG_NOTIF(priv, "Idle duration = 0x%X", | ||
494 | (BT_UART_MSG_FRAME4IDLEDURATION_MSK & uart_msg->frame4) >> | ||
495 | BT_UART_MSG_FRAME4IDLEDURATION_POS); | ||
496 | |||
497 | IWL_DEBUG_NOTIF(priv, "Tx Activity = 0x%X, Rx Activity = 0x%X, " | ||
498 | "eSCO Retransmissions = 0x%X", | ||
499 | (BT_UART_MSG_FRAME5TXACTIVITY_MSK & uart_msg->frame5) >> | ||
500 | BT_UART_MSG_FRAME5TXACTIVITY_POS, | ||
501 | (BT_UART_MSG_FRAME5RXACTIVITY_MSK & uart_msg->frame5) >> | ||
502 | BT_UART_MSG_FRAME5RXACTIVITY_POS, | ||
503 | (BT_UART_MSG_FRAME5ESCORETRANSMIT_MSK & uart_msg->frame5) >> | ||
504 | BT_UART_MSG_FRAME5ESCORETRANSMIT_POS); | ||
505 | |||
506 | IWL_DEBUG_NOTIF(priv, "Sniff Interval = 0x%X, Discoverable = 0x%X", | ||
507 | (BT_UART_MSG_FRAME6SNIFFINTERVAL_MSK & uart_msg->frame6) >> | ||
508 | BT_UART_MSG_FRAME6SNIFFINTERVAL_POS, | ||
509 | (BT_UART_MSG_FRAME6DISCOVERABLE_MSK & uart_msg->frame6) >> | ||
510 | BT_UART_MSG_FRAME6DISCOVERABLE_POS); | ||
511 | |||
512 | IWL_DEBUG_NOTIF(priv, "Sniff Activity = 0x%X, Inquiry/Page SR Mode = " | ||
513 | "0x%X, Connectable = 0x%X", | ||
514 | (BT_UART_MSG_FRAME7SNIFFACTIVITY_MSK & uart_msg->frame7) >> | ||
515 | BT_UART_MSG_FRAME7SNIFFACTIVITY_POS, | ||
516 | (BT_UART_MSG_FRAME7INQUIRYPAGESRMODE_MSK & uart_msg->frame7) >> | ||
517 | BT_UART_MSG_FRAME7INQUIRYPAGESRMODE_POS, | ||
518 | (BT_UART_MSG_FRAME7CONNECTABLE_MSK & uart_msg->frame7) >> | ||
519 | BT_UART_MSG_FRAME7CONNECTABLE_POS); | ||
520 | } | ||
521 | |||
522 | static void iwl6000g2b_set_kill_ack_msk(struct iwl_priv *priv, | ||
523 | struct iwl_bt_uart_msg *uart_msg) | ||
524 | { | ||
525 | u8 kill_ack_msk; | ||
526 | __le32 bt_kill_ack_msg[2] = { | ||
527 | cpu_to_le32(0xFFFFFFF), cpu_to_le32(0xFFFFFC00) }; | ||
528 | |||
529 | kill_ack_msk = (((BT_UART_MSG_FRAME3A2DP_MSK | | ||
530 | BT_UART_MSG_FRAME3SNIFF_MSK | | ||
531 | BT_UART_MSG_FRAME3SCOESCO_MSK) & | ||
532 | uart_msg->frame3) == 0) ? 1 : 0; | ||
533 | if (priv->kill_ack_mask != bt_kill_ack_msg[kill_ack_msk]) { | ||
534 | priv->bt_valid |= IWL6000G2B_BT_VALID_KILL_ACK_MASK; | ||
535 | priv->kill_ack_mask = bt_kill_ack_msg[kill_ack_msk]; | ||
536 | /* schedule to send runtime bt_config */ | ||
537 | queue_work(priv->workqueue, &priv->bt_runtime_config); | ||
538 | } | ||
539 | |||
540 | } | ||
541 | |||
456 | static void iwl6000g2b_bt_coex_profile_notif(struct iwl_priv *priv, | 542 | static void iwl6000g2b_bt_coex_profile_notif(struct iwl_priv *priv, |
457 | struct iwl_rx_mem_buffer *rxb) | 543 | struct iwl_rx_mem_buffer *rxb) |
458 | { | 544 | { |
@@ -460,16 +546,13 @@ static void iwl6000g2b_bt_coex_profile_notif(struct iwl_priv *priv, | |||
460 | struct iwl_rx_packet *pkt = rxb_addr(rxb); | 546 | struct iwl_rx_packet *pkt = rxb_addr(rxb); |
461 | struct iwl_bt_coex_profile_notif *coex = &pkt->u.bt_coex_profile_notif; | 547 | struct iwl_bt_coex_profile_notif *coex = &pkt->u.bt_coex_profile_notif; |
462 | struct iwl6000g2b_bt_sco_cmd sco_cmd = { .flags = 0 }; | 548 | struct iwl6000g2b_bt_sco_cmd sco_cmd = { .flags = 0 }; |
549 | struct iwl_bt_uart_msg *uart_msg = &coex->last_bt_uart_msg; | ||
463 | 550 | ||
464 | IWL_DEBUG_NOTIF(priv, "BT Coex notification:\n"); | 551 | IWL_DEBUG_NOTIF(priv, "BT Coex notification:\n"); |
465 | IWL_DEBUG_NOTIF(priv, " status: %d\n", coex->bt_status); | 552 | IWL_DEBUG_NOTIF(priv, " status: %d\n", coex->bt_status); |
466 | IWL_DEBUG_NOTIF(priv, " traffic load: %d\n", coex->bt_traffic_load); | 553 | IWL_DEBUG_NOTIF(priv, " traffic load: %d\n", coex->bt_traffic_load); |
467 | IWL_DEBUG_NOTIF(priv, " CI compliance: %d\n", coex->bt_ci_compliance); | 554 | IWL_DEBUG_NOTIF(priv, " CI compliance: %d\n", coex->bt_ci_compliance); |
468 | IWL_DEBUG_NOTIF(priv, " UART msg: %.2x:%.2x:%.2x:%.2x:%.2x:%.2x:" | 555 | iwlagn_print_uartmsg(priv, uart_msg); |
469 | "%.2x:%.2x\n", | ||
470 | coex->uart_msg[0], coex->uart_msg[1], coex->uart_msg[2], | ||
471 | coex->uart_msg[3], coex->uart_msg[4], coex->uart_msg[5], | ||
472 | coex->uart_msg[6], coex->uart_msg[7]); | ||
473 | 556 | ||
474 | priv->notif_bt_traffic_load = coex->bt_traffic_load; | 557 | priv->notif_bt_traffic_load = coex->bt_traffic_load; |
475 | 558 | ||
@@ -481,14 +564,19 @@ static void iwl6000g2b_bt_coex_profile_notif(struct iwl_priv *priv, | |||
481 | &priv->bt_traffic_change_work); | 564 | &priv->bt_traffic_change_work); |
482 | } | 565 | } |
483 | 566 | ||
484 | /* FIXME: add defines for this check */ | 567 | if (priv->bt_sco_active != |
485 | priv->bt_sco_active = coex->uart_msg[3] & 1; | 568 | (uart_msg->frame3 & BT_UART_MSG_FRAME3SCOESCO_MSK)) { |
486 | if (priv->bt_sco_active) | 569 | priv->bt_sco_active = uart_msg->frame3 & |
487 | sco_cmd.flags |= IWL6000G2B_BT_SCO_ACTIVE; | 570 | BT_UART_MSG_FRAME3SCOESCO_MSK; |
488 | iwl_send_cmd_pdu_async(priv, REPLY_BT_COEX_SCO, | 571 | if (priv->bt_sco_active) |
572 | sco_cmd.flags |= IWL6000G2B_BT_SCO_ACTIVE; | ||
573 | iwl_send_cmd_pdu_async(priv, REPLY_BT_COEX_SCO, | ||
489 | sizeof(sco_cmd), &sco_cmd, NULL); | 574 | sizeof(sco_cmd), &sco_cmd, NULL); |
575 | } | ||
490 | } | 576 | } |
491 | 577 | ||
578 | iwl6000g2b_set_kill_ack_msk(priv, uart_msg); | ||
579 | |||
492 | /* FIXME: based on notification, adjust the prio_boost */ | 580 | /* FIXME: based on notification, adjust the prio_boost */ |
493 | 581 | ||
494 | spin_lock_irqsave(&priv->lock, flags); | 582 | spin_lock_irqsave(&priv->lock, flags); |