Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9fae2d5 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: mvm: BT Coex add support for Co-running block 



7265 features a new calibration which is called antenna
coupling. The purpose of this calibration (which isn't
really a calibration), is to measure the isolation between
the antennas and that can give us useful information for
the Coex modules.

With this information, we can tune the LookUpTables (LUTs)
that define the BT / WiFi contention policy.

The LUTs currently contain dummy values - but they will be
updated soon.

While at it, change the current code to stop duplicate the
host command while sending. This was needed back then, when
the command was short enough to be allocated on the stack.
Since then, the command grew a lot and is now allocated on
the heap - hence we can use the NOCOPY option instead.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 91b80256

drivers/net/wireless/iwlwifi/mvm/bt-coex.c

+288 −3
Original line number Diff line number Diff line
@@ -305,6 +305,215 @@ static const __le32 iwl_bt_mprio_lut[BT_COEX_MULTI_PRIO_LUT_SIZE] = { 
	cpu_to_le32(0x33113311),

};



struct corunning_block_luts {

	u8 range;

	__le32 lut20[BT_COEX_CORUN_LUT_SIZE];

};



/*

 * Ranges for the antenna coupling calibration / co-running block LUT:

 *		LUT0: [ 0, 12[

 *		LUT1: [12, 20[

 *		LUT2: [20, 21[

 *		LUT3: [21, 23[

 *		LUT4: [23, 27[

 *		LUT5: [27, 30[

 *		LUT6: [30, 32[

 *		LUT7: [32, 33[

 *		LUT8: [33, - [

 */

static const struct corunning_block_luts antenna_coupling_ranges[] = {

	{

		.range = 0,

		.lut20 = {

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

		},

	},

	{

		.range = 12,

		.lut20 = {

			cpu_to_le32(0x00000001),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

		},

	},

	{

		.range = 20,

		.lut20 = {

			cpu_to_le32(0x00000002),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

		},

	},

	{

		.range = 21,

		.lut20 = {

			cpu_to_le32(0x00000003),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

		},

	},

	{

		.range = 23,

		.lut20 = {

			cpu_to_le32(0x00000004),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

		},

	},

	{

		.range = 27,

		.lut20 = {

			cpu_to_le32(0x00000005),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

		},

	},

	{

		.range = 30,

		.lut20 = {

			cpu_to_le32(0x00000006),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

		},

	},

	{

		.range = 32,

		.lut20 = {

			cpu_to_le32(0x00000007),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

		},

	},

	{

		.range = 33,

		.lut20 = {

			cpu_to_le32(0x00000008),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

			cpu_to_le32(0x00000000),  cpu_to_le32(0x00000000),

		},

	},

};



static enum iwl_bt_coex_lut_type

iwl_get_coex_type(struct iwl_mvm *mvm, const struct ieee80211_vif *vif)

{
@@ -390,8 +599,6 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm) 
					    BT_VALID_LUT |

					    BT_VALID_WIFI_RX_SW_PRIO_BOOST |

					    BT_VALID_WIFI_TX_SW_PRIO_BOOST |

					    BT_VALID_CORUN_LUT_20 |

					    BT_VALID_CORUN_LUT_40 |

					    BT_VALID_ANT_ISOLATION |

					    BT_VALID_ANT_ISOLATION_THRS |

					    BT_VALID_TXTX_DELTA_FREQ_THRS |
@@ -401,6 +608,12 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm) 
	if (IWL_MVM_BT_COEX_SYNC2SCO)

		bt_cmd->flags |= cpu_to_le32(BT_COEX_SYNC2SCO);



	if (IWL_MVM_BT_COEX_CORUNNING) {

		bt_cmd->valid_bit_msk = cpu_to_le32(BT_VALID_CORUN_LUT_20 |

						    BT_VALID_CORUN_LUT_40);

		bt_cmd->flags |= cpu_to_le32(BT_COEX_CORUNNING);

	}



	if (mvm->cfg->bt_shared_single_ant)

		memcpy(&bt_cmd->decision_lut, iwl_single_shared_ant,

		       sizeof(iwl_single_shared_ant));
@@ -408,6 +621,12 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm) 
		memcpy(&bt_cmd->decision_lut, iwl_combined_lookup,

		       sizeof(iwl_combined_lookup));



	/* Take first Co-running block LUT to get started */

	memcpy(bt_cmd->bt4_corun_lut20, antenna_coupling_ranges[0].lut20,

	       sizeof(bt_cmd->bt4_corun_lut20));

	memcpy(bt_cmd->bt4_corun_lut40, antenna_coupling_ranges[0].lut20,

	       sizeof(bt_cmd->bt4_corun_lut40));



	memcpy(&bt_cmd->bt_prio_boost, iwl_bt_prio_boost,

	       sizeof(iwl_bt_prio_boost));

	memcpy(&bt_cmd->bt4_multiprio_lut, iwl_bt_mprio_lut,
@@ -498,7 +717,7 @@ int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id, bool enable) 
	struct iwl_host_cmd cmd = {

		.id = BT_CONFIG,

		.len = { sizeof(*bt_cmd), },

		.dataflags = { IWL_HCMD_DFL_DUP, },

		.dataflags = { IWL_HCMD_DFL_NOCOPY, },

		.flags = CMD_ASYNC,

	};

	struct iwl_mvm_sta *mvmsta;
@@ -993,3 +1212,69 @@ void iwl_mvm_bt_coex_vif_change(struct iwl_mvm *mvm) 


	iwl_mvm_bt_coex_notif_handle(mvm);

}



int iwl_mvm_rx_ant_coupling_notif(struct iwl_mvm *mvm,

				  struct iwl_rx_cmd_buffer *rxb,

				  struct iwl_device_cmd *dev_cmd)

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	u32 ant_isolation = le32_to_cpup((void *)pkt->data);

	u8 __maybe_unused lower_bound, upper_bound;

	u8 lut;



	struct iwl_bt_coex_cmd *bt_cmd;

	struct iwl_host_cmd cmd = {

		.id = BT_CONFIG,

		.len = { sizeof(*bt_cmd), },

		.dataflags = { IWL_HCMD_DFL_NOCOPY, },

		.flags = CMD_SYNC,

	};



	if (!IWL_MVM_BT_COEX_CORUNNING)

		return 0;



	lockdep_assert_held(&mvm->mutex);



	if (ant_isolation ==  mvm->last_ant_isol)

		return 0;



	for (lut = 0; lut < ARRAY_SIZE(antenna_coupling_ranges) - 1; lut++)

		if (ant_isolation < antenna_coupling_ranges[lut + 1].range)

			break;



	lower_bound = antenna_coupling_ranges[lut].range;



	if (lut < ARRAY_SIZE(antenna_coupling_ranges) - 1)

		upper_bound = antenna_coupling_ranges[lut + 1].range;

	else

		upper_bound = antenna_coupling_ranges[lut].range;



	IWL_DEBUG_COEX(mvm, "Antenna isolation=%d in range [%d,%d[, lut=%d\n",

		       ant_isolation, lower_bound, upper_bound, lut);



	mvm->last_ant_isol = ant_isolation;



	if (mvm->last_corun_lut == lut)

		return 0;



	mvm->last_corun_lut = lut;



	bt_cmd = kzalloc(sizeof(*bt_cmd), GFP_KERNEL);

	if (!bt_cmd)

		return 0;

	cmd.data[0] = bt_cmd;



	bt_cmd->flags = cpu_to_le32(BT_COEX_NW);

	bt_cmd->valid_bit_msk |= cpu_to_le32(BT_VALID_ENABLE |

					     BT_VALID_CORUN_LUT_20 |

					     BT_VALID_CORUN_LUT_40);



	/* For the moment, use the same LUT for 20GHz and 40GHz */

	memcpy(bt_cmd->bt4_corun_lut20, antenna_coupling_ranges[lut].lut20,

	       sizeof(bt_cmd->bt4_corun_lut20));



	memcpy(bt_cmd->bt4_corun_lut40, antenna_coupling_ranges[lut].lut20,

	       sizeof(bt_cmd->bt4_corun_lut40));



	return 0;

}

drivers/net/wireless/iwlwifi/mvm/constants.h

+1 −0
Original line number Diff line number Diff line
@@ -82,5 +82,6 @@ 
#define IWL_MVM_LOWLAT_SINGLE_BINDING_MAXDUR	24 /* TU */

#define IWL_MVM_LOWLAT_DUAL_BINDING_MAXDUR	24 /* TU */

#define IWL_MVM_BT_COEX_SYNC2SCO		1

#define IWL_MVM_BT_COEX_CORUNNING		1



#endif /* __MVM_CONSTANTS_H */

drivers/net/wireless/iwlwifi/mvm/debugfs.c

+3 −0
Original line number Diff line number Diff line
@@ -350,6 +350,9 @@ static ssize_t iwl_dbgfs_bt_notif_read(struct file *file, char __user *user_buf, 
			 le32_to_cpu(notif->secondary_ch_lut));

	pos += scnprintf(buf+pos, bufsz-pos, "bt_activity_grading = %d\n",

			 le32_to_cpu(notif->bt_activity_grading));

	pos += scnprintf(buf+pos, bufsz-pos,

			 "antenna isolation = %d CORUN LUT index = %d\n",

			 mvm->last_ant_isol, mvm->last_corun_lut);



	mutex_unlock(&mvm->mutex);

drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
 * @BT_COEX_3W:

 * @BT_COEX_NW:

 * @BT_COEX_SYNC2SCO:

 * @BT_COEX_CORUNNING:

 *

 * The COEX_MODE must be set for each command. Even if it is not changed.

 */
@@ -88,6 +89,7 @@ enum iwl_bt_coex_flags { 
	BT_COEX_3W			= 0x2 << BT_COEX_MODE_POS,

	BT_COEX_NW			= 0x3 << BT_COEX_MODE_POS,

	BT_COEX_SYNC2SCO		= BIT(7),

	BT_COEX_CORUNNING		= BIT(8),

};



/*

drivers/net/wireless/iwlwifi/mvm/fw-api.h

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ enum { 
	/* PHY context commands */

	PHY_CONTEXT_CMD = 0x8,

	DBG_CFG = 0x9,

	ANTENNA_COUPLING_NOTIFICATION = 0xa,



	/* station table */

	ADD_STA_KEY = 0x17,