Commit 187bc4f6 authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlagn: remove unsupported BT SCO command 



During the period of BT coex changes, REPLY_BT_COEX_SCO host command
is no longer needed to support SCO/eSCO type of traffic. delete it.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 96234cc8

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+0 −24
Original line number Diff line number Diff line
@@ -1863,21 +1863,6 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv) 
	if (iwl_send_cmd_pdu(priv, REPLY_BT_CONFIG, sizeof(bt_cmd), &bt_cmd))

		IWL_ERR(priv, "failed to send BT Coex Config\n");



	/*

	 * When we are doing a restart, need to also reconfigure BT

	 * SCO to the device. If not doing a restart, bt_sco_active

	 * will always be false, so there's no need to have an extra

	 * variable to check for it.

	 */

	if (priv->bt_sco_active) {

		struct iwlagn_bt_sco_cmd sco_cmd = { .flags = 0 };



		if (priv->bt_sco_active)

			sco_cmd.flags |= IWLAGN_BT_SCO_ACTIVE;

		if (iwl_send_cmd_pdu(priv, REPLY_BT_COEX_SCO,

				     sizeof(sco_cmd), &sco_cmd))

			IWL_ERR(priv, "failed to send BT SCO command\n");

	}

}



static void iwlagn_bt_traffic_change_work(struct work_struct *work)
@@ -2069,15 +2054,6 @@ void iwlagn_bt_coex_profile_notif(struct iwl_priv *priv, 
			queue_work(priv->workqueue,

				   &priv->bt_traffic_change_work);

		}

		if (priv->bt_sco_active !=

		    (uart_msg->frame3 & BT_UART_MSG_FRAME3SCOESCO_MSK)) {

			priv->bt_sco_active = uart_msg->frame3 &

				BT_UART_MSG_FRAME3SCOESCO_MSK;

			if (priv->bt_sco_active)

				sco_cmd.flags |= IWLAGN_BT_SCO_ACTIVE;

			iwl_send_cmd_pdu_async(priv, REPLY_BT_COEX_SCO,

				       sizeof(sco_cmd), &sco_cmd, NULL);

		}

	}



	iwlagn_set_kill_msk(priv, uart_msg);

drivers/net/wireless/iwlwifi/iwl-agn.c

+1 −4
Original line number Diff line number Diff line
@@ -2780,7 +2780,6 @@ static void __iwl_down(struct iwl_priv *priv) 
			 priv->cfg->bt_params->bt_init_traffic_load;

	else

		priv->bt_traffic_load = 0;

	priv->bt_sco_active = false;

	priv->bt_full_concurrent = false;

	priv->bt_ci_compliance = 0;
@@ -3099,7 +3098,7 @@ static void iwl_bg_restart(struct work_struct *data) 


	if (test_and_clear_bit(STATUS_FW_ERROR, &priv->status)) {

		struct iwl_rxon_context *ctx;

		bool bt_sco, bt_full_concurrent;

		bool bt_full_concurrent;

		u8 bt_ci_compliance;

		u8 bt_load;

		u8 bt_status;
@@ -3118,7 +3117,6 @@ static void iwl_bg_restart(struct work_struct *data) 
		 * re-configure the hw when we reconfigure the BT

		 * command.

		 */

		bt_sco = priv->bt_sco_active;

		bt_full_concurrent = priv->bt_full_concurrent;

		bt_ci_compliance = priv->bt_ci_compliance;

		bt_load = priv->bt_traffic_load;
@@ -3126,7 +3124,6 @@ static void iwl_bg_restart(struct work_struct *data) 


		__iwl_down(priv);



		priv->bt_sco_active = bt_sco;

		priv->bt_full_concurrent = bt_full_concurrent;

		priv->bt_ci_compliance = bt_ci_compliance;

		priv->bt_traffic_load = bt_load;

drivers/net/wireless/iwlwifi/iwl-commands.h

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ enum { 
	REPLY_BT_COEX_PRIO_TABLE = 0xcc,

	REPLY_BT_COEX_PROT_ENV = 0xcd,

	REPLY_BT_COEX_PROFILE_NOTIF = 0xce,

	REPLY_BT_COEX_SCO = 0xcf,



	/* PAN commands */

	REPLY_WIPAN_PARAMS = 0xb2,

drivers/net/wireless/iwlwifi/iwl-debugfs.c

+3 −4
Original line number Diff line number Diff line
@@ -1587,10 +1587,9 @@ static ssize_t iwl_dbgfs_bt_traffic_read(struct file *file, 
			 "last traffic notif: %d\n",

		priv->bt_status ? "On" : "Off", priv->last_bt_traffic_load);

	pos += scnprintf(buf + pos, bufsz - pos, "ch_announcement: %d, "

			 "sco_active: %d, kill_ack_mask: %x, "

			 "kill_cts_mask: %x\n",

		priv->bt_ch_announce, priv->bt_sco_active,

		priv->kill_ack_mask, priv->kill_cts_mask);

			 "kill_ack_mask: %x, kill_cts_mask: %x\n",

		priv->bt_ch_announce, priv->kill_ack_mask,

		priv->kill_cts_mask);



	pos += scnprintf(buf + pos, bufsz - pos, "bluetooth traffic load: ");

	switch (priv->bt_traffic_load) {

drivers/net/wireless/iwlwifi/iwl-dev.h

+0 −1
Original line number Diff line number Diff line
@@ -1504,7 +1504,6 @@ struct iwl_priv { 
	u8 bt_status;

	u8 bt_traffic_load, last_bt_traffic_load;

	bool bt_ch_announce;

	bool bt_sco_active;

	bool bt_full_concurrent;

	bool bt_ant_couple_ok;

	__le32 kill_ack_mask;