[v2,27/50] wilc1000: simplify ac_balance() a bit

Message ID	20211223011358.4031459-28-davidm@egauge.net (mailing list archive)
State	Changes Requested
Delegated to:	Kalle Valo
Headers	show Return-Path: <linux-wireless-owner@kernel.org> From: David Mosberger-Tang <davidm@egauge.net> Subject: [PATCH v2 27/50] wilc1000: simplify ac_balance() a bit Date: Thu, 23 Dec 2021 01:14:06 +0000 (UTC) Message-Id: <20211223011358.4031459-28-davidm@egauge.net> In-Reply-To: <20211223011358.4031459-1-davidm@egauge.net> References: <20211223011358.4031459-1-davidm@egauge.net> MIME-Version: 1.0 To: Ajay Singh <ajay.kathat@microchip.com> Cc: Claudiu Beznea <claudiu.beznea@microchip.com>, Kalle Valo <kvalo@kernel.org>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, David Mosberger-Tang <davidm@egauge.net> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Precedence: bulk
Series	wilc1000: rework tx path to use sk_buffs throughout \| expand [v2,00/50] wilc1000: rework tx path to use sk_buffs throughout [v2,04/50] wilc1000: factor common code in wilc_wlan_cfg_set() and wilc_wlan_cfg_get() [v2,01/50] wilc1000: don't hold txq_spinlock while initializing AC queue limits [v2,02/50] wilc1000: switch txq_event from completion to waitqueue [v2,31/50] wilc1000: eliminate another magic constant [v2,30/50] wilc1000: use more descriptive variable names [v2,29/50] wilc1000: factor header length calculation into a new function [v2,28/50] wilc1000: improve send_packets() a bit [v2,27/50] wilc1000: simplify ac_balance() a bit [v2,25/50] wilc1000: replace txq_spinlock with ack_filter_lock mutex [v2,24/50] wilc1000: protect tx_q_limit with a mutex instead of a spinlock [v2,23/50] wilc1000: introduce symbolic names for two tx-related control bits [v2,22/50] wilc1000: minor syntax cleanup [v2,21/50] wilc1000: declare read-only ac_preserve_ratio as static and const [v2,20/50] wilc1000: eliminate "max_size_over" variable in fill_vmm_table [v2,19/50] wilc1000: don't tell the chip to go to sleep while copying tx packets [v2,18/50] wilc1000: split huge tx handler into subfunctions [v2,16/50] wilc1000: switch tx queue to normal sk_buff entries [v2,03/50] wilc1000: move receive-queue stats from txq to wilc structure [v2,06/50] wilc1000: move tx packet drop code into its own function [v2,07/50] wilc1000: increment tx_dropped stat counter on tx packet drop [v2,08/50] wilc1000: fix management packet type inconsistency [v2,09/50] wilc1000: prepare wilc_wlan_tx_packet_done() for sk_buff changes [v2,10/50] wilc1000: factor initialization of tx queue-specific packet fields [v2,11/50] wilc1000: convert tqx_entries from "int" to "atomic_t" [v2,12/50] wilc1000: refactor wilc_wlan_cfg_commit() a bit [v2,13/50] wilc1000: sanitize config packet sequence number management a bit [v2,14/50] wilc1000: if there is no tx packet, don't increment packets-sent counter [v2,15/50] wilc1000: add struct wilc_skb_tx_cb as an alias of struct txq_entry_t [v2,17/50] wilc1000: remove no longer used "vif" argument from init_txq_entry() [v2,49/50] wilc1000: implement zero-copy transmit support for SPI [v2,50/50] wilc1000: add module parameter "disable_zero_copy_tx" to SPI driver [v2,48/50] wilc1000: introduce function to find and check DMA response [v2,47/50] wilc1000: factor SPI DMA command initialization code into a function [v2,46/50] wilc1000: remove duplicate CRC calculation code [v2,45/50] wilc1000: move struct wilc_spi declaration [v2,44/50] wilc1000: don't allocate tx_buffer when zero-copy is available [v2,43/50] wilc1000: add support for zero-copy transmit of tx packets [v2,42/50] wilc1000: simplify code by adding header/padding to skb [v2,41/50] wilc1000: use more descriptive variable name [v2,40/50] wilc1000: introduce schedule_packets() function [v2,39/50] wilc1000: eliminate txq_add_to_head_cs mutex [v2,38/50] wilc1000: take advantage of chip queue [v2,37/50] wilc1000: introduce set_header() function [v2,36/50] wilc1000: introduce transmit path chip queue [v2,35/50] wilc1000: introduce copy_and_send_packets() helper function [v2,34/50] wilc1000: restructure wilc-wlan_handle_txq() for clarity [v2,33/50] wilc1000: move ac_desired_ratio calculation to where its needed [v2,32/50] wilc1000: introduce vmm_table_entry() helper function [v2,26/50] wilc1000: reduce amount of time ack_filter_lock is held [v2,05/50] wilc1000: add wilc_wlan_tx_packet_done() function

Message ID

20211223011358.4031459-28-davidm@egauge.net (mailing list archive)

State

Changes Requested

Delegated to:

Kalle Valo

Headers

From: David Mosberger-Tang <davidm@egauge.net>
Subject: [PATCH v2 27/50] wilc1000: simplify ac_balance() a bit
Date: Thu, 23 Dec 2021 01:14:06 +0000 (UTC)
Message-Id: <20211223011358.4031459-28-davidm@egauge.net>
In-Reply-To: <20211223011358.4031459-1-davidm@egauge.net>
References: <20211223011358.4031459-1-davidm@egauge.net>
MIME-Version: 1.0
To: Ajay Singh <ajay.kathat@microchip.com>
Cc: Claudiu Beznea <claudiu.beznea@microchip.com>,
        Kalle Valo <kvalo@kernel.org>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        David Mosberger-Tang <davidm@egauge.net>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=us-ascii
Precedence: bulk

Series

wilc1000: rework tx path to use sk_buffs throughout | expand

Commit Message

David Mosberger-Tang Dec. 23, 2021, 1:14 a.m. UTC

ac_balance() is never going to fail ("ratio" is always non-NULL), so
there is no reason to pretend otherwise.

Signed-off-by: David Mosberger-Tang <davidm@egauge.net>
---
 drivers/net/wireless/microchip/wilc1000/wlan.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/microchip/wilc1000/wlan.c b/drivers/net/wireless/microchip/wilc1000/wlan.c
index 5ea9129b36925..287c0843ba152 100644
--- a/drivers/net/wireless/microchip/wilc1000/wlan.c
+++ b/drivers/net/wireless/microchip/wilc1000/wlan.c
@@ -345,21 +345,23 @@  static inline u8 ac_classify(struct wilc *wilc, struct sk_buff *skb)
 	return q_num;
 }
 
-static inline int ac_balance(struct wilc *wl, u8 *ratio)
+/**
+ * ac_balance() - balance queues by favoring ones with fewer packets pending
+ * @wl: Pointer to the wilc structure.
+ * @ratio: Pointer to array of length NQUEUES in which this function
+ *	returns the number of packets that may be scheduled for each
+ *	access category.
+ */
+static inline void ac_balance(const struct wilc *wl, u8 *ratio)
 {
 	u8 i, max_count = 0;
 
-	if (!ratio)
-		return -EINVAL;
-
 	for (i = 0; i < NQUEUES; i++)
 		if (wl->fw[i].count > max_count)
 			max_count = wl->fw[i].count;
 
 	for (i = 0; i < NQUEUES; i++)
 		ratio[i] = max_count - wl->fw[i].count;
-
-	return 0;
 }
 
 static inline void ac_update_fw_ac_pkt_info(struct wilc *wl, u32 reg)
@@ -894,8 +896,7 @@  int wilc_wlan_handle_txq(struct wilc *wilc, u32 *txq_count)
 	if (wilc->quit)
 		goto out_update_cnt;
 
-	if (ac_balance(wilc, ac_desired_ratio))
-		return -EINVAL;
+	ac_balance(wilc, ac_desired_ratio);
 
 	mutex_lock(&wilc->txq_add_to_head_cs);

[v2,27/50] wilc1000: simplify ac_balance() a bit

Commit Message

Patch