ath10k: fix max antenna gain unit
PATCH v2 1/1 ath10k: fix max antenna gain unit
From: Sven Eckelmann <[email protected]>
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.
---
v2:
* Add comments to wmi.h regarding the power unit
drivers/net/wireless/ath/ath10k/mac.c | 6 +++--- drivers/net/wireless/ath/ath10k/wmi.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath10k/mac.c +3 -3
@@ -1008,7 +1008,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);
@@ -1450,7 +1450,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;
@@ -3105,7 +3105,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
@@ -2038,7 +2038,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;
@@ -2058,6 +2060,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;
Signature · 1 line
2.20.1
+ Govind, Wen
Quoted 15 lines · Sven Eckelmann
From: Sven Eckelmann <[email protected]>
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_statswhen configuring "12" asmax_antenna_gain. Instead of the expected 12 (6 dB), thetpc_statsshows 24 (12 dB).Tested on QCA9888 and IPQ4019 with firmware 10.4-3.5.3-00057.
Fixes 02256930d9b8 ("ath10k: use proper tx power unit")Signed-off-by Sven Eckelmann <[email protected]>
[...]
Quoted 21 lines
drivers/net/wireless/ath/ath10k/mac.c +2
-2@@ -1008,7 +1008,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);@@ -1450,7 +1450,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;
drivers/net/wireless/ath/ath10k/mac.c static int ath10k_update_channel_list(struct ath10k *ar) · line 3109
Quoted 6 lines
drivers/net/wireless/ath/ath10k/mac.c +1
-1@@ -3105,7 +3105,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 */
What about firmwares using WMI TLV interface, for example QCA6174 or WCN3990? Does this break max antenna gain on those devices? Govind, Wen?
Signature · 6 lines
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches _______________________________________________ ath10k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath10k
Quoted 9 lines · Sven Eckelmann
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_statswhen configuring "12" asmax_antenna_gain. Instead of the expected 12 (6 dB), thetpc_statsshows 24 (12 dB).
Quoted 5 lines
Tested on QCA9888 and IPQ4019 with firmware 10.4-3.5.3-00057.
Fixes 02256930d9b8 ("ath10k: use proper tx power unit")Signed-off-by Sven Eckelmann <[email protected]>Signed-off-by Kalle Valo <[email protected]>
Patch applied to ath-next branch of ath.git, thanks.
0a491167fe0c ath10k: fix max antenna gain unit
Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches