From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 05C563644D1 for ; Mon, 2 Mar 2026 11:52:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772452370; cv=none; b=kTBNgq3/YwX4xTHuhiUZOELP784ygLZKeptPPVuVtj7Nca8g06gsrrQaUroQtNkRkU0YzmLsjsRMsN0kLgMF6ZIzQLOtH5w1wMI6daqkzsu/tyODLrjYsfc/4JqxuUQfJ9T04/MxZftnrozeWY4zr31SvSUmZUd8Os+VMILqW/0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772452370; c=relaxed/simple; bh=MexsYGwJTdQfwKbgkvFFRFxGJJ2WoN4pA/EA+trrPVU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kPS1XZvrxMAdyQXnx7cf0K1uIgcwwje/3OHr42rAHOr6lGKAid6qyfqPCvWtQuJfjk36IZWkMHY3hI2RJQthy8ye3KfTi1HgfxfftuF8c79pFGxQOVwthuxNQRtmodad46GU6U1rwlDdt6ptkmNMgRZxGDpfIm7/4wTDBF+wcz8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=gtVIN5+6; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=PNGM1VpG; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gtVIN5+6"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="PNGM1VpG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1772452368; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IhBB9fYagp2pgk9DpEzHl6j0vtrjF4VCIG+bXSiUWIo=; b=gtVIN5+6QREZVJNZ9stxuHPyhqx4eT0letWGVymFqA1uYYXpQGTlYPOhZyBrqVMzgsEnQB dHeueTnt2NYPqF3gTn7PBrlCoPySVhuX2tUW8r2S7MHoqdkVxMk+qShJg45hDblT+blNr+ f7TLqJFsrQ77GajtSV/8vmu5K5AYXzo= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-627-b6ykh7EFNyCLGiiMLTU9AQ-1; Mon, 02 Mar 2026 06:52:47 -0500 X-MC-Unique: b6ykh7EFNyCLGiiMLTU9AQ-1 X-Mimecast-MFC-AGG-ID: b6ykh7EFNyCLGiiMLTU9AQ_1772452366 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-439b699b9a6so836429f8f.3 for ; Mon, 02 Mar 2026 03:52:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1772452365; x=1773057165; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IhBB9fYagp2pgk9DpEzHl6j0vtrjF4VCIG+bXSiUWIo=; b=PNGM1VpGiZYOBQU4lA7m6gNZss1/LTS98cogmW+WdDioGVwPqDLm9Fn464PC4HnY6D IaR7DPSKnXr6IIZZz+VTgtZQP+8RQf63PLLUYah43PMpvoCjtNgX+ZfIqSEEzlieuDE6 toZoCVPISCCRjYmNUrqxQAkqS34Uf+AG189P5QsHUCRHooEP37mSRQaTEGtcaz7tE8gK fLz8nsUTd3vpVFHzBu58HoaAfmy0hbLBs6j7Qf9P42LarQL7Fm2AuWsmjvUGEHkFtfOJ wkJA3wWtK4tP1DMUZQPogViF1A0Dj8kC+q+TmQ+p5S54DMwKkNeg/irp0xWSIt5khH+3 y7lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772452365; x=1773057165; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=IhBB9fYagp2pgk9DpEzHl6j0vtrjF4VCIG+bXSiUWIo=; b=F66I7tA0GXhytVXQZ4/hUKBi8P+wrv3qylehXpnfgjLcUiHbUmDZyedzpE2ErgAYh/ RCRbyDq/iDVktk3nQjwi1b9xPmpeU28Uh30pLRlgwUTRN2QLljaGoGpsaBYj97so9QO0 PKlaAU30whpc3e2hD0TAhHswznHdykXqexEhhhkbw1BdiG4X2jL2ZpprvdLhf1FQwxtD co1BcDEF2sm3Kh+q8ctHnHnldh6ADNhx+eRCByUl1LLm1AvLncPfcRxCGYJRp1arIi7+ QVQQKgk11d6nRAMnCorP8Kvbt/+/Qq3RD/cHYQCaBd07yleJl6H6VkFYJIXfRAzARTcO W41w== X-Gm-Message-State: AOJu0YxFmaqrAjP4lXgme20qxDLBTvHq+qANGmERyEF4ndzhmWV9EWl5 vJm8169ol29dEmwKkEjdYwH1FPS6MSCQCLXKsYRSYk/nh+kb59gXBwqbpGA6cGAslqqvVhBtpk1 IGymH0dJZbvp74URXZ18E+8pUN/lpznkODczd29tg9IlmB07tcDyeCw8Hpvxxr0Fsc8ZqYkQoDY jJJGZ7P9ngMoAafRfLmz8J+KHD+Aim0p41jIbhbp6RSw== X-Gm-Gg: ATEYQzz8Di7jP9EFbydhAHjIrPsPEv6T9z4hVFGAqz3ulBTvDFnLAa6Vab/UOvb8lW0 Wn4edpmO806E0XdSHHawtmNeprndHhuwdCaOb24VJeZc3aeogv/zn/3odn3eVJ2ZXyqFbVa6McP XX052V7Ncfz9zHmCt5VJVEt8fq7FDiZ+yGB5ZIT+VXnmjT61pSWFE9emhu00ys0DtCUzJcTHP40 Ym8Wqp7gBgPC9qHwrMf90HtbfvTIIJmHB7WGoqOaCMN+Sz6geG4vNydKXOKmS4U5ol+8ddpzFHZ Z5iNbfVHxkbmuqzLXdS6WlBf8j5CvZ0OdhPCbWQDm6MJizv+drIXGSKB8oex13dcM+TEqm7t52y xgrCYm8t94SawbWiEqj4D0g1xZbhBlOzdjv25uV45rslWil9Qy6Gxoq3xDN8= X-Received: by 2002:a05:6000:2dc9:b0:439:8c31:45e with SMTP id ffacd0b85a97d-4399de2c5f1mr20112157f8f.45.1772452365038; Mon, 02 Mar 2026 03:52:45 -0800 (PST) X-Received: by 2002:a05:6000:2dc9:b0:439:8c31:45e with SMTP id ffacd0b85a97d-4399de2c5f1mr20112098f8f.45.1772452364483; Mon, 02 Mar 2026 03:52:44 -0800 (PST) Received: from localhost (net-93-146-155-42.cust.vodafonedsl.it. [93.146.155.42]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4399c75b272sm26472933f8f.24.2026.03.02.03.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2026 03:52:44 -0800 (PST) From: Paolo Valerio To: netdev@vger.kernel.org Cc: Nicolas Ferre , Claudiu Beznea , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Lorenzo Bianconi , =?UTF-8?q?Th=C3=A9o=20Lebrun?= Subject: [PATCH net-next v3 5/8] net: macb: make macb_tx_skb generic Date: Mon, 2 Mar 2026 12:52:29 +0100 Message-ID: <20260302115232.1430640-6-pvalerio@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260302115232.1430640-1-pvalerio@redhat.com> References: <20260302115232.1430640-1-pvalerio@redhat.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The macb_tx_skb structure is renamed to macb_tx_buff with no functional changes. This is a preparatory step for adding xdp xmit support. Signed-off-by: Paolo Valerio --- drivers/net/ethernet/cadence/macb.h | 8 +- drivers/net/ethernet/cadence/macb_main.c | 96 ++++++++++++------------ 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index a78ad00f53b1..7228902ae20c 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -958,7 +958,7 @@ struct macb_dma_desc_ptp { /* Scaled PPM fraction */ #define PPM_FRACTION 16 -/* struct macb_tx_skb - data about an skb which is being transmitted +/* struct macb_tx_buff - data about an skb which is being transmitted * @skb: skb currently being transmitted, only set for the last buffer * of the frame * @mapping: DMA address of the skb's fragment buffer @@ -966,7 +966,7 @@ struct macb_dma_desc_ptp { * @mapped_as_page: true when buffer was mapped with skb_frag_dma_map(), * false when buffer was mapped with dma_map_single() */ -struct macb_tx_skb { +struct macb_tx_buff { struct sk_buff *skb; dma_addr_t mapping; size_t size; @@ -1252,7 +1252,7 @@ struct macb_queue { spinlock_t tx_ptr_lock; unsigned int tx_head, tx_tail; struct macb_dma_desc *tx_ring; - struct macb_tx_skb *tx_skb; + struct macb_tx_buff *tx_buff; dma_addr_t tx_ring_dma; struct work_struct tx_error_task; bool txubr_pending; @@ -1330,7 +1330,7 @@ struct macb { phy_interface_t phy_interface; /* AT91RM9200 transmit queue (1 on wire + 1 queued) */ - struct macb_tx_skb rm9200_txq[2]; + struct macb_tx_buff rm9200_txq[2]; unsigned int max_tx_length; u64 ethtool_stats[GEM_STATS_LEN + QUEUE_STATS_LEN * MACB_MAX_QUEUES]; diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index b8b2b0111b49..2fedbea841ff 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -156,10 +156,10 @@ static struct macb_dma_desc *macb_tx_desc(struct macb_queue *queue, return &queue->tx_ring[index]; } -static struct macb_tx_skb *macb_tx_skb(struct macb_queue *queue, - unsigned int index) +static struct macb_tx_buff *macb_tx_buff(struct macb_queue *queue, + unsigned int index) { - return &queue->tx_skb[macb_tx_ring_wrap(queue->bp, index)]; + return &queue->tx_buff[macb_tx_ring_wrap(queue->bp, index)]; } static dma_addr_t macb_tx_dma(struct macb_queue *queue, unsigned int index) @@ -982,21 +982,21 @@ static int macb_halt_tx(struct macb *bp) bp, TSR); } -static void macb_tx_unmap(struct macb *bp, struct macb_tx_skb *tx_skb, int budget) +static void macb_tx_unmap(struct macb *bp, struct macb_tx_buff *tx_buff, int budget) { - if (tx_skb->mapping) { - if (tx_skb->mapped_as_page) - dma_unmap_page(&bp->pdev->dev, tx_skb->mapping, - tx_skb->size, DMA_TO_DEVICE); + if (tx_buff->mapping) { + if (tx_buff->mapped_as_page) + dma_unmap_page(&bp->pdev->dev, tx_buff->mapping, + tx_buff->size, DMA_TO_DEVICE); else - dma_unmap_single(&bp->pdev->dev, tx_skb->mapping, - tx_skb->size, DMA_TO_DEVICE); - tx_skb->mapping = 0; + dma_unmap_single(&bp->pdev->dev, tx_buff->mapping, + tx_buff->size, DMA_TO_DEVICE); + tx_buff->mapping = 0; } - if (tx_skb->skb) { - napi_consume_skb(tx_skb->skb, budget); - tx_skb->skb = NULL; + if (tx_buff->skb) { + napi_consume_skb(tx_buff->skb, budget); + tx_buff->skb = NULL; } } @@ -1042,7 +1042,7 @@ static void macb_tx_error_task(struct work_struct *work) u32 queue_index; u32 packets = 0; u32 bytes = 0; - struct macb_tx_skb *tx_skb; + struct macb_tx_buff *tx_buff; struct macb_dma_desc *desc; struct sk_buff *skb; unsigned int tail; @@ -1082,16 +1082,16 @@ static void macb_tx_error_task(struct work_struct *work) desc = macb_tx_desc(queue, tail); ctrl = desc->ctrl; - tx_skb = macb_tx_skb(queue, tail); - skb = tx_skb->skb; + tx_buff = macb_tx_buff(queue, tail); + skb = tx_buff->skb; if (ctrl & MACB_BIT(TX_USED)) { /* skb is set for the last buffer of the frame */ while (!skb) { - macb_tx_unmap(bp, tx_skb, 0); + macb_tx_unmap(bp, tx_buff, 0); tail++; - tx_skb = macb_tx_skb(queue, tail); - skb = tx_skb->skb; + tx_buff = macb_tx_buff(queue, tail); + skb = tx_buff->skb; } /* ctrl still refers to the first buffer descriptor @@ -1120,7 +1120,7 @@ static void macb_tx_error_task(struct work_struct *work) desc->ctrl = ctrl | MACB_BIT(TX_USED); } - macb_tx_unmap(bp, tx_skb, 0); + macb_tx_unmap(bp, tx_buff, 0); } netdev_tx_completed_queue(netdev_get_tx_queue(bp->dev, queue_index), @@ -1198,7 +1198,7 @@ static int macb_tx_complete(struct macb_queue *queue, int budget) spin_lock_irqsave(&queue->tx_ptr_lock, flags); head = queue->tx_head; for (tail = queue->tx_tail; tail != head && packets < budget; tail++) { - struct macb_tx_skb *tx_skb; + struct macb_tx_buff *tx_buff; struct sk_buff *skb; struct macb_dma_desc *desc; u32 ctrl; @@ -1218,8 +1218,8 @@ static int macb_tx_complete(struct macb_queue *queue, int budget) /* Process all buffers of the current transmitted frame */ for (;; tail++) { - tx_skb = macb_tx_skb(queue, tail); - skb = tx_skb->skb; + tx_buff = macb_tx_buff(queue, tail); + skb = tx_buff->skb; /* First, update TX stats if needed */ if (skb) { @@ -1239,7 +1239,7 @@ static int macb_tx_complete(struct macb_queue *queue, int budget) } /* Now we can safely release resources */ - macb_tx_unmap(bp, tx_skb, budget); + macb_tx_unmap(bp, tx_buff, budget); /* skb is set only for the last buffer of the frame. * WARNING: at this point skb has been freed by @@ -2107,8 +2107,8 @@ static unsigned int macb_tx_map(struct macb *bp, unsigned int f, nr_frags = skb_shinfo(skb)->nr_frags; unsigned int len, i, tx_head = queue->tx_head; u32 ctrl, lso_ctrl = 0, seq_ctrl = 0; + struct macb_tx_buff *tx_buff = NULL; unsigned int eof = 1, mss_mfs = 0; - struct macb_tx_skb *tx_skb = NULL; struct macb_dma_desc *desc; unsigned int offset, size; dma_addr_t mapping; @@ -2131,7 +2131,7 @@ static unsigned int macb_tx_map(struct macb *bp, offset = 0; while (len) { - tx_skb = macb_tx_skb(queue, tx_head); + tx_buff = macb_tx_buff(queue, tx_head); mapping = dma_map_single(&bp->pdev->dev, skb->data + offset, @@ -2140,10 +2140,10 @@ static unsigned int macb_tx_map(struct macb *bp, goto dma_error; /* Save info to properly release resources */ - tx_skb->skb = NULL; - tx_skb->mapping = mapping; - tx_skb->size = size; - tx_skb->mapped_as_page = false; + tx_buff->skb = NULL; + tx_buff->mapping = mapping; + tx_buff->size = size; + tx_buff->mapped_as_page = false; len -= size; offset += size; @@ -2160,7 +2160,7 @@ static unsigned int macb_tx_map(struct macb *bp, offset = 0; while (len) { size = umin(len, bp->max_tx_length); - tx_skb = macb_tx_skb(queue, tx_head); + tx_buff = macb_tx_buff(queue, tx_head); mapping = skb_frag_dma_map(&bp->pdev->dev, frag, offset, size, DMA_TO_DEVICE); @@ -2168,10 +2168,10 @@ static unsigned int macb_tx_map(struct macb *bp, goto dma_error; /* Save info to properly release resources */ - tx_skb->skb = NULL; - tx_skb->mapping = mapping; - tx_skb->size = size; - tx_skb->mapped_as_page = true; + tx_buff->skb = NULL; + tx_buff->mapping = mapping; + tx_buff->size = size; + tx_buff->mapped_as_page = true; len -= size; offset += size; @@ -2180,13 +2180,13 @@ static unsigned int macb_tx_map(struct macb *bp, } /* Should never happen */ - if (unlikely(!tx_skb)) { + if (unlikely(!tx_buff)) { netdev_err(bp->dev, "BUG! empty skb!\n"); return 0; } /* This is the last buffer of the frame: save socket buffer */ - tx_skb->skb = skb; + tx_buff->skb = skb; /* Update TX ring: update buffer descriptors in reverse order * to avoid race condition @@ -2217,10 +2217,10 @@ static unsigned int macb_tx_map(struct macb *bp, do { i--; - tx_skb = macb_tx_skb(queue, i); + tx_buff = macb_tx_buff(queue, i); desc = macb_tx_desc(queue, i); - ctrl = (u32)tx_skb->size; + ctrl = (u32)tx_buff->size; if (eof) { ctrl |= MACB_BIT(TX_LAST); eof = 0; @@ -2243,7 +2243,7 @@ static unsigned int macb_tx_map(struct macb *bp, ctrl |= MACB_BF(MSS_MFS, mss_mfs); /* Set TX buffer descriptor */ - macb_set_addr(bp, desc, tx_skb->mapping); + macb_set_addr(bp, desc, tx_buff->mapping); /* desc->addr must be visible to hardware before clearing * 'TX_USED' bit in desc->ctrl. */ @@ -2259,9 +2259,9 @@ static unsigned int macb_tx_map(struct macb *bp, netdev_err(bp->dev, "TX DMA map failed\n"); for (i = queue->tx_head; i != tx_head; i++) { - tx_skb = macb_tx_skb(queue, i); + tx_buff = macb_tx_buff(queue, i); - macb_tx_unmap(bp, tx_skb, 0); + macb_tx_unmap(bp, tx_buff, 0); } return -ENOMEM; @@ -2583,8 +2583,8 @@ static void macb_free_consistent(struct macb *bp) dma_free_coherent(dev, size, bp->queues[0].rx_ring, bp->queues[0].rx_ring_dma); for (q = 0, queue = bp->queues; q < bp->num_queues; ++q, ++queue) { - kfree(queue->tx_skb); - queue->tx_skb = NULL; + kfree(queue->tx_buff); + queue->tx_buff = NULL; queue->tx_ring = NULL; queue->rx_ring = NULL; } @@ -2662,9 +2662,9 @@ static int macb_alloc_consistent(struct macb *bp) queue->rx_ring = rx + macb_rx_ring_size_per_queue(bp) * q; queue->rx_ring_dma = rx_dma + macb_rx_ring_size_per_queue(bp) * q; - size = bp->tx_ring_size * sizeof(struct macb_tx_skb); - queue->tx_skb = kmalloc(size, GFP_KERNEL); - if (!queue->tx_skb) + size = bp->tx_ring_size * sizeof(struct macb_tx_buff); + queue->tx_buff = kmalloc(size, GFP_KERNEL); + if (!queue->tx_buff) goto out_err; } -- 2.52.0