From nobody Wed Apr 1 22:19:11 2026 Received: from smtpout-04.galae.net (smtpout-04.galae.net [185.171.202.116]) (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 D9F4047884B for ; Wed, 1 Apr 2026 16:39:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.171.202.116 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775061575; cv=none; b=GN+rbXdFQIuKzTQhLHBrc87n2bpN7ptejeRpB4PnYge0B/065SJjEJsx3trlxh0EQ2rlUfKx+DST1vI3Qxh0jDy/hudq1TGo0oEN2FPkyqvG5lPVPiDddjsJGMfaJ4mXONPr0BOABV3DSSMEyrrTp0Beya/DOWboOx7AUb1c9gg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775061575; c=relaxed/simple; bh=pF9tYAo2l6p40s4lFtZyIZqM5LpFxuYjAlaBDPfCO04=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oaFeA+Fmx/eN69t4Sghu3Ny49Un7Wputc2STMpkyr2FQr4VZ2vQseEPlptiK97RPSEN1qibyvauCD4X4ZKcKykFOwQCzVBzq84H682S3dBnD7PJEX1/EZqkSuv9zaugfDjxtymNtAKOG8WWB2yMczw7SPYBvyYg03wsWiUrQtFI= 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=ldnav+Fm; arc=none smtp.client-ip=185.171.202.116 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="ldnav+Fm" Received: from smtpout-01.galae.net (smtpout-01.galae.net [212.83.139.233]) by smtpout-04.galae.net (Postfix) with ESMTPS id 861EBC5996C; Wed, 1 Apr 2026 16:39:59 +0000 (UTC) Received: from mail.galae.net (mail.galae.net [212.83.136.155]) by smtpout-01.galae.net (Postfix) with ESMTPS id 74695602BF; Wed, 1 Apr 2026 16:39:28 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 1EF6310450692; Wed, 1 Apr 2026 18:39:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=dkim; t=1775061567; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=9KB/4FBZIPpSbfW83xjGhOniWDhFfnwYa/lc/PM1RTQ=; b=ldnav+FmJvJaA6hX4t8zQvGklVkClRDpIpzMkNqlCjTEKGz+P4WPnCBpSyZULdYidAwdmU 6pLOeJu0cPp2qlAfbH7Ef+NgP1VhLn8O+Hu2Cd0k08OncpxkF+2MgUWrjEREOyrACgXDb1 oaRMqdtooSjo3siVa2vq8vJ0AMux1V/HlmajE8kdmIaMtoyVuSf31Jqf6Q/xXxs6TOUrhJ EreLkiX6X48yFCBh3jhGyWgC2jk/4xhaFx24VL1ADB/xW2B9Y0t/kT+ypUZr1FMowv9lMd DmxWbc8FA6HO389+RDkxXFdTHaA7dDVbwtXZFalND37Nd12s4XkQX0PGJR0p+A== From: =?utf-8?q?Th=C3=A9o_Lebrun?= Date: Wed, 01 Apr 2026 18:39:05 +0200 Subject: [PATCH net-next 02/11] net: macb: unify `struct macb *` naming convention 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: quoted-printable Message-Id: <20260401-macb-context-v1-2-9590c5ab7272@bootlin.com> References: <20260401-macb-context-v1-0-9590c5ab7272@bootlin.com> In-Reply-To: <20260401-macb-context-v1-0-9590c5ab7272@bootlin.com> To: Nicolas Ferre , Claudiu Beznea , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , Russell King Cc: Paolo Valerio , Conor Dooley , Nicolai Buchwitz , Vladimir Kondratiev , Gregory CLEMENT , =?utf-8?q?Beno=C3=AEt_Monin?= , Tawfik Bayouk , Thomas Petazzoni , Maxime Chevallier , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Th=C3=A9o_Lebrun?= X-Mailer: b4 0.15.0 X-Last-TLS-Session-Version: TLSv1.3 For historical reason, MACB has both: struct macb *bp; struct macb *lp; // used in at91ether functions Use only the former. Signed-off-by: Th=C3=A9o Lebrun --- drivers/net/ethernet/cadence/macb_main.c | 176 ++++++++++++++++-----------= ---- 1 file changed, 91 insertions(+), 85 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/etherne= t/cadence/macb_main.c index 00bd662b5e46..05ccb6f186f7 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -4958,71 +4958,72 @@ static int macb_init(struct platform_device *pdev, =20 static struct sifive_fu540_macb_mgmt *mgmt; =20 -static int at91ether_alloc_coherent(struct macb *lp) +static int at91ether_alloc_coherent(struct macb *bp) { - struct macb_queue *q =3D &lp->queues[0]; + struct macb_queue *queue =3D &bp->queues[0]; =20 - q->rx_ring =3D dma_alloc_coherent(&lp->pdev->dev, - (AT91ETHER_MAX_RX_DESCR * - macb_dma_desc_get_size(lp)), - &q->rx_ring_dma, GFP_KERNEL); - if (!q->rx_ring) + queue->rx_ring =3D dma_alloc_coherent(&bp->pdev->dev, + (AT91ETHER_MAX_RX_DESCR * + macb_dma_desc_get_size(bp)), + &queue->rx_ring_dma, GFP_KERNEL); + if (!queue->rx_ring) return -ENOMEM; =20 - q->rx_buffers =3D dma_alloc_coherent(&lp->pdev->dev, - AT91ETHER_MAX_RX_DESCR * - AT91ETHER_MAX_RBUFF_SZ, - &q->rx_buffers_dma, GFP_KERNEL); - if (!q->rx_buffers) { - dma_free_coherent(&lp->pdev->dev, + queue->rx_buffers =3D dma_alloc_coherent(&bp->pdev->dev, + AT91ETHER_MAX_RX_DESCR * + AT91ETHER_MAX_RBUFF_SZ, + &queue->rx_buffers_dma, + GFP_KERNEL); + if (!queue->rx_buffers) { + dma_free_coherent(&bp->pdev->dev, AT91ETHER_MAX_RX_DESCR * - macb_dma_desc_get_size(lp), - q->rx_ring, q->rx_ring_dma); - q->rx_ring =3D NULL; + macb_dma_desc_get_size(bp), + queue->rx_ring, queue->rx_ring_dma); + queue->rx_ring =3D NULL; return -ENOMEM; } =20 return 0; } =20 -static void at91ether_free_coherent(struct macb *lp) +static void at91ether_free_coherent(struct macb *bp) { - struct macb_queue *q =3D &lp->queues[0]; + struct macb_queue *queue =3D &bp->queues[0]; =20 - if (q->rx_ring) { - dma_free_coherent(&lp->pdev->dev, + if (queue->rx_ring) { + dma_free_coherent(&bp->pdev->dev, AT91ETHER_MAX_RX_DESCR * - macb_dma_desc_get_size(lp), - q->rx_ring, q->rx_ring_dma); - q->rx_ring =3D NULL; + macb_dma_desc_get_size(bp), + queue->rx_ring, queue->rx_ring_dma); + queue->rx_ring =3D NULL; } =20 - if (q->rx_buffers) { - dma_free_coherent(&lp->pdev->dev, + if (queue->rx_buffers) { + dma_free_coherent(&bp->pdev->dev, AT91ETHER_MAX_RX_DESCR * AT91ETHER_MAX_RBUFF_SZ, - q->rx_buffers, q->rx_buffers_dma); - q->rx_buffers =3D NULL; + queue->rx_buffers, queue->rx_buffers_dma); + queue->rx_buffers =3D NULL; } } =20 /* Initialize and start the Receiver and Transmit subsystems */ -static int at91ether_start(struct macb *lp) +static int at91ether_start(struct macb *bp) { - struct macb_queue *q =3D &lp->queues[0]; + struct macb_queue *queue =3D &bp->queues[0]; struct macb_dma_desc *desc; dma_addr_t addr; u32 ctl; int i, ret; =20 - ret =3D at91ether_alloc_coherent(lp); + ret =3D at91ether_alloc_coherent(bp); if (ret) return ret; =20 - addr =3D q->rx_buffers_dma; + addr =3D queue->rx_buffers_dma; for (i =3D 0; i < AT91ETHER_MAX_RX_DESCR; i++) { - desc =3D macb_rx_desc(q, i); - macb_set_addr(lp, desc, addr); + desc =3D macb_rx_desc(queue, i); + macb_set_addr(bp, desc, addr); desc->ctrl =3D 0; addr +=3D AT91ETHER_MAX_RBUFF_SZ; } @@ -5031,17 +5032,17 @@ static int at91ether_start(struct macb *lp) desc->addr |=3D MACB_BIT(RX_WRAP); =20 /* Reset buffer index */ - q->rx_tail =3D 0; + queue->rx_tail =3D 0; =20 /* Program address of descriptor list in Rx Buffer Queue register */ - macb_writel(lp, RBQP, q->rx_ring_dma); + macb_writel(bp, RBQP, queue->rx_ring_dma); =20 /* Enable Receive and Transmit */ - ctl =3D macb_readl(lp, NCR); - macb_writel(lp, NCR, ctl | MACB_BIT(RE) | MACB_BIT(TE)); + ctl =3D macb_readl(bp, NCR); + macb_writel(bp, NCR, ctl | MACB_BIT(RE) | MACB_BIT(TE)); =20 /* Enable MAC interrupts */ - macb_writel(lp, IER, MACB_BIT(RCOMP) | + macb_writel(bp, IER, MACB_BIT(RCOMP) | MACB_BIT(RXUBR) | MACB_BIT(ISR_TUND) | MACB_BIT(ISR_RLE) | @@ -5052,12 +5053,12 @@ static int at91ether_start(struct macb *lp) return 0; } =20 -static void at91ether_stop(struct macb *lp) +static void at91ether_stop(struct macb *bp) { u32 ctl; =20 /* Disable MAC interrupts */ - macb_writel(lp, IDR, MACB_BIT(RCOMP) | + macb_writel(bp, IDR, MACB_BIT(RCOMP) | MACB_BIT(RXUBR) | MACB_BIT(ISR_TUND) | MACB_BIT(ISR_RLE) | @@ -5066,35 +5067,35 @@ static void at91ether_stop(struct macb *lp) MACB_BIT(HRESP)); =20 /* Disable Receiver and Transmitter */ - ctl =3D macb_readl(lp, NCR); - macb_writel(lp, NCR, ctl & ~(MACB_BIT(TE) | MACB_BIT(RE))); + ctl =3D macb_readl(bp, NCR); + macb_writel(bp, NCR, ctl & ~(MACB_BIT(TE) | MACB_BIT(RE))); =20 /* Free resources. */ - at91ether_free_coherent(lp); + at91ether_free_coherent(bp); } =20 /* Open the ethernet interface */ static int at91ether_open(struct net_device *netdev) { - struct macb *lp =3D netdev_priv(netdev); + struct macb *bp =3D netdev_priv(netdev); u32 ctl; int ret; =20 - ret =3D pm_runtime_resume_and_get(&lp->pdev->dev); + ret =3D pm_runtime_resume_and_get(&bp->pdev->dev); if (ret < 0) return ret; =20 /* Clear internal statistics */ - ctl =3D macb_readl(lp, NCR); - macb_writel(lp, NCR, ctl | MACB_BIT(CLRSTAT)); + ctl =3D macb_readl(bp, NCR); + macb_writel(bp, NCR, ctl | MACB_BIT(CLRSTAT)); =20 - macb_set_hwaddr(lp); + macb_set_hwaddr(bp); =20 - ret =3D at91ether_start(lp); + ret =3D at91ether_start(bp); if (ret) goto pm_exit; =20 - ret =3D macb_phylink_connect(lp); + ret =3D macb_phylink_connect(bp); if (ret) goto stop; =20 @@ -5103,25 +5104,25 @@ static int at91ether_open(struct net_device *netdev) return 0; =20 stop: - at91ether_stop(lp); + at91ether_stop(bp); pm_exit: - pm_runtime_put_sync(&lp->pdev->dev); + pm_runtime_put_sync(&bp->pdev->dev); return ret; } =20 /* Close the interface */ static int at91ether_close(struct net_device *netdev) { - struct macb *lp =3D netdev_priv(netdev); + struct macb *bp =3D netdev_priv(netdev); =20 netif_stop_queue(netdev); =20 - phylink_stop(lp->phylink); - phylink_disconnect_phy(lp->phylink); + phylink_stop(bp->phylink); + phylink_disconnect_phy(bp->phylink); =20 - at91ether_stop(lp); + at91ether_stop(bp); =20 - pm_runtime_put(&lp->pdev->dev); + pm_runtime_put(&bp->pdev->dev); =20 return 0; } @@ -5130,19 +5131,21 @@ static int at91ether_close(struct net_device *netde= v) static netdev_tx_t at91ether_start_xmit(struct sk_buff *skb, struct net_device *netdev) { - struct macb *lp =3D netdev_priv(netdev); + struct macb *bp =3D netdev_priv(netdev); + struct device *dev =3D &bp->pdev->dev; =20 - if (macb_readl(lp, TSR) & MACB_BIT(RM9200_BNQ)) { + if (macb_readl(bp, TSR) & MACB_BIT(RM9200_BNQ)) { int desc =3D 0; =20 netif_stop_queue(netdev); =20 /* Store packet information (to free when Tx completed) */ - lp->rm9200_txq[desc].skb =3D skb; - lp->rm9200_txq[desc].size =3D skb->len; - lp->rm9200_txq[desc].mapping =3D dma_map_single(&lp->pdev->dev, skb->dat= a, - skb->len, DMA_TO_DEVICE); - if (dma_mapping_error(&lp->pdev->dev, lp->rm9200_txq[desc].mapping)) { + bp->rm9200_txq[desc].skb =3D skb; + bp->rm9200_txq[desc].size =3D skb->len; + bp->rm9200_txq[desc].mapping =3D dma_map_single(dev, skb->data, + skb->len, + DMA_TO_DEVICE); + if (dma_mapping_error(dev, bp->rm9200_txq[desc].mapping)) { dev_kfree_skb_any(skb); netdev->stats.tx_dropped++; netdev_err(netdev, "%s: DMA mapping error\n", __func__); @@ -5150,9 +5153,9 @@ static netdev_tx_t at91ether_start_xmit(struct sk_buf= f *skb, } =20 /* Set address of the data in the Transmit Address register */ - macb_writel(lp, TAR, lp->rm9200_txq[desc].mapping); + macb_writel(bp, TAR, bp->rm9200_txq[desc].mapping); /* Set length of the packet in the Transmit Control register */ - macb_writel(lp, TCR, skb->len); + macb_writel(bp, TCR, skb->len); =20 } else { netdev_err(netdev, "%s called, but device is busy!\n", @@ -5168,16 +5171,17 @@ static netdev_tx_t at91ether_start_xmit(struct sk_b= uff *skb, */ static void at91ether_rx(struct net_device *netdev) { - struct macb *lp =3D netdev_priv(netdev); - struct macb_queue *q =3D &lp->queues[0]; + struct macb *bp =3D netdev_priv(netdev); + struct macb_queue *queue =3D &bp->queues[0]; struct macb_dma_desc *desc; unsigned char *p_recv; struct sk_buff *skb; unsigned int pktlen; =20 - desc =3D macb_rx_desc(q, q->rx_tail); + desc =3D macb_rx_desc(queue, queue->rx_tail); while (desc->addr & MACB_BIT(RX_USED)) { - p_recv =3D q->rx_buffers + q->rx_tail * AT91ETHER_MAX_RBUFF_SZ; + p_recv =3D queue->rx_buffers + + queue->rx_tail * AT91ETHER_MAX_RBUFF_SZ; pktlen =3D MACB_BF(RX_FRMLEN, desc->ctrl); skb =3D netdev_alloc_skb(netdev, pktlen + 2); if (skb) { @@ -5199,12 +5203,12 @@ static void at91ether_rx(struct net_device *netdev) desc->addr &=3D ~MACB_BIT(RX_USED); =20 /* wrap after last buffer */ - if (q->rx_tail =3D=3D AT91ETHER_MAX_RX_DESCR - 1) - q->rx_tail =3D 0; + if (queue->rx_tail =3D=3D AT91ETHER_MAX_RX_DESCR - 1) + queue->rx_tail =3D 0; else - q->rx_tail++; + queue->rx_tail++; =20 - desc =3D macb_rx_desc(q, q->rx_tail); + desc =3D macb_rx_desc(queue, queue->rx_tail); } } =20 @@ -5212,14 +5216,14 @@ static void at91ether_rx(struct net_device *netdev) static irqreturn_t at91ether_interrupt(int irq, void *dev_id) { struct net_device *netdev =3D dev_id; - struct macb *lp =3D netdev_priv(netdev); + struct macb *bp =3D netdev_priv(netdev); u32 intstatus, ctl; unsigned int desc; =20 /* MAC Interrupt Status register indicates what interrupts are pending. * It is automatically cleared once read. */ - intstatus =3D macb_readl(lp, ISR); + intstatus =3D macb_readl(bp, ISR); =20 /* Receive complete */ if (intstatus & MACB_BIT(RCOMP)) @@ -5232,23 +5236,25 @@ static irqreturn_t at91ether_interrupt(int irq, voi= d *dev_id) netdev->stats.tx_errors++; =20 desc =3D 0; - if (lp->rm9200_txq[desc].skb) { - dev_consume_skb_irq(lp->rm9200_txq[desc].skb); - lp->rm9200_txq[desc].skb =3D NULL; - dma_unmap_single(&lp->pdev->dev, lp->rm9200_txq[desc].mapping, - lp->rm9200_txq[desc].size, DMA_TO_DEVICE); + if (bp->rm9200_txq[desc].skb) { + dev_consume_skb_irq(bp->rm9200_txq[desc].skb); + bp->rm9200_txq[desc].skb =3D NULL; + dma_unmap_single(&bp->pdev->dev, + bp->rm9200_txq[desc].mapping, + bp->rm9200_txq[desc].size, + DMA_TO_DEVICE); netdev->stats.tx_packets++; - netdev->stats.tx_bytes +=3D lp->rm9200_txq[desc].size; + netdev->stats.tx_bytes +=3D bp->rm9200_txq[desc].size; } netif_wake_queue(netdev); } =20 /* Work-around for EMAC Errata section 41.3.1 */ if (intstatus & MACB_BIT(RXUBR)) { - ctl =3D macb_readl(lp, NCR); - macb_writel(lp, NCR, ctl & ~MACB_BIT(RE)); + ctl =3D macb_readl(bp, NCR); + macb_writel(bp, NCR, ctl & ~MACB_BIT(RE)); wmb(); - macb_writel(lp, NCR, ctl | MACB_BIT(RE)); + macb_writel(bp, NCR, ctl | MACB_BIT(RE)); } =20 if (intstatus & MACB_BIT(ISR_ROVR)) --=20 2.53.0