Commit 67256c9a authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

wifi: iwlwifi: mvm: rename iwl_dev_tx_power_common::mac_context_id 



This is becoming the link_id. Since this makes no difference on non-MLD
devices, just rename to link_id for all the APIs that use the common
structure.

Starting from command 9, feed the link_id to the firmware instead of the
mac id.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20241227095718.f1155e713201.I753900d10e82f339cf9679ed403027d38dc1fd58@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 83bb3633

drivers/net/wireless/intel/iwlwifi/fw/api/power.h

+5 −3
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ struct iwl_reduce_tx_power_cmd { 
} __packed; /* TX_REDUCED_POWER_API_S_VER_1 */



enum iwl_dev_tx_power_cmd_mode {

	IWL_TX_POWER_MODE_SET_MAC = 0,

	IWL_TX_POWER_MODE_SET_LINK = 0,

	IWL_TX_POWER_MODE_SET_DEVICE = 1,

	IWL_TX_POWER_MODE_SET_CHAINS = 2,

	IWL_TX_POWER_MODE_SET_ACK = 3,
@@ -283,12 +283,14 @@ enum iwl_dev_tx_power_cmd_mode { 
/**

 * struct iwl_dev_tx_power_common - Common part of the TX power reduction cmd

 * @set_mode: see &enum iwl_dev_tx_power_cmd_mode

 * @mac_context_id: id of the mac ctx for which we are reducing TX power.

 * @link_id: id of the link ctx for which we are reducing TX power.

 *	For version 9 / 10, this is the link id. For earlier versions, it is

 *	the mac id.

 * @pwr_restriction: TX power restriction in 1/8 dBms.

 */

struct iwl_dev_tx_power_common {

	__le32 set_mode;

	__le32 mac_context_id;

	__le32 link_id;

	__le16 pwr_restriction;

} __packed;

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+13 −5
Original line number Diff line number Diff line
@@ -1485,11 +1485,12 @@ int iwl_mvm_set_tx_power(struct iwl_mvm *mvm, 
			 s16 tx_power)

{

	u32 cmd_id = REDUCE_TX_POWER_CMD;

	u32 mac_id = iwl_mvm_vif_from_mac80211(link_conf->vif)->id;

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(link_conf->vif);

	u32 mac_id = mvmvif->id;

	int len;

	struct iwl_dev_tx_power_cmd_v3_v8 cmd = {

		.common.set_mode = cpu_to_le32(IWL_TX_POWER_MODE_SET_MAC),

		.common.mac_context_id = cpu_to_le32(mac_id),

		.common.set_mode = cpu_to_le32(IWL_TX_POWER_MODE_SET_LINK),

		.common.link_id = cpu_to_le32(mac_id),

	};

	struct iwl_dev_tx_power_cmd cmd_v9_v10;

	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw, cmd_id, 3);
@@ -1500,9 +1501,16 @@ int iwl_mvm_set_tx_power(struct iwl_mvm *mvm, 
	cmd.common.pwr_restriction = cpu_to_le16(u_tx_power);



	if (cmd_ver > 8) {

		u32 link_id;



		if (WARN_ON(!mvmvif->link[link_conf->link_id]))

			return -ENODEV;



		link_id = mvmvif->link[link_conf->link_id]->fw_link_id;



		/* Those fields sit on the same place for v9 and v10 */

		cmd_v9_v10.common.set_mode = cpu_to_le32(IWL_TX_POWER_MODE_SET_MAC);

		cmd_v9_v10.common.mac_context_id = cpu_to_le32(mac_id);

		cmd_v9_v10.common.set_mode = cpu_to_le32(IWL_TX_POWER_MODE_SET_LINK);

		cmd_v9_v10.common.link_id = cpu_to_le32(link_id);

		cmd_v9_v10.common.pwr_restriction = cpu_to_le16(u_tx_power);

		cmd_data = &cmd_v9_v10;

	}