From patchwork Fri Jan 13 21:35:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erik Stromdahl X-Patchwork-Id: 9516545 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DE43E60761 for ; Fri, 13 Jan 2017 21:35:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF55028584 for ; Fri, 13 Jan 2017 21:35:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C42E8286CB; Fri, 13 Jan 2017 21:35:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 85DFF28584 for ; Fri, 13 Jan 2017 21:35:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cS9Vp-0003jf-NJ; Fri, 13 Jan 2017 21:35:53 +0000 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cS9Vj-0003bF-Rc for ath10k@lists.infradead.org; Fri, 13 Jan 2017 21:35:50 +0000 Received: by mail-lf0-x244.google.com with SMTP id v186so7072172lfa.2 for ; Fri, 13 Jan 2017 13:35:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0fOS2FWuKPDUyrJB7E/7o2F+TbvvO97oE/lD9azvJZU=; b=aA0+RoDpN2ekiRG1dIwyQWrXfvcAfOxcl3AHLT+bzDhg8Nc17Tzc8RsbCw2VKpsf5W MoVputOBysLum34Vsh/3FhyGqKcy04gcHSXJF/qdFVM8HgvtkUem6JmhuKKQQehcV9Vy Slrf0UWTUcEbjOhAmLTqMqQUh0Z8ySNacf3V4j1fQaaZ2haNH7RCFIuePtT0LH/kZW0e 9Tejp2dFbaNNA55ZPGWwEAkOQmwD2bLynqyXQnArY8UZTB6EtW/oUNNziFTJc5yvQR2T Yjh8puw9gPGKiQXyIi0ljCR7CN+8O6TJED/6OR/93snGCM9y5a0tFl/PgqWUZ7dDbMD6 Wqfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0fOS2FWuKPDUyrJB7E/7o2F+TbvvO97oE/lD9azvJZU=; b=J29r5v409x3KWIXfI4O3/0R8QN5RdMaAW4FF8/vumkjUJ4VeuFiYQfhabSBYobtES5 0ZPhO/kzlPyO+j3XZkiyI7CJhbx/pU2GtjxTqBwIGJO+h48BwDhZ81W5otrL4Z4/OCBr +EqEEB3/8AYS5gchjRh/aAiOTDIVQ8kOa8hzHvi1bbxwQ2kfguwqinJz6goNrcAbaT/j N9A8o3GchF+JFX647khcu3/Kesz+TVJq5y29ihPwvHuAViXoZAaeI8oK//5yuwBRdyhR ra9khjqiGxKcg9VTpt/QyWEXAjHptO1G1og9G6ZeWEZazVFlujOB+yAgayNCybbZUElu 3z/Q== X-Gm-Message-State: AIkVDXKiBTvWXi4kg9aGoRDnG0LWRF8SXRJzQ1Yvo5iLLB/opvJ42RC5z5yzb/EMviOA5g== X-Received: by 10.25.27.145 with SMTP id b139mr7307682lfb.114.1484343327696; Fri, 13 Jan 2017 13:35:27 -0800 (PST) Received: from erik-mate-1604.lan (90-227-62-61-no75.tbcn.telia.com. [90.227.62.61]) by smtp.gmail.com with ESMTPSA id 66sm4437411lfy.42.2017.01.13.13.35.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 13 Jan 2017 13:35:27 -0800 (PST) From: Erik Stromdahl To: kvalo@qca.qualcomm.com, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Subject: [RFC 06/10] ath10k: disable frame aggregation for high latency Date: Fri, 13 Jan 2017 22:35:05 +0100 Message-Id: <1484343309-6327-7-git-send-email-erik.stromdahl@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484343309-6327-1-git-send-email-erik.stromdahl@gmail.com> References: <1484343309-6327-1-git-send-email-erik.stromdahl@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170113_133548_083258_02621E43 X-CRM114-Status: GOOD ( 10.06 ) X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Erik Stromdahl MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This patch disables frame aggregation for HL interfaces. It is safest to do so until a mechanism for setting the limits from fw etc. has been implemented. Signed-off-by: Erik Stromdahl --- drivers/net/wireless/ath/ath10k/core.c | 9 +++++++-- drivers/net/wireless/ath/ath10k/htt.h | 4 ++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index c275a52..573e772 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -1615,8 +1615,13 @@ static int ath10k_core_init_firmware_features(struct ath10k *ar) return -EINVAL; } - ar->htt.max_num_amsdu = ATH10K_HTT_MAX_NUM_AMSDU_DEFAULT; - ar->htt.max_num_ampdu = ATH10K_HTT_MAX_NUM_AMPDU_DEFAULT; + if (ar->is_high_latency) { + ar->htt.max_num_amsdu = ATH10K_HTT_MAX_NUM_AMSDU_HL; + ar->htt.max_num_ampdu = ATH10K_HTT_MAX_NUM_AMPDU_HL; + } else { + ar->htt.max_num_amsdu = ATH10K_HTT_MAX_NUM_AMSDU_DEFAULT; + ar->htt.max_num_ampdu = ATH10K_HTT_MAX_NUM_AMPDU_DEFAULT; + } if (rawmode) { if (!test_bit(ATH10K_FW_FEATURE_RAW_MODE_SUPPORT, diff --git a/drivers/net/wireless/ath/ath10k/htt.h b/drivers/net/wireless/ath/ath10k/htt.h index 3d1bd6f..dd9e582 100644 --- a/drivers/net/wireless/ath/ath10k/htt.h +++ b/drivers/net/wireless/ath/ath10k/htt.h @@ -1777,6 +1777,10 @@ struct htt_rx_desc { #define ATH10K_HTT_MAX_NUM_AMSDU_DEFAULT 3 #define ATH10K_HTT_MAX_NUM_AMPDU_DEFAULT 64 +/* Disable frame aggregation for high latency devices */ +#define ATH10K_HTT_MAX_NUM_AMSDU_HL 1 +#define ATH10K_HTT_MAX_NUM_AMPDU_HL 1 + int ath10k_htt_connect(struct ath10k_htt *htt); int ath10k_htt_init(struct ath10k *ar); int ath10k_htt_setup(struct ath10k_htt *htt);