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

Commit 41fdf097 authored by Nishant Sarmukadam's avatar Nishant Sarmukadam Committed by John W. Linville
Browse files

mwl8k: rf_tx_power cmd not supported by AP firmware APIv1 



APIv1 AP firmware does not support the RF_TX_POWER command.  It
supports the similar TX_POWER command.

Signed-off-by: default avatarPradeep Nemavat <pnemavat@marvell.com>
Signed-off-by: default avatarNishant Sarmukadam <nishants@marvell.com>
Signed-off-by: default avatarBrian Cavagnolo <brian@cozybit.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a1fe24b0

drivers/net/wireless/mwl8k.c

+72 −6
Original line number Diff line number Diff line
@@ -285,8 +285,9 @@ static const struct ieee80211_rate mwl8k_rates_50[] = { 
};



/* Set or get info from Firmware */

#define MWL8K_CMD_SET			0x0001

#define MWL8K_CMD_GET			0x0000

#define MWL8K_CMD_SET			0x0001

#define MWL8K_CMD_SET_LIST		0x0002



/* Firmware command codes */

#define MWL8K_CMD_CODE_DNLD		0x0001
@@ -296,6 +297,7 @@ static const struct ieee80211_rate mwl8k_rates_50[] = { 
#define MWL8K_CMD_GET_STAT		0x0014

#define MWL8K_CMD_RADIO_CONTROL		0x001c

#define MWL8K_CMD_RF_TX_POWER		0x001e

#define MWL8K_CMD_TX_POWER		0x001f

#define MWL8K_CMD_RF_ANTENNA		0x0020

#define MWL8K_CMD_SET_BEACON		0x0100		/* per-vif */

#define MWL8K_CMD_SET_PRE_SCAN		0x0107
@@ -333,6 +335,7 @@ static const char *mwl8k_cmd_name(__le16 cmd, char *buf, int bufsize) 
		MWL8K_CMDNAME(GET_STAT);

		MWL8K_CMDNAME(RADIO_CONTROL);

		MWL8K_CMDNAME(RF_TX_POWER);

		MWL8K_CMDNAME(TX_POWER);

		MWL8K_CMDNAME(RF_ANTENNA);

		MWL8K_CMDNAME(SET_BEACON);

		MWL8K_CMDNAME(SET_PRE_SCAN);
@@ -2084,7 +2087,7 @@ mwl8k_set_radio_preamble(struct ieee80211_hw *hw, bool short_preamble) 
/*

 * CMD_RF_TX_POWER.

 */

#define MWL8K_TX_POWER_LEVEL_TOTAL	8

#define MWL8K_RF_TX_POWER_LEVEL_TOTAL	8



struct mwl8k_cmd_rf_tx_power {

	struct mwl8k_cmd_pkt header;
@@ -2092,7 +2095,7 @@ struct mwl8k_cmd_rf_tx_power { 
	__le16 support_level;

	__le16 current_level;

	__le16 reserved;

	__le16 power_level_list[MWL8K_TX_POWER_LEVEL_TOTAL];

	__le16 power_level_list[MWL8K_RF_TX_POWER_LEVEL_TOTAL];

} __packed;



static int mwl8k_cmd_rf_tx_power(struct ieee80211_hw *hw, int dBm)
@@ -2115,6 +2118,65 @@ static int mwl8k_cmd_rf_tx_power(struct ieee80211_hw *hw, int dBm) 
	return rc;

}



/*

 * CMD_TX_POWER.

 */

#define MWL8K_TX_POWER_LEVEL_TOTAL      12



struct mwl8k_cmd_tx_power {

	struct mwl8k_cmd_pkt header;

	__le16 action;

	__le16 band;

	__le16 channel;

	__le16 bw;

	__le16 sub_ch;

	__le16 power_level_list[MWL8K_TX_POWER_LEVEL_TOTAL];

} __attribute__((packed));



static int mwl8k_cmd_tx_power(struct ieee80211_hw *hw,

				     struct ieee80211_conf *conf,

				     unsigned short pwr)

{

	struct ieee80211_channel *channel = conf->channel;

	struct mwl8k_cmd_tx_power *cmd;

	int rc;

	int i;



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

	if (cmd == NULL)

		return -ENOMEM;



	cmd->header.code = cpu_to_le16(MWL8K_CMD_TX_POWER);

	cmd->header.length = cpu_to_le16(sizeof(*cmd));

	cmd->action = cpu_to_le16(MWL8K_CMD_SET_LIST);



	if (channel->band == IEEE80211_BAND_2GHZ)

		cmd->band = cpu_to_le16(0x1);

	else if (channel->band == IEEE80211_BAND_5GHZ)

		cmd->band = cpu_to_le16(0x4);



	cmd->channel = channel->hw_value;



	if (conf->channel_type == NL80211_CHAN_NO_HT ||

	    conf->channel_type == NL80211_CHAN_HT20) {

		cmd->bw = cpu_to_le16(0x2);

	} else {

		cmd->bw = cpu_to_le16(0x4);

		if (conf->channel_type == NL80211_CHAN_HT40MINUS)

			cmd->sub_ch = cpu_to_le16(0x3);

		else if (conf->channel_type == NL80211_CHAN_HT40PLUS)

			cmd->sub_ch = cpu_to_le16(0x1);

	}



	for (i = 0; i < MWL8K_TX_POWER_LEVEL_TOTAL; i++)

		cmd->power_level_list[i] = cpu_to_le16(pwr);



	rc = mwl8k_post_cmd(hw, &cmd->header);

	kfree(cmd);



	return rc;

}



/*

 * CMD_RF_ANTENNA.

 */
@@ -3377,15 +3439,19 @@ static int mwl8k_config(struct ieee80211_hw *hw, u32 changed) 


	if (conf->power_level > 18)

		conf->power_level = 18;

	rc = mwl8k_cmd_rf_tx_power(hw, conf->power_level);



	if (priv->ap_fw) {

		rc = mwl8k_cmd_tx_power(hw, conf, conf->power_level);

		if (rc)

			goto out;



	if (priv->ap_fw) {

		rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_RX, 0x7);

		if (!rc)

			rc = mwl8k_cmd_rf_antenna(hw, MWL8K_RF_ANTENNA_TX, 0x7);

	} else {

		rc = mwl8k_cmd_rf_tx_power(hw, conf->power_level);

		if (rc)

			goto out;

		rc = mwl8k_cmd_mimo_config(hw, 0x7, 0x7);

	}