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

Commit 32ac072c authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Greg Kroah-Hartman
Browse files

ath10k: fix max antenna gain unit 



[ Upstream commit 0a491167fe0cf9f26062462de2a8688b96125d48 ]

Most of the txpower for the ath10k firmware is stored as twicepower (0.5 dB
steps). This isn't the case for max_antenna_gain - which is still expected
by the firmware as dB.

The firmware is converting it from dB to the internal (twicepower)
representation when it calculates the limits of a channel. This can be seen
in tpc_stats when configuring "12" as max_antenna_gain. Instead of the
expected 12 (6 dB), the tpc_stats shows 24 (12 dB).

Tested on QCA9888 and IPQ4019 with firmware 10.4-3.5.3-00057.

Fixes: 02256930 ("ath10k: use proper tx power unit")
Signed-off-by: default avatarSven Eckelmann <seckelmann@datto.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20190611172131.6064-1-sven@narfation.org


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 218fb43f

drivers/net/wireless/ath/ath10k/mac.c

+3 −3
Original line number Diff line number Diff line
@@ -1044,7 +1044,7 @@ static int ath10k_monitor_vdev_start(struct ath10k *ar, int vdev_id) 
	arg.channel.min_power = 0;

	arg.channel.max_power = channel->max_power * 2;

	arg.channel.max_reg_power = channel->max_reg_power * 2;

	arg.channel.max_antenna_gain = channel->max_antenna_gain * 2;

	arg.channel.max_antenna_gain = channel->max_antenna_gain;



	reinit_completion(&ar->vdev_setup_done);

	reinit_completion(&ar->vdev_delete_done);
@@ -1490,7 +1490,7 @@ static int ath10k_vdev_start_restart(struct ath10k_vif *arvif, 
	arg.channel.min_power = 0;

	arg.channel.max_power = chandef->chan->max_power * 2;

	arg.channel.max_reg_power = chandef->chan->max_reg_power * 2;

	arg.channel.max_antenna_gain = chandef->chan->max_antenna_gain * 2;

	arg.channel.max_antenna_gain = chandef->chan->max_antenna_gain;



	if (arvif->vdev_type == WMI_VDEV_TYPE_AP) {

		arg.ssid = arvif->u.ap.ssid;
@@ -3149,7 +3149,7 @@ static int ath10k_update_channel_list(struct ath10k *ar) 
			ch->min_power = 0;

			ch->max_power = channel->max_power * 2;

			ch->max_reg_power = channel->max_reg_power * 2;

			ch->max_antenna_gain = channel->max_antenna_gain * 2;

			ch->max_antenna_gain = channel->max_antenna_gain;

			ch->reg_class_id = 0; /* FIXME */



			/* FIXME: why use only legacy modes, why not any

drivers/net/wireless/ath/ath10k/wmi.h

+3 −0
Original line number Diff line number Diff line
@@ -2045,7 +2045,9 @@ struct wmi_channel { 
	union {

		__le32 reginfo1;

		struct {

			/* note: power unit is 1 dBm */

			u8 antenna_max;

			/* note: power unit is 0.5 dBm */

			u8 max_tx_power;

		} __packed;

	} __packed;
@@ -2065,6 +2067,7 @@ struct wmi_channel_arg { 
	u32 min_power;

	u32 max_power;

	u32 max_reg_power;

	/* note: power unit is 1 dBm */

	u32 max_antenna_gain;

	u32 reg_class_id;

	enum wmi_phy_mode mode;