From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtpout-02.galae.net (smtpout-02.galae.net [185.246.84.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C6733D300F for ; Wed, 5 Aug 2026 17:43:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.246.84.56 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785951796; cv=none; b=mC0V64boTVJvOwQoaNeFPouO5OmmEE/N2dxm/gny79h6uj4+HzUJBjaZ53ny19Kb3JB+/CG5Lh2p0gUumKDhi7FvQ0Wdno9OBKKO9mKLhrMrvS6fi6vDIkLKzAcrDlHKiFVwTQTQ1FZEJpvC/cG/JGWdz47WafigXF4KXIj+lvY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785951796; c=relaxed/simple; bh=mE/+OqcuvdJko4qn5pSjtmKs31qRQhXg8ht7okrYGeY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ETD6ZHrw1f658gtDbjVxs9t366dofoK7KGVUD2RA7KxfuxCFzmFD+c7gxjqZzmkwa2YPNBFhTRMVx9zzzm2d9xNOBKkaMRsQDqJPRIcjM+6UZp9kBUy0hNg8bElGwK3R5FcUYZVxZjmLMY7kBkKxy0I9BN8se7/rNmfukXe6KZI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com; spf=pass smtp.mailfrom=bootlin.com; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b=UXPdTwoM; arc=none smtp.client-ip=185.246.84.56 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=bootlin.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bootlin.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bootlin.com header.i=@bootlin.com header.b="UXPdTwoM" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-02.galae.net (Postfix) with ESMTPS id 14A6C1A1443; Wed, 5 Aug 2026 17:43:11 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id DDFDF602AB; Wed, 5 Aug 2026 17:43:10 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id D589411C35080; Wed, 5 Aug 2026 19:43:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1785951785; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=oyLt7GIGw6qoSZHfVYJjCYzpAvJu1tNbE1mbzF/87M4=; b=UXPdTwoMIc/ASj72HHxWidfqXA5Q0Wx9uSHE6najKlOuiSvUemNBrQXnjL9VOnEkXyKeG/ bbUaPf/EW76wDX02p345CZNg2CwP6FDfnpY1CtbXSi5PMBh5/z/dxP33kRuHsFKSrgHghv gefohwVW0koByyM0G5+y/Mpk8IsfdD2QTqcWu/NJ7ck+js36OaAcTHlbHyG7wkbieBgsDl Fuktu0ligehY9RizQFjocf7CMVt4C1hqubMhKJub5stkcyqj4wCulMKW0/dIY8yJ3ByCV1 1CJ2OysQfIgguShFdJrYOwHerWKRQrZYP08P3koAVBKxaX/dDl03lTvglStC8Q== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Wed, 05 Aug 2026 19:42:33 +0200 Subject: [PATCH net-next v8 04/17] net: macb: unify queue index variable naming convention and types Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260805-macb-context-v8-4-bc302ffd1174@bootlin.com> References: <20260805-macb-context-v8-0-bc302ffd1174@bootlin.com> In-Reply-To: <20260805-macb-context-v8-0-bc302ffd1174@bootlin.com> To: =?utf-8?q?Th=C3=A9o_Lebrun?= , Conor Dooley , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Russell King Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolas Ferre , Claudiu Beznea , Paolo Valerio , Nicolai Buchwitz , Vladimir Kondratiev , Gregory CLEMENT , =?utf-8?q?Beno=C3=AEt_Monin?= , Tawfik Bayouk , Thomas Petazzoni , Maxime Chevallier X-Mailer: b4 0.15.2 X-Last-TLS-Session-Version: TLSv1.3 Variables are named q or queue_index. Types are int, unsigned int, u32 and u16. Use `unsigned int q` everywhere. Skip over taprio functions. They use `u8 queue_id` which fits with the `struct macb_queue_enst_config` field. Using `queue_id` everywhere would be too verbose. Reviewed-by: Nicolai Buchwitz Signed-off-by: Théo Lebrun --- drivers/net/ethernet/cadence/macb_main.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index e01a5e0bf481..77053cb9d8f7 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -877,7 +877,7 @@ static void gem_shuffle_tx_one_ring(struct macb_queue *queue) static void gem_shuffle_tx_rings(struct macb *bp) { struct macb_queue *queue; - int q; + unsigned int q; for (q = 0, queue = bp->queues; q < bp->num_queues; q++, queue++) gem_shuffle_tx_one_ring(queue); @@ -1258,7 +1258,7 @@ static void macb_tx_error_task(struct work_struct *work) tx_error_task); bool halt_timeout = false; struct macb *bp = queue->bp; - u32 queue_index; + unsigned int q; u32 packets = 0; u32 bytes = 0; struct macb_tx_skb *tx_skb; @@ -1267,9 +1267,9 @@ static void macb_tx_error_task(struct work_struct *work) unsigned int tail; unsigned long flags; - queue_index = queue - bp->queues; + q = queue - bp->queues; netdev_vdbg(bp->netdev, "%s: q = %u, t = %u, h = %u\n", - __func__, queue_index, queue->tx_tail, queue->tx_head); + __func__, q, queue->tx_tail, queue->tx_head); /* Prevent the queue NAPI TX poll from running, as it calls * macb_tx_complete(), which in turn may call netif_wake_subqueue(). @@ -1342,7 +1342,7 @@ static void macb_tx_error_task(struct work_struct *work) macb_tx_unmap(bp, tx_skb, 0); } - netdev_tx_completed_queue(netdev_get_tx_queue(bp->netdev, queue_index), + netdev_tx_completed_queue(netdev_get_tx_queue(bp->netdev, q), packets, bytes); /* Set end of TX queue */ @@ -1407,7 +1407,7 @@ static bool ptp_one_step_sync(struct sk_buff *skb) static int macb_tx_complete(struct macb_queue *queue, int budget) { struct macb *bp = queue->bp; - u16 queue_index = queue - bp->queues; + unsigned int q = queue - bp->queues; unsigned long flags; unsigned int tail; unsigned int head; @@ -1469,14 +1469,14 @@ static int macb_tx_complete(struct macb_queue *queue, int budget) } } - netdev_tx_completed_queue(netdev_get_tx_queue(bp->netdev, queue_index), + netdev_tx_completed_queue(netdev_get_tx_queue(bp->netdev, q), packets, bytes); queue->tx_tail = tail; - if (__netif_subqueue_stopped(bp->netdev, queue_index) && + if (__netif_subqueue_stopped(bp->netdev, q) && CIRC_CNT(queue->tx_head, queue->tx_tail, bp->tx_ring_size) <= MACB_TX_WAKEUP_THRESH(bp)) - netif_wake_subqueue(bp->netdev, queue_index); + netif_wake_subqueue(bp->netdev, q); spin_unlock_irqrestore(&queue->tx_ptr_lock, flags); if (packets) @@ -2472,10 +2472,10 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *netdev) static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *netdev) { - u16 queue_index = skb_get_queue_mapping(skb); struct macb *bp = netdev_priv(netdev); - struct macb_queue *queue = &bp->queues[queue_index]; + unsigned int q = skb_get_queue_mapping(skb); unsigned int desc_cnt, nr_frags, frag_size, f; + struct macb_queue *queue = &bp->queues[q]; unsigned int hdrlen; unsigned long flags; bool is_lso; @@ -2514,8 +2514,8 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, #if defined(DEBUG) && defined(VERBOSE_DEBUG) netdev_vdbg(bp->netdev, - "start_xmit: queue %hu len %u head %p data %p tail %p end %p\n", - queue_index, skb->len, skb->head, skb->data, + "start_xmit: queue %u len %u head %p data %p tail %p end %p\n", + q, skb->len, skb->head, skb->data, skb_tail_pointer(skb), skb_end_pointer(skb)); print_hex_dump(KERN_DEBUG, "data: ", DUMP_PREFIX_OFFSET, 16, 1, skb->data, 16, true); @@ -2541,7 +2541,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, /* This is a hard error, log it. */ if (CIRC_SPACE(queue->tx_head, queue->tx_tail, bp->tx_ring_size) < desc_cnt) { - netif_stop_subqueue(netdev, queue_index); + netif_stop_subqueue(netdev, q); netdev_dbg(netdev, "tx_head = %u, tx_tail = %u\n", queue->tx_head, queue->tx_tail); ret = NETDEV_TX_BUSY; @@ -2557,7 +2557,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, /* Make newly initialized descriptor visible to hardware */ wmb(); skb_tx_timestamp(skb); - netdev_tx_sent_queue(netdev_get_tx_queue(bp->netdev, queue_index), + netdev_tx_sent_queue(netdev_get_tx_queue(bp->netdev, q), skb->len); spin_lock(&bp->lock); @@ -2566,7 +2566,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, spin_unlock(&bp->lock); if (CIRC_SPACE(queue->tx_head, queue->tx_tail, bp->tx_ring_size) < 1) - netif_stop_subqueue(netdev, queue_index); + netif_stop_subqueue(netdev, q); unlock: spin_unlock_irqrestore(&queue->tx_ptr_lock, flags); -- 2.55.0