From patchwork Fri Jun 15 12:04:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Erik Stromdahl X-Patchwork-Id: 10466279 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 C13B260384 for ; Fri, 15 Jun 2018 12:06:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B53A328D8C for ; Fri, 15 Jun 2018 12:06:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A9D8828D8E; Fri, 15 Jun 2018 12:06:29 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 565EF28D8C for ; Fri, 15 Jun 2018 12:06:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936193AbeFOMG1 (ORCPT ); Fri, 15 Jun 2018 08:06:27 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:44240 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932360AbeFOMGZ (ORCPT ); Fri, 15 Jun 2018 08:06:25 -0400 Received: by mail-lf0-f66.google.com with SMTP id p23-v6so2588140lfh.11 for ; Fri, 15 Jun 2018 05:06:24 -0700 (PDT) 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=9d8rn1W+VyYzJs4RrhP6/1+7cNExA9Si8ZUjFUy07Vo=; b=o5pQblCqk0Z/XXA6KvkBKjTt/YcIX3B14gHQlzQA2jOlsOTHMjcJW9XseGpRCNeFvv xEjcXGud0O7hLOGUWtlMtkMykdSEBU/gD5kwOJE0JKRTjvnvGP1b8DsbzLkEqRnzxONZ nnk5/zh4PzAMY2Si0ax7ozMbFO3Mhk0y1kY15VDSluSR7PrTfxAgXjvNT6fgitxOo5DK 6bECZUi69iUztKFXkgEEHF6NHhuDCNzxM1cHTU8sKW7+e3+JSy6HrvXqJMw+O18AIWzD /TBagQd/iT53gRafoijE5cLppaKOGNJ5TmLnrwWfho0MJjeWXgMGYoB9gclkkpyPsps/ BPkw== 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=9d8rn1W+VyYzJs4RrhP6/1+7cNExA9Si8ZUjFUy07Vo=; b=m3MGpIJ4li3FHwyOxLCjmjjCWTgRHd+DmO1nLHl53vwYCvzGE0JrxReKdElpaoHOwT EP1hBlUy3zJV90bOQDHHkuOtuwH/T+3PikY8RzJhDzSg2uiZEySxaOMZ/R50V+jzLvT/ rcB83xH4VLMsBQGJz+MCZwyCx6B3a66hZweGvYI5XtDekyihQFS06jJI5PrezoxZzi6a yAF6OHKkV0jHBtnUSSBrow4Bhw8C/BPmmfXwNyGmfQEa1d4ETMiePj+0VrZt/Zc88L0I fSeFaFmyop4/pDeQqFfmP2SC8XgbqWSTw2qFutQBG7h+0+v0bXhrhso4zwhYMWLfl3B9 TdXQ== X-Gm-Message-State: APt69E3S/uZ9fyxBcGz5nmzoIA4KzkVUNwxnxveyig6LwtRT6bsIK55t NrKYEyl34DtSyFvrimn8lBw= X-Google-Smtp-Source: ADUXVKKUrcuyMZnLKmFv3yqY4mwnLtCZJYq8Mqq+BtySDYrblRBpEqEhqaaumiwlN4OI/sh2Il0ZnQ== X-Received: by 2002:a19:d898:: with SMTP id r24-v6mr965462lfi.7.1529064383579; Fri, 15 Jun 2018 05:06:23 -0700 (PDT) Received: from localhost.localdomain (90-227-62-61-no75.tbcn.telia.com. [90.227.62.61]) by smtp.gmail.com with ESMTPSA id x15-v6sm1470210lfe.39.2018.06.15.05.06.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Jun 2018 05:06:23 -0700 (PDT) From: Erik Stromdahl To: kvalo@qca.qualcomm.com, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Cc: Erik Stromdahl Subject: [PATCH 2/2] ath10k: replace hardcoded constant with define Date: Fri, 15 Jun 2018 14:04:23 +0200 Message-Id: <20180615120423.4963-2-erik.stromdahl@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180615120423.4963-1-erik.stromdahl@gmail.com> References: <20180615120423.4963-1-erik.stromdahl@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The hardcoded values used in ath10k_mac_tx_push_pending and ath10k_mac_op_wake_tx_queue set an upper limit of how many packets that can be consumed from the TX queue. HTC_HOST_MAX_MSG_PER_TX_BUNDLE is a proper name for this constant, as the value effectively limits the number of messages that can be consumed in one step. Thus, the value is an upper limit of the number of messages that can be added to a TX message bundle. Signed-off-by: Erik Stromdahl --- drivers/net/wireless/ath/ath10k/htc.h | 1 + drivers/net/wireless/ath/ath10k/mac.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h index e60fbea698a9..d69bb83049c4 100644 --- a/drivers/net/wireless/ath/ath10k/htc.h +++ b/drivers/net/wireless/ath/ath10k/htc.h @@ -51,6 +51,7 @@ struct ath10k; */ #define HTC_HOST_MAX_MSG_PER_RX_BUNDLE 8 +#define HTC_HOST_MAX_MSG_PER_TX_BUNDLE 16 enum ath10k_htc_tx_flags { ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE = 0x01, diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index f31ae3be4778..e36ca4145572 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -4026,7 +4026,7 @@ void ath10k_mac_tx_push_pending(struct ath10k *ar) drv_priv); /* Prevent aggressive sta/tid taking over tx queue */ - max = 16; + max = HTC_HOST_MAX_MSG_PER_TX_BUNDLE; ret = 0; while (ath10k_mac_tx_can_push(hw, txq) && max--) { ret = ath10k_mac_tx_push_txq(hw, txq); @@ -4287,7 +4287,7 @@ static void ath10k_mac_op_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *f_txq; struct ath10k_txq *f_artxq; int ret = 0; - int max = 16; + int max = HTC_HOST_MAX_MSG_PER_TX_BUNDLE; spin_lock_bh(&ar->txqs_lock); if (list_empty(&artxq->list))