From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5F03F48B69 for ; Fri, 21 Nov 2025 12:24:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 594D6402ED; Fri, 21 Nov 2025 12:24:29 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id B5280402ED for ; Fri, 21 Nov 2025 12:24:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1763724267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l5Y/IB/UYGmr/B3YEFHZJUhku5LAfnV1Pmqwzl6kh0A=; b=hPbUDZT4sTqMQ+FeaxYeDElf0jwS508xfxDE+ihf6SNKG0+NB977DBpLugugOu1LHUNlIc dsllGDqd9WqjqrmCijIH9qGB/NOk6XYfYW5Q1CcYfJQpl5cSYBsPF/uaN4jVmU1RD7WSR5 QUTzUGWuGE6V+lB90OzDiKYu1H2wuKU= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-180-_iYeYS_tPa6TObTgymrxcQ-1; Fri, 21 Nov 2025 06:24:24 -0500 X-MC-Unique: _iYeYS_tPa6TObTgymrxcQ-1 X-Mimecast-MFC-AGG-ID: _iYeYS_tPa6TObTgymrxcQ_1763724263 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4497E19560B7; Fri, 21 Nov 2025 11:24:23 +0000 (UTC) Received: from rh.redhat.com (unknown [10.42.28.165]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id CCE8730044DC; Fri, 21 Nov 2025 11:24:21 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Hemant Agrawal , dpdk stable Subject: patch 'net/dpaa2: remove ethdev pointer from bus device' has been queued to stable release 24.11.4 Date: Fri, 21 Nov 2025 11:21:06 +0000 Message-ID: <20251121112128.485623-82-ktraynor@redhat.com> In-Reply-To: <20251121112128.485623-1-ktraynor@redhat.com> References: <20251121112128.485623-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: HCvV8QAiT-9SQXGrPe1v-VPb2bxRWmf47RNF5tZ9OAc_1763724263 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 24.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/26/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/a0ed5dd0cc45a47b593470acec09f5f89c5c3138 Thanks. Kevin --- >From a0ed5dd0cc45a47b593470acec09f5f89c5c3138 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Wed, 12 Nov 2025 10:10:46 +0100 Subject: [PATCH] net/dpaa2: remove ethdev pointer from bus device [ upstream commit 603caa201d7fea95d9272aec5667cb4a23d0886d ] This code was never used. This leaves no user of the ethdev field in the fslmc device object. Fixes: f023d059769f ("net/dpaa2: support recycle loopback port") Signed-off-by: David Marchand Tested-by: Hemant Agrawal --- drivers/bus/fslmc/bus_fslmc_driver.h | 1 - drivers/net/dpaa2/dpaa2_ethdev.c | 1 - drivers/net/dpaa2/dpaa2_ethdev.h | 6 ---- drivers/net/dpaa2/dpaa2_recycle.c | 50 ---------------------------- 4 files changed, 58 deletions(-) diff --git a/drivers/bus/fslmc/bus_fslmc_driver.h b/drivers/bus/fslmc/bus_fslmc_driver.h index 1d4ce4785f..34b564001d 100644 --- a/drivers/bus/fslmc/bus_fslmc_driver.h +++ b/drivers/bus/fslmc/bus_fslmc_driver.h @@ -97,5 +97,4 @@ struct rte_dpaa2_device { struct rte_device device; /**< Inherit core device */ union { - struct rte_eth_dev *eth_dev; /**< ethernet device */ struct rte_cryptodev *cryptodev; /**< Crypto Device */ struct rte_dma_dev *dmadev; /**< DMA Device */ diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 83ff6e0a04..272126f4a3 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -3052,5 +3052,4 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv, eth_dev->device = &dpaa2_dev->device; - dpaa2_dev->eth_dev = eth_dev; eth_dev->data->rx_mbuf_alloc_failed = 0; diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index f32c31c763..de5594b72a 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -492,9 +492,3 @@ int dpaa2_dev_recycle_deconfig(struct rte_eth_dev *eth_dev); int dpaa2_soft_parser_loaded(void); -int dpaa2_dev_recycle_qp_setup(struct rte_dpaa2_device *dpaa2_dev, - uint16_t qidx, uint64_t cntx, - eth_rx_burst_t tx_lpbk, eth_tx_burst_t rx_lpbk, - struct dpaa2_queue **txq, - struct dpaa2_queue **rxq); - #endif /* _DPAA2_ETHDEV_H */ diff --git a/drivers/net/dpaa2/dpaa2_recycle.c b/drivers/net/dpaa2/dpaa2_recycle.c index 4fde9b95a0..f68653e0f4 100644 --- a/drivers/net/dpaa2/dpaa2_recycle.c +++ b/drivers/net/dpaa2/dpaa2_recycle.c @@ -731,52 +731,2 @@ dpaa2_dev_recycle_deconfig(struct rte_eth_dev *eth_dev) return ret; } - -int -dpaa2_dev_recycle_qp_setup(struct rte_dpaa2_device *dpaa2_dev, - uint16_t qidx, uint64_t cntx, - eth_rx_burst_t tx_lpbk, eth_tx_burst_t rx_lpbk, - struct dpaa2_queue **txq, - struct dpaa2_queue **rxq) -{ - struct rte_eth_dev *dev; - struct rte_eth_dev_data *data; - struct dpaa2_queue *txq_tmp; - struct dpaa2_queue *rxq_tmp; - struct dpaa2_dev_priv *priv; - - dev = dpaa2_dev->eth_dev; - data = dev->data; - priv = data->dev_private; - - if (!(priv->flags & DPAA2_TX_LOOPBACK_MODE) && - (tx_lpbk || rx_lpbk)) { - DPAA2_PMD_ERR("%s is NOT recycle device!", data->name); - - return -EINVAL; - } - - if (qidx >= data->nb_rx_queues || qidx >= data->nb_tx_queues) - return -EINVAL; - - rte_spinlock_lock(&priv->lpbk_qp_lock); - - if (tx_lpbk) - dev->tx_pkt_burst = tx_lpbk; - - if (rx_lpbk) - dev->rx_pkt_burst = rx_lpbk; - - txq_tmp = data->tx_queues[qidx]; - txq_tmp->lpbk_cntx = cntx; - rxq_tmp = data->rx_queues[qidx]; - rxq_tmp->lpbk_cntx = cntx; - - if (txq) - *txq = txq_tmp; - if (rxq) - *rxq = rxq_tmp; - - rte_spinlock_unlock(&priv->lpbk_qp_lock); - - return 0; -} -- 2.51.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-21 11:05:12.102032316 +0000 +++ 0082-net-dpaa2-remove-ethdev-pointer-from-bus-device.patch 2025-11-21 11:05:09.565201604 +0000 @@ -1 +1 @@ -From 603caa201d7fea95d9272aec5667cb4a23d0886d Mon Sep 17 00:00:00 2001 +From a0ed5dd0cc45a47b593470acec09f5f89c5c3138 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 603caa201d7fea95d9272aec5667cb4a23d0886d ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index efa88754a7..094f885f59 100644 +index 1d4ce4785f..34b564001d 100644 @@ -26 +27 @@ -@@ -99,5 +99,4 @@ struct rte_dpaa2_device { +@@ -97,5 +97,4 @@ struct rte_dpaa2_device { @@ -30,2 +31,2 @@ - struct rte_rawdev *rawdev; /**< Raw Device */ - }; + struct rte_cryptodev *cryptodev; /**< Crypto Device */ + struct rte_dma_dev *dmadev; /**< DMA Device */ @@ -33 +34 @@ -index 1dd4a1e32b..fdf3e0f220 100644 +index 83ff6e0a04..272126f4a3 100644 @@ -36 +37 @@ -@@ -3352,5 +3352,4 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv, +@@ -3052,5 +3052,4 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv, @@ -43 +44 @@ -index 87a94bc15b..86b3022ddb 100644 +index f32c31c763..de5594b72a 100644 @@ -46 +47 @@ -@@ -532,10 +532,4 @@ int dpaa2_dev_recycle_deconfig(struct rte_eth_dev *eth_dev); +@@ -492,9 +492,3 @@ int dpaa2_dev_recycle_deconfig(struct rte_eth_dev *eth_dev); @@ -55,2 +56 @@ - void - dpaa2_dev_mac_setup_stats(struct rte_eth_dev *dev); + #endif /* _DPAA2_ETHDEV_H */ @@ -58 +58 @@ -index 94a7e2a020..d1e21dd4d1 100644 +index 4fde9b95a0..f68653e0f4 100644