From patchwork Wed Dec 10 12:31:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5468781 Return-Path: X-Original-To: patchwork-ath10k@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 887B8BEEA8 for ; Wed, 10 Dec 2014 12:45:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B218F2016C for ; Wed, 10 Dec 2014 12:45:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D57252010C for ; Wed, 10 Dec 2014 12:45:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XygdO-00082N-5z; Wed, 10 Dec 2014 12:44:50 +0000 Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XygdI-0007vx-8S for ath10k@lists.infradead.org; Wed, 10 Dec 2014 12:44:46 +0000 Received: by mail-wi0-f179.google.com with SMTP id ex7so5006644wid.12 for ; Wed, 10 Dec 2014 04:44:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ss2BhDRtLAHgzd4Yi6gTQL7FsITZxk+S/whm8ipf/fU=; b=trJvSVrv/MCzKWWowp9chwgTV8KdGAft4yk2WVUUGsviwVE48LvPpRaSeCJgZgZcD1 1TUcCTqERvOJzT9/EkGHlJIKf8UbwZPg7Fo/dIqXsMJbIw3yET3HwzbjtO2JDpXPICf4 VaR+iRmlJt+2RtE6rpb9d6yJA8zrNAUXqrce0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ss2BhDRtLAHgzd4Yi6gTQL7FsITZxk+S/whm8ipf/fU=; b=NrgplzeYsRLxUDUkl7yzDo74NE0+JhNnst+J1hDIVr7kegUQyTzMVitVQOBdXYnAmw bGo85KE3UyAb7Xx2u2RSUNEugdIqRVvVfjT4N45TqVNiQ+yJ8wKUVOgGWItkZFyWpYVo vyno2wZbodfBGzfiRgoVU19eS62dDtvRsuJxPuZvbAGb+UHfx5KV242SlG93Zorqdo5U 4PJt7SIkHDCM9XgAsKTLh/axhreT+bR4mODWXNxg3OSssmSw8GJKD63IULtBNlH1YgyJ YIuI6YZbvhYlT3C8mwDzJpqOuOv1tyuwgxR/jOhFTr57o8ns8413nXJh2/RJhPD+9EZn Hh2g== X-Gm-Message-State: ALoCoQnQ6YGgWapFZBUgpMXDAwGwg7y6kyR6Mlq6w6NRIiJDzGK9AgyE6io7w+AmkFFJED+Ig6w30ql9DX2phWkWhgnxDremrTMyNP67hGI4pEXdz5JWuUUUwvDJ7YPdM1eP+0xGt0f+ymu1YVDtMcH4EimDsC3gP75hg/M69zbqY+FZsDlU55w= X-Received: by 10.194.238.40 with SMTP id vh8mr6411860wjc.57.1418215461104; Wed, 10 Dec 2014 04:44:21 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id b10sm6203642wiw.9.2014.12.10.04.44.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Dec 2014 04:44:20 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Subject: [PATCH 2/5] ath10k: fix STA u-APSD Date: Wed, 10 Dec 2014 13:31:51 +0100 Message-Id: <1418214714-29689-3-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1418214714-29689-1-git-send-email-michal.kazior@tieto.com> References: <1418214714-29689-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141210_044444_442702_E260B7A0 X-CRM114-Status: GOOD ( 12.48 ) X-Spam-Score: -0.8 (/) Cc: linux-wireless@vger.kernel.org, Michal Kazior X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP To comply with WMM-PS the device shouldn't wake up with a NullFunc frame pair when tx-ing. Instead PM bit on each tx frame should be used. To make this work correctly firmware needs to be told to use a different STA PS wake threshold when u-APSD is enabled. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 41 ++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 950322d..969d187 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -1048,6 +1048,31 @@ static void ath10k_control_ibss(struct ath10k_vif *arvif, arvif->vdev_id, ret); } +static int ath10k_mac_vif_recalc_ps_wake_threshold(struct ath10k_vif *arvif) +{ + struct ath10k *ar = arvif->ar; + u32 param; + u32 value; + int ret; + + lockdep_assert_held(&arvif->ar->conf_mutex); + + if (arvif->u.sta.uapsd) + value = WMI_STA_PS_TX_WAKE_THRESHOLD_NEVER; + else + value = WMI_STA_PS_TX_WAKE_THRESHOLD_ALWAYS; + + param = WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD; + ret = ath10k_wmi_set_sta_ps_param(ar, arvif->vdev_id, param, value); + if (ret) { + ath10k_warn(ar, "failed to submit ps wake threshold %u on vdev %i: %d\n", + value, arvif->vdev_id, ret); + return ret; + } + + return 0; +} + /* * Review this when mac80211 gains per-interface powersave support. */ @@ -3036,14 +3061,11 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, goto err_peer_delete; } - param = WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD; - value = WMI_STA_PS_TX_WAKE_THRESHOLD_ALWAYS; - ret = ath10k_wmi_set_sta_ps_param(ar, arvif->vdev_id, - param, value); + ret = ath10k_mac_vif_recalc_ps_wake_threshold(arvif); if (ret) { - ath10k_warn(ar, "failed to set vdev %i TX wake thresh: %d\n", + ath10k_warn(ar, "failed to recalc ps wake threshold on vdev %i: %d\n", arvif->vdev_id, ret); - goto err_peer_delete; + return ret; } param = WMI_STA_PS_PARAM_PSPOLL_COUNT; @@ -3818,6 +3840,13 @@ static int ath10k_conf_tx_uapsd(struct ath10k *ar, struct ieee80211_vif *vif, if (ret) ath10k_warn(ar, "failed to set rx wake param: %d\n", ret); + ret = ath10k_mac_vif_recalc_ps_wake_threshold(arvif); + if (ret) { + ath10k_warn(ar, "failed to recalc ps wake threshold on vdev %i: %d\n", + arvif->vdev_id, ret); + return ret; + } + exit: return ret; }