diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/constants.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h | 17 |
3 files changed, 6 insertions, 16 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c index 9649a43c854d..38a54a3fde34 100644 --- a/drivers/net/wireless/iwlwifi/mvm/bt-coex.c +++ b/drivers/net/wireless/iwlwifi/mvm/bt-coex.c | |||
@@ -378,7 +378,6 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm) | |||
378 | 378 | ||
379 | flags = iwlwifi_mod_params.bt_coex_active ? | 379 | flags = iwlwifi_mod_params.bt_coex_active ? |
380 | BT_COEX_NW : BT_COEX_DISABLE; | 380 | BT_COEX_NW : BT_COEX_DISABLE; |
381 | flags |= BT_CH_PRIMARY_EN | BT_CH_SECONDARY_EN | BT_SYNC_2_BT_DISABLE; | ||
382 | bt_cmd->flags = cpu_to_le32(flags); | 381 | bt_cmd->flags = cpu_to_le32(flags); |
383 | 382 | ||
384 | bt_cmd->valid_bit_msk = cpu_to_le32(BT_VALID_ENABLE | | 383 | bt_cmd->valid_bit_msk = cpu_to_le32(BT_VALID_ENABLE | |
@@ -399,6 +398,9 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm) | |||
399 | BT_VALID_TXRX_MAX_FREQ_0 | | 398 | BT_VALID_TXRX_MAX_FREQ_0 | |
400 | BT_VALID_SYNC_TO_SCO); | 399 | BT_VALID_SYNC_TO_SCO); |
401 | 400 | ||
401 | if (IWL_MVM_BT_COEX_SYNC2SCO) | ||
402 | bt_cmd->flags |= cpu_to_le32(BT_COEX_SYNC2SCO); | ||
403 | |||
402 | if (mvm->cfg->bt_shared_single_ant) | 404 | if (mvm->cfg->bt_shared_single_ant) |
403 | memcpy(&bt_cmd->decision_lut, iwl_single_shared_ant, | 405 | memcpy(&bt_cmd->decision_lut, iwl_single_shared_ant, |
404 | sizeof(iwl_single_shared_ant)); | 406 | sizeof(iwl_single_shared_ant)); |
diff --git a/drivers/net/wireless/iwlwifi/mvm/constants.h b/drivers/net/wireless/iwlwifi/mvm/constants.h index f3b96e44e690..2d133b1b2dde 100644 --- a/drivers/net/wireless/iwlwifi/mvm/constants.h +++ b/drivers/net/wireless/iwlwifi/mvm/constants.h | |||
@@ -81,5 +81,6 @@ | |||
81 | #define IWL_MVM_LOWLAT_QUOTA_MIN_PERCENT 64 | 81 | #define IWL_MVM_LOWLAT_QUOTA_MIN_PERCENT 64 |
82 | #define IWL_MVM_LOWLAT_SINGLE_BINDING_MAXDUR 24 /* TU */ | 82 | #define IWL_MVM_LOWLAT_SINGLE_BINDING_MAXDUR 24 /* TU */ |
83 | #define IWL_MVM_LOWLAT_DUAL_BINDING_MAXDUR 24 /* TU */ | 83 | #define IWL_MVM_LOWLAT_DUAL_BINDING_MAXDUR 24 /* TU */ |
84 | #define IWL_MVM_BT_COEX_SYNC2SCO 1 | ||
84 | 85 | ||
85 | #endif /* __MVM_CONSTANTS_H */ | 86 | #endif /* __MVM_CONSTANTS_H */ |
diff --git a/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h b/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h index 1b4e54d416b0..20b723d6270f 100644 --- a/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h +++ b/drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h | |||
@@ -70,37 +70,24 @@ | |||
70 | 70 | ||
71 | /** | 71 | /** |
72 | * enum iwl_bt_coex_flags - flags for BT_COEX command | 72 | * enum iwl_bt_coex_flags - flags for BT_COEX command |
73 | * @BT_CH_PRIMARY_EN: | ||
74 | * @BT_CH_SECONDARY_EN: | ||
75 | * @BT_NOTIF_COEX_OFF: | ||
76 | * @BT_COEX_MODE_POS: | 73 | * @BT_COEX_MODE_POS: |
77 | * @BT_COEX_MODE_MSK: | 74 | * @BT_COEX_MODE_MSK: |
78 | * @BT_COEX_DISABLE: | 75 | * @BT_COEX_DISABLE: |
79 | * @BT_COEX_2W: | 76 | * @BT_COEX_2W: |
80 | * @BT_COEX_3W: | 77 | * @BT_COEX_3W: |
81 | * @BT_COEX_NW: | 78 | * @BT_COEX_NW: |
82 | * @BT_USE_DEFAULTS: | 79 | * @BT_COEX_SYNC2SCO: |
83 | * @BT_SYNC_2_BT_DISABLE: | ||
84 | * @BT_COEX_CORUNNING_TBL_EN: | ||
85 | * | 80 | * |
86 | * The COEX_MODE must be set for each command. Even if it is not changed. | 81 | * The COEX_MODE must be set for each command. Even if it is not changed. |
87 | */ | 82 | */ |
88 | enum iwl_bt_coex_flags { | 83 | enum iwl_bt_coex_flags { |
89 | BT_CH_PRIMARY_EN = BIT(0), | ||
90 | BT_CH_SECONDARY_EN = BIT(1), | ||
91 | BT_NOTIF_COEX_OFF = BIT(2), | ||
92 | BT_COEX_MODE_POS = 3, | 84 | BT_COEX_MODE_POS = 3, |
93 | BT_COEX_MODE_MSK = BITS(3) << BT_COEX_MODE_POS, | 85 | BT_COEX_MODE_MSK = BITS(3) << BT_COEX_MODE_POS, |
94 | BT_COEX_DISABLE = 0x0 << BT_COEX_MODE_POS, | 86 | BT_COEX_DISABLE = 0x0 << BT_COEX_MODE_POS, |
95 | BT_COEX_2W = 0x1 << BT_COEX_MODE_POS, | 87 | BT_COEX_2W = 0x1 << BT_COEX_MODE_POS, |
96 | BT_COEX_3W = 0x2 << BT_COEX_MODE_POS, | 88 | BT_COEX_3W = 0x2 << BT_COEX_MODE_POS, |
97 | BT_COEX_NW = 0x3 << BT_COEX_MODE_POS, | 89 | BT_COEX_NW = 0x3 << BT_COEX_MODE_POS, |
98 | BT_USE_DEFAULTS = BIT(6), | 90 | BT_COEX_SYNC2SCO = BIT(7), |
99 | BT_SYNC_2_BT_DISABLE = BIT(7), | ||
100 | BT_COEX_CORUNNING_TBL_EN = BIT(8), | ||
101 | BT_COEX_MPLUT_TBL_EN = BIT(9), | ||
102 | /* Bit 10 is reserved */ | ||
103 | BT_COEX_WF_PRIO_BOOST_CHECK_EN = BIT(11), | ||
104 | }; | 91 | }; |
105 | 92 | ||
106 | /* | 93 | /* |