Commit e911ede7 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Johannes Berg

iwlwifi: set correct 32 bit boost register value

Newer devices use 32 bit for boost register,
set the correct value for it.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Reviewed-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 6d044b90
...@@ -1905,6 +1905,7 @@ struct iwl_bt_cmd { ...@@ -1905,6 +1905,7 @@ struct iwl_bt_cmd {
#define IWLAGN_BT_PRIO_BOOST_MAX 0xFF #define IWLAGN_BT_PRIO_BOOST_MAX 0xFF
#define IWLAGN_BT_PRIO_BOOST_MIN 0x00 #define IWLAGN_BT_PRIO_BOOST_MIN 0x00
#define IWLAGN_BT_PRIO_BOOST_DEFAULT 0xF0 #define IWLAGN_BT_PRIO_BOOST_DEFAULT 0xF0
#define IWLAGN_BT_PRIO_BOOST_DEFAULT32 0xF0F0F0F0
#define IWLAGN_BT_MAX_KILL_DEFAULT 5 #define IWLAGN_BT_MAX_KILL_DEFAULT 5
......
...@@ -265,6 +265,8 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv) ...@@ -265,6 +265,8 @@ void iwlagn_send_advance_bt_config(struct iwl_priv *priv)
bt_cmd_v2.tx_prio_boost = 0; bt_cmd_v2.tx_prio_boost = 0;
bt_cmd_v2.rx_prio_boost = 0; bt_cmd_v2.rx_prio_boost = 0;
} else { } else {
/* older version only has 8 bits */
WARN_ON(priv->cfg->bt_params->bt_prio_boost & ~0xFF);
bt_cmd_v1.prio_boost = bt_cmd_v1.prio_boost =
priv->cfg->bt_params->bt_prio_boost; priv->cfg->bt_params->bt_prio_boost;
bt_cmd_v1.tx_prio_boost = 0; bt_cmd_v1.tx_prio_boost = 0;
......
...@@ -177,7 +177,7 @@ struct iwl_base_params { ...@@ -177,7 +177,7 @@ struct iwl_base_params {
struct iwl_bt_params { struct iwl_bt_params {
bool advanced_bt_coexist; bool advanced_bt_coexist;
u8 bt_init_traffic_load; u8 bt_init_traffic_load;
u8 bt_prio_boost; u32 bt_prio_boost;
u16 agg_time_limit; u16 agg_time_limit;
bool bt_sco_disable; bool bt_sco_disable;
bool bt_session_2; bool bt_session_2;
......
...@@ -112,7 +112,7 @@ static const struct iwl_bt_params iwl2030_bt_params = { ...@@ -112,7 +112,7 @@ static const struct iwl_bt_params iwl2030_bt_params = {
.advanced_bt_coexist = true, .advanced_bt_coexist = true,
.agg_time_limit = BT_AGG_THRESHOLD_DEF, .agg_time_limit = BT_AGG_THRESHOLD_DEF,
.bt_init_traffic_load = IWL_BT_COEX_TRAFFIC_LOAD_NONE, .bt_init_traffic_load = IWL_BT_COEX_TRAFFIC_LOAD_NONE,
.bt_prio_boost = IWLAGN_BT_PRIO_BOOST_DEFAULT, .bt_prio_boost = IWLAGN_BT_PRIO_BOOST_DEFAULT32,
.bt_sco_disable = true, .bt_sco_disable = true,
.bt_session_2 = true, .bt_session_2 = true,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment