| Message ID | 1411419245-25799-2-git-send-email-greearb@candelatech.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On 22 September 2014 22:54, <greearb@candelatech.com> wrote: > From: Ben Greear <greearb@candelatech.com> > > 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 <greearb@candelatech.com> > --- > drivers/net/wireless/ath/ath10k/mac.c | 24 ++++++++++++++++++++++++ > 1 file changed, 24 insertions(+) > > diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c > index 4dc5a40..855c71c 100644 > --- a/drivers/net/wireless/ath/ath10k/mac.c > +++ b/drivers/net/wireless/ath/ath10k/mac.c > @@ -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; > +} 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)? > + > /* > * 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 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? -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/23/2014 01:53 AM, Michal Kazior wrote: > On 22 September 2014 22:54, <greearb@candelatech.com> wrote: >> From: Ben Greear <greearb@candelatech.com> >> >> 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 <greearb@candelatech.com> >> --- >> drivers/net/wireless/ath/ath10k/mac.c | 24 ++++++++++++++++++++++++ >> 1 file changed, 24 insertions(+) >> >> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c >> index 4dc5a40..855c71c 100644 >> --- a/drivers/net/wireless/ath/ath10k/mac.c >> +++ b/drivers/net/wireless/ath/ath10k/mac.c >> @@ -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; >> +} > > So a chainmask of `BIT(0) | BIT(2) = 0x5` is nss=1? That is how the firmware treats it. > 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. >> + 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 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
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 4dc5a40..855c71c 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -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) {