ath10k: make firmware text debug messages more verbose.
PATCH 1/2 ath10k: make firmware text debug messages more verbose.
From: Ben Greear <[email protected]>
There are not many of these messages producted by the firmware, but they are generally fairly useful, so print them at info level.
--- drivers/net/wireless/ath/ath10k/wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/wmi.c +1 -1
@@ -2050,7 +2050,7 @@ static void ath10k_wmi_event_debug_print(struct ath10k *ar,/* the last byte is always reserved for the null character */ buf[i] ='\0' ; -ath10k_dbg (ar,ATH10K_DBG_WMI ,"wmi event debug print '%s'\n" , buf); +ath10k_info (ar,"wmi event debug print '%s'\n" , buf); }static void ath10k_wmi_event_pdev_qvit (struct ath10k *ar,struct sk_buff *skb)
Signature · 1 line
1.7.11.7
PATCH 2/2 ath10k: apply chainmask settings to vdev on creation.
From: Ben Greear <[email protected]>
It appears it takes more than just setting the hardware's chainmask to make things work well. Without this patch, a vdev would only use 1x1 rates when chainmask was set to 0x3.
Setting the 'nss' (number of spatial streams) on the vdev helps the firmware's rate-control algorithm work properly.
Tested on CT firmware, but probably this works (and is required) on normal firmware.
--- drivers/net/wireless/ath/ath10k/mac.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/net/wireless/ath/ath10k/mac.c +24 -0
@@ -2767,6 +2767,17 @@ static int ath10k_config(struct ieee80211_hw *hw, u32 changed)return ret; } +static u32 get_nss_from_chainmask (u16 chain_mask) +{ +if ((chain_mask &0x15 ) ==0x15 ) +return 4 ; +else if ((chain_mask &0x7 ) ==0x7 ) +return 3 ; +else if ((chain_mask &0x3 ) ==0x3 ) +return 2 ; +return 1 ; +} +/* * TODO: * Figure out how to handle WMI_VDEV_SUBTYPE_P2P_DEVICE,
@@ -2868,6 +2879,19 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, goto err_vdev_delete; } +if (ar->cfg_tx_chainmask) { +u16 nss =get_nss_from_chainmask (ar->cfg_tx_chainmask); + vdev_param = ar->wmi.vdev_param->nss; + ret =ath10k_wmi_vdev_set_param (ar, arvif->vdev_id, vdev_param, + nss); +if (ret) { +ath10k_warn (ar,"failed to set vdev %i chainmask 0x%x, nss %i: %d\n" , + arvif->vdev_id, ar->cfg_tx_chainmask, nss, + ret); + goto err_vdev_delete; + } + } +if (arvif->vdev_type ==WMI_VDEV_TYPE_AP ) { ret =ath10k_peer_create (ar, arvif->vdev_id, vif->addr);if (ret) {
Signature · 1 line
1.7.11.7
Re: [PATCH 2/2] ath10k: apply chainmask settings to vdev on creation.
Quoted 26 lines · On 22 September 2014 22:54, <[email protected]> wrote:
From: Ben Greear <[email protected]>
It appears it takes more than just setting the hardware's chainmask to make things work well. Without this patch, a vdev would only use 1x1 rates when chainmask was set to
0x3.Setting the 'nss' (number of spatial streams) on the vdev helps the firmware's rate-control algorithm work properly.
Tested on CT firmware, but probably this works (and is required) on normal firmware.
Signed-off-by Ben Greear <[email protected]>--- drivers/net/wireless/ath/ath10k/mac.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)drivers/net/wireless/ath/ath10k/mac.c +0
-0@@ -2767,6 +2767,17 @@ static int ath10k_config(struct ieee80211_hw *hw, u32 changed)return ret; }
drivers/net/wireless/ath/ath10k/mac.c static int ath10k_config(struct ieee80211_hw *hw, u32 changed) · line 2779
Quoted 10 lines
drivers/net/wireless/ath/ath10k/mac.c +10
-0+static u32 get_nss_from_chainmask (u16 chain_mask) +{ +if ((chain_mask &0x15 ) ==0x15 ) +return 4 ; +else if ((chain_mask &0x7 ) ==0x7 ) +return 3 ; +else if ((chain_mask &0x3 ) ==0x3 ) +return 2 ; +return 1 ; +}
So a chainmask of BIT(0) | BIT(2) = 0x5 is nss=1?
Why not just use hweight16() kernel macro? Or do we want to forbid odd chainmasks (in which case additional checks need to be added as well)?
Quoted 11 lines
drivers/net/wireless/ath/ath10k/mac.c +4
-0+/* * TODO: * Figure out how to handle WMI_VDEV_SUBTYPE_P2P_DEVICE, @@ -2868,6 +2879,19 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, goto err_vdev_delete; } +if (ar->cfg_tx_chainmask) { +u16 nss =get_nss_from_chainmask (ar->cfg_tx_chainmask); + vdev_param = ar->wmi.vdev_param->nss;
drivers/net/wireless/ath/ath10k/mac.c static int ath10k_add_interface(struct ieee80211_hw *hw, · line 2894
Quoted 10 lines
drivers/net/wireless/ath/ath10k/mac.c +10
-0+ ret =ath10k_wmi_vdev_set_param (ar, arvif->vdev_id, vdev_param, + nss); +if (ret) { +ath10k_warn (ar,"failed to set vdev %i chainmask 0x%x, nss %i: %d\n" , + arvif->vdev_id, ar->cfg_tx_chainmask, nss, + ret); + goto err_vdev_delete; + } + } +
If this is required won't setting up peer nss (after association) be necessary as well?
Shouldn't the vdev nss param be set in __ath10k_set_antenna() as well? What about peer nss (assuming it's necessary to update it) in that case?
Michał
Re: [PATCH 2/2] ath10k: apply chainmask settings to vdev on creation.
Quoted 27 lines · Michal Kazior
Quoted 26 lines · On 22 September 2014 22:54, <[email protected]> wrote:
From: Ben Greear <[email protected]>
It appears it takes more than just setting the hardware's chainmask to make things work well. Without this patch, a vdev would only use 1x1 rates when chainmask was set to
0x3.Setting the 'nss' (number of spatial streams) on the vdev helps the firmware's rate-control algorithm work properly.
Tested on CT firmware, but probably this works (and is required) on normal firmware.
Signed-off-by Ben Greear <[email protected]>--- drivers/net/wireless/ath/ath10k/mac.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)drivers/net/wireless/ath/ath10k/mac.c +0
-0@@ -2767,6 +2767,17 @@ static int ath10k_config(struct ieee80211_hw *hw, u32 changed)return ret; }
Quoted 12 lines
drivers/net/wireless/ath/ath10k/mac.c static int ath10k_config(struct ieee80211_hw *hw, u32 changed) · line 2779
Quoted 10 lines
drivers/net/wireless/ath/ath10k/mac.c +10
-0+static u32 get_nss_from_chainmask (u16 chain_mask) +{ +if ((chain_mask &0x15 ) ==0x15 ) +return 4 ; +else if ((chain_mask &0x7 ) ==0x7 ) +return 3 ; +else if ((chain_mask &0x3 ) ==0x3 ) +return 2 ; +return 1 ; +}So a chainmask of
BIT(0) | BIT(2) = 0x5is nss=1?
That is how the firmware treats it.
Quoted 3 lines
Why not just use
hweight16()kernel macro? Or do we want to forbid odd chainmasks (in which case additional checks need to be added as well)?
Even after looking at the hweight16 code I don't know what it is supposed to do. I think open-coding is plenty adequate.
Maybe the driver should only allow a chainmask of 1, 3, 7, (and eventually 15 when 4x4 exists), but maybe also that can just be on the user to get it right. It is possible that there is some use for having a different chainmask, but it would require someone with good knowledge of the hardware to answer that I think.
Quoted 14 lines
drivers/net/wireless/ath/ath10k/mac.c static int ath10k_add_interface(struct ieee80211_hw *hw, · line 2894
Quoted 13 lines
drivers/net/wireless/ath/ath10k/mac.c +13
-0+if (ar->cfg_tx_chainmask) { +u16 nss =get_nss_from_chainmask (ar->cfg_tx_chainmask); + vdev_param = ar->wmi.vdev_param->nss; + ret =ath10k_wmi_vdev_set_param (ar, arvif->vdev_id, vdev_param, + nss); +if (ret) { +ath10k_warn (ar,"failed to set vdev %i chainmask 0x%x, nss %i: %d\n" , + arvif->vdev_id, ar->cfg_tx_chainmask, nss, + ret); + goto err_vdev_delete; + } + } +
Quoted 6 lines
If this is required won't setting up peer nss (after association) be necessary as well?
Shouldn't the vdev nss param be set in
__ath10k_set_antenna()as well? What about peer nss (assuming it's necessary to update it) in that case?
Did the second patch address all of this? I may have missed more cases, but at least with the second patch it seems to work for me reliably.
Thanks,
Ben
Signature · 2 lines
Ben Greear <[email protected]> Candela Technologies Inc http://www.candelatech.com
Quoted 16 lines · [email protected] writes:
From: Ben Greear <[email protected]>
There are not many of these messages producted by the firmware, but they are generally fairly useful, so print them at info level.
Signed-off-by Ben Greear <[email protected]>--- drivers/net/wireless/ath/ath10k/wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/wireless/ath/ath10k/wmi.c +0
-0
drivers/net/wireless/ath/ath10k/wmi.c static void ath10k_wmi_event_debug_print(struct ath10k *ar, · line 2053
Quoted 5 lines
drivers/net/wireless/ath/ath10k/wmi.c +1
-1@@ -2050,7 +2050,7 @@ static void ath10k_wmi_event_debug_print(struct ath10k *ar,/* the last byte is always reserved for the null character */ buf[i] ='\0' ; -ath10k_dbg (ar,ATH10K_DBG_WMI ,"wmi event debug print '%s'\n" , buf); +ath10k_info (ar,"wmi event debug print '%s'\n" , buf);
This does not bring any extra value to normal users, it's only useful to firmware engineers. That's why it needs to stay as a debug message. Maybe we should add a new debug level just for these events, would that help?
Signature · 1 line
Kalle Valo
Quoted 21 lines · Kalle Valo
Quoted 19 lines · [email protected] writes:
From: Ben Greear <[email protected]>
There are not many of these messages producted by the firmware, but they are generally fairly useful, so print them at info level.
Signed-off-by Ben Greear <[email protected]>--- drivers/net/wireless/ath/ath10k/wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/net/wireless/ath/ath10k/wmi.c +0
-0@@ -2050,7 +2050,7 @@ static void ath10k_wmi_event_debug_print(struct ath10k *ar,/* the last byte is always reserved for the null character */ buf[i] ='\0' ;
Quoted 7 lines
drivers/net/wireless/ath/ath10k/wmi.c static void ath10k_wmi_event_debug_print(struct ath10k *ar, · line 2053
Quoted 2 lines
drivers/net/wireless/ath/ath10k/wmi.c +1
-1-ath10k_dbg (ar,ATH10K_DBG_WMI ,"wmi event debug print '%s'\n" , buf); +ath10k_info (ar,"wmi event debug print '%s'\n" , buf);This does not bring any extra value to normal users, it's only useful to firmware engineers. That's why it needs to stay as a debug message. Maybe we should add a new debug level just for these events, would that help?
It will help users trying to tune the maximum resource combinations (vdevs + peers + tx-descriptors + skid-len, etc) because my firmware prints out remaining RAM/IRAM after booting up.
But, a separate debug flag would be fine.
Thanks,
Ben
Signature · 2 lines
Ben Greear <[email protected]> Candela Technologies Inc http://www.candelatech.com