From patchwork Mon Jan 19 08:53:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5655611 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 58FC6C058D for ; Mon, 19 Jan 2015 08:54:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 778A6202C8 for ; Mon, 19 Jan 2015 08:54:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9678C20251 for ; Mon, 19 Jan 2015 08:54:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751444AbbASIyb (ORCPT ); Mon, 19 Jan 2015 03:54:31 -0500 Received: from mail-we0-f172.google.com ([74.125.82.172]:62230 "EHLO mail-we0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751426AbbASIyb (ORCPT ); Mon, 19 Jan 2015 03:54:31 -0500 Received: by mail-we0-f172.google.com with SMTP id k11so30086381wes.3 for ; Mon, 19 Jan 2015 00:54:25 -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=HhOCBmzyXaUfjBYIwodcM4lcqcFi46cVffKnvsvR68U=; b=DYQBwQxEXuy0ZT63X/SgeSvwcpwWoT1dNDm5jIdQ3bM7rucd11cMWJtvCnvwMScu5h dov7MCySK9vVT8zbKqtt9cI7owvxlg7S6+2LBJmcuvnFwqfvwA3hoZ9SxiF2F/seHKiI RbFeS7L6Wbfd6PTAUvmKSZoFdY3MZjBmUZKPw= 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=HhOCBmzyXaUfjBYIwodcM4lcqcFi46cVffKnvsvR68U=; b=VF28YzrfW1lWq5uEu76PWp0S7G8LQx1E1+Bv6ZCnYpvw3pDyDzytepg67FvL7V1Jrq NZOnrzu4XEUdFGDdO2YasZ5Y73pjMKwNevS7X5lwPyde0HJtZrJWKiNURy0HzwYJUSMO PSN+FibGsG6iH38X358BHZi5C2R3JidXKWfPiSK1cM9dkiCawvlSujBLgXsKi/fo6N27 jb2u49Ruw6m6VIukAi/gPy1Gosbok5SriBh9nuIasqTHhsNIyyQC4mG0U1AzXrnqMiV1 X1f8QulQxTJUiAaBnbLrZTgvjfDS1P2EkMQpPr4qV4UdHkehXv6BV2dArJlBhgc6Vpro fuVA== X-Gm-Message-State: ALoCoQmKIT5pbAQOHfVfZYTKtUCVmoFu5j6fz0EgmD1kPb2+KWTzgIrX2N+xopCKymmZGzusX7MHO00V0GitzUmYDqSL4trqIMEftZjXwblwOUJNHhBzaEzckcg58lEnfqZT8W6pV63F X-Received: by 10.194.201.137 with SMTP id ka9mr58551780wjc.66.1421657665636; Mon, 19 Jan 2015 00:54:25 -0800 (PST) Received: from bob.homerouter.cpe (apn-46-76-65-212.dynamic.gprs.plus.pl. [46.76.65.212]) by mx.google.com with ESMTPSA id gl1sm8441930wib.13.2015.01.19.00.54.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jan 2015 00:54:25 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH 3/3] ath10k: use per-vif wmm param setup if possible Date: Mon, 19 Jan 2015 09:53:43 +0100 Message-Id: <1421657623-11706-3-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1421657623-11706-1-git-send-email-michal.kazior@tieto.com> References: <1421657623-11706-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham 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 New wmi-tlv firmware for qca6174 supports this. This should fix issues related to multi-vif WMM. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index a2a145b..7cbe0d4 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -4098,11 +4098,23 @@ static int ath10k_conf_tx(struct ieee80211_hw *hw, */ p->txop = params->txop * 32; - /* FIXME: FW accepts wmm params per hw, not per vif */ - ret = ath10k_wmi_pdev_set_wmm_params(ar, &arvif->wmm_params); - if (ret) { - ath10k_warn(ar, "failed to set wmm params: %d\n", ret); - goto exit; + if (ar->wmi.ops->gen_vdev_wmm_conf) { + ret = ath10k_wmi_vdev_wmm_conf(ar, arvif->vdev_id, + &arvif->wmm_params); + if (ret) { + ath10k_warn(ar, "failed to set vdev wmm params on vdev %i: %d\n", + arvif->vdev_id, ret); + goto exit; + } + } else { + /* This won't work well with multi-interface cases but it's + * better than nothing. + */ + ret = ath10k_wmi_pdev_set_wmm_params(ar, &arvif->wmm_params); + if (ret) { + ath10k_warn(ar, "failed to set wmm params: %d\n", ret); + goto exit; + } } ret = ath10k_conf_tx_uapsd(ar, vif, ac, params->uapsd);