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 4702948B59 for ; Thu, 20 Nov 2025 13:45:41 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 41334402DC; Thu, 20 Nov 2025 13:45:41 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id DC17C402DC for ; Thu, 20 Nov 2025 13:45:38 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-477b5e0323bso10216855e9.0 for ; Thu, 20 Nov 2025 04:45:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1763642738; x=1764247538; darn=dpdk.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=quXYhlDZW2T5PO9TgJjPQaOrJKpWF6JpPe2DNr//TSY=; b=WlITUGsuhviyf+KluonoIJZEwYZKUvZeKxE2vZjnyjIzxIf13/vXkY4v6Zky7uCQyR nNYktlFfdKe/e1oIRJY0CfpvFTckoexBprbArrGurppevCVcExdMi1Uu7VEC17x7G/X0 e6ne1Ow1bZXJdhwHWr6ZumPHSVaKuOTbSFq7j/CWP2YDHf9+j0ZTx+kRPdXlBBExo9i+ GMCDhNXN+17c+SFzlECcA+pXye+Cyz41rtGtCOeO8KKTezCmA2VURvu0KaYEndrMT9b4 Qixa6UV2z5/AUuFGfV6s3WnqwrMKj83/SIFQ0sB88ZNTolC3THDZOVRMO8Ev3o63gx9L kcoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763642738; x=1764247538; 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=quXYhlDZW2T5PO9TgJjPQaOrJKpWF6JpPe2DNr//TSY=; b=pEwHuVMPS2FKGF68Z+ZXOWzpQbgoG15Xh8uQFem66LzZ8rvtRINrEQ+PqFPf0YBP7C RHuIY739GgPzJyxlmfvX3CK282niqZ+F6ER9ez38/nxaQkU72px3sOT55cbiyGHinpgg WAt+DolrSOIEr6iifM7lxyuQdhMFfIjrqhMxx4EoekE5J3ESsQ7NWNTc3XQDrjw/AcFf ZG5H8lnznZmRPHHAjFIoVJKbGdVJhrmS29Sd3moPUaQy9Hv9UZSd9Cm3aVHwPN0BMntE vV+5OKNCst+ow0FwMEmQOSWZQRHlU+eRvj1CPJUbNEJjSrJDwMoZvxgwlHIzlkrbchq4 caeA== X-Forwarded-Encrypted: i=1; AJvYcCVrxt4NeXsAUoYDM7GA3aquj2KjAuDNiL5W/qFRA3GxkavoquT6UkdmvJIwysHevxuld3GXMiU=@dpdk.org X-Gm-Message-State: AOJu0YwQ+EuB1FUU7BQld6X1GFoDCV5Lc912xVkbbGX98R5mEcxZ4Mg9 K/98E8CDcJJH9XSpIrjX3gU3/1x02zXwesFBp1QWbdgIP64hjKbFn0U1DIqq+LiR X-Gm-Gg: ASbGnct6BDrDksoV8CwwbtraohsB0AwaclRCSHIppaoJ7Sn+Bvm5quDL1QgvNtL3Loz dQqwh7ZW8Zf4NEZevam9taJKkVXF4WRw7W5K2Rd8ucVTglk8Bwoy+rGPTf6FQkY8Bvm5IMzfiWe iJADhlAt/991CSJfphJazYqJEDzbveqVdGJ34LrGSk1vJ2R1OCHq3YjLOjlw5gcycvhculK3Nbi PQPkjELj/c+cu8/N2UCYvhcFvG3ZnjcsjTraxKMebLR8J4OHxEB4f8ngR676vpal8/EHVhdAi/W lZG9v1c04MkT1MbqJXpmYcNtit71mJD4CoWTYY2iVa21HO+5ux3wJ1qMLxzbAGa6YB24rcs4WMR bYmck0ikUm01MilLRIv8aN4hiIhT0UEXctDVthyvkbhDzs1+wBTAjX0vqG2T/n74Xrlj/UFrqWv 3QvQdm8vwuvCTY+xIaWnSRlN0DflA= X-Google-Smtp-Source: AGHT+IEeE1VXqvPSSrqa7PG1olHOiWXxtBpFP87s8zj741gNBQGZjekjAHdX5Q0Uo/0NgIgmf1UYng== X-Received: by 2002:a05:600c:4704:b0:477:a1bb:c58e with SMTP id 5b1f17b1804b1-477b9eb25ebmr29072765e9.7.1763642738370; Thu, 20 Nov 2025 04:45:38 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:f372:8d1a:399f:e8a2]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-477a9dfb639sm62331465e9.13.2025.11.20.04.45.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Nov 2025 04:45:37 -0800 (PST) From: luca.boccassi@gmail.com To: David Marchand Cc: Hemant Agrawal , dpdk stable Subject: patch 'net/dpaa2: remove ethdev pointer from bus device' has been queued to stable release 22.11.11 Date: Thu, 20 Nov 2025 12:44:42 +0000 Message-ID: <20251120124514.757933-10-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251120124514.757933-1-luca.boccassi@gmail.com> References: <20251112165308.1618107-49-luca.boccassi@gmail.com> <20251120124514.757933-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.11 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/22/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/510690be911f056ce4cd7df50093ff36dfeeb6d8 Thanks. Luca Boccassi --- >From 510690be911f056ce4cd7df50093ff36dfeeb6d8 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 | 5 --- drivers/net/dpaa2/dpaa2_recycle.c | 50 ---------------------------- 4 files changed, 57 deletions(-) diff --git a/drivers/bus/fslmc/bus_fslmc_driver.h b/drivers/bus/fslmc/bus_fslmc_driver.h index 7ac5fe6ff1..32b4238f98 100644 --- a/drivers/bus/fslmc/bus_fslmc_driver.h +++ b/drivers/bus/fslmc/bus_fslmc_driver.h @@ -115,7 +115,6 @@ struct rte_dpaa2_device { TAILQ_ENTRY(rte_dpaa2_device) next; /**< Next probed 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 */ struct rte_rawdev *rawdev; /**< Raw Device */ diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 63505feb38..8aafb0c8e0 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -2909,7 +2909,6 @@ 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; if (dpaa2_drv->drv_flags & RTE_DPAA2_DRV_INTR_LSC) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 9feb631d5f..a9ce0cbc19 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -306,10 +306,5 @@ int dpaa2_timesync_read_tx_timestamp(struct rte_eth_dev *dev, int dpaa2_dev_recycle_config(struct rte_eth_dev *eth_dev); int dpaa2_dev_recycle_deconfig(struct rte_eth_dev *eth_dev); -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 fbfdf360d1..01f0f81b17 100644 --- a/drivers/net/dpaa2/dpaa2_recycle.c +++ b/drivers/net/dpaa2/dpaa2_recycle.c @@ -730,53 +730,3 @@ 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.47.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-11-20 12:44:13.154485040 +0000 +++ 0010-net-dpaa2-remove-ethdev-pointer-from-bus-device.patch 2025-11-20 12:44:12.782088080 +0000 @@ -1 +1 @@ -From 603caa201d7fea95d9272aec5667cb4a23d0886d Mon Sep 17 00:00:00 2001 +From 510690be911f056ce4cd7df50093ff36dfeeb6d8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 603caa201d7fea95d9272aec5667cb4a23d0886d ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ - drivers/net/dpaa2/dpaa2_ethdev.h | 6 ---- + drivers/net/dpaa2/dpaa2_ethdev.h | 5 --- @@ -20 +21 @@ - 4 files changed, 58 deletions(-) + 4 files changed, 57 deletions(-) @@ -23 +24 @@ -index efa88754a7..094f885f59 100644 +index 7ac5fe6ff1..32b4238f98 100644 @@ -26 +27 @@ -@@ -98,7 +98,6 @@ struct rte_dpaa2_device { +@@ -115,7 +115,6 @@ struct rte_dpaa2_device { @@ -30,0 +32,2 @@ + struct rte_cryptodev *cryptodev; /**< Crypto Device */ + struct rte_dma_dev *dmadev; /**< DMA Device */ @@ -32,2 +34,0 @@ - }; - enum rte_dpaa2_dev_type dev_type; /**< Device Type */ @@ -35 +36 @@ -index 1dd4a1e32b..fdf3e0f220 100644 +index 63505feb38..8aafb0c8e0 100644 @@ -38 +39 @@ -@@ -3351,7 +3351,6 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv, +@@ -2909,7 +2909,6 @@ rte_dpaa2_probe(struct rte_dpaa2_driver *dpaa2_drv, @@ -47 +48 @@ -index 87a94bc15b..86b3022ddb 100644 +index 9feb631d5f..a9ce0cbc19 100644 @@ -50,3 +51 @@ -@@ -531,12 +531,6 @@ int dpaa2_dev_recycle_config(struct rte_eth_dev *eth_dev); - int dpaa2_dev_recycle_deconfig(struct rte_eth_dev *eth_dev); - int dpaa2_soft_parser_loaded(void); +@@ -306,10 +306,5 @@ int dpaa2_timesync_read_tx_timestamp(struct rte_eth_dev *dev, @@ -53,0 +53,2 @@ + int dpaa2_dev_recycle_config(struct rte_eth_dev *eth_dev); + int dpaa2_dev_recycle_deconfig(struct rte_eth_dev *eth_dev); @@ -59,3 +59,0 @@ -- - void - dpaa2_dev_mac_setup_stats(struct rte_eth_dev *dev); @@ -62,0 +61 @@ + #endif /* _DPAA2_ETHDEV_H */ @@ -64 +63 @@ -index 94a7e2a020..d1e21dd4d1 100644 +index fbfdf360d1..01f0f81b17 100644