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 C6D41455AD for ; Mon, 15 Jul 2024 17:31:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BDC9540E1D; Mon, 15 Jul 2024 17:31:36 +0200 (CEST) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id C59D140E30 for ; Mon, 15 Jul 2024 17:31:34 +0200 (CEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4266f3e0df8so30331495e9.2 for ; Mon, 15 Jul 2024 08:31:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057494; x=1721662294; 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=ObTjJ2R0kBlSOSOwjYIu2jgHgfB4zKPTGy+DdeUUfuE=; b=Kgb7lXFva7nMXYxYDot0ls9CJuEp6RpbiCcTj+GGHupFhx8MO3sCH50IrlvGDlY4z7 8A2Bi9JMWZ27d2Q+vwXVF7HvGKIVtqhKgu4GMprYzYlpFuzMyaLugef1UXs1HPSkSQL3 YdcjZ35dBNFnDk0M99aLesYmaKXcJEjD9Z3OaTO/prDe04ofZMbm7c+KO3MOth7EsysR X/qqRk4xARZP23LcBa3viehlhrFz8pD0CZWS569k8fqzPupj+vR5Xj9HhUYszeY8C9zl /BQxt/aLYkjuhLnQwMhCACfEy3Q079rmzz509gCqNLYtAZL9KCWdnzQm3xjl0PO0MgDS C/9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057494; x=1721662294; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ObTjJ2R0kBlSOSOwjYIu2jgHgfB4zKPTGy+DdeUUfuE=; b=R39J4W1DFTAibbNTa728ZQt9Wo7R2zyskJhdNtyI/HE5A/mW5CR3WJx0/CttGLD6Lf ezuMLiDH4smRXfiQ1TIYo89VZZxEcCuidIzncCPFFsxurORXMF12aBzK/+LmPk3SqvrE +DvTHdsBW4AZUkR284uqg8XUlyKF4V/YAJmO7IGuXjv/WDO4hshgzdTGuRD4iiZbDVrU 165MpFjQAyuRlsFj/c0Te8j2EcwToir3SLpa8xmTOMuYDMZCpFOd6qJE0I4J12TmIcOY 357W6+POhmAYFy7e1h6Xa6Q6QZHz8stWWO8dO6P/YORBmv11eE1Ekr1OwzJRQMU5NVq2 ZFkQ== X-Forwarded-Encrypted: i=1; AJvYcCWnnlam85HZMikjAZ/qGjEiM8KuCuAVNDwn1vBQ+KEK9C9eNb6Ufa6GLAhNr0sPmDwAyP9oCRR1vGS9bKa3p2k= X-Gm-Message-State: AOJu0Yxx39g2qqebZvq9sCXNtYL2CkMHrbjv7ffz3kr4Fy+qJTJhhU7S hhdHuIK5MvIsasMitL1bXwKjckLxJJx7A7xx+NXM3/1H6ypbjgObQkxO/u5mUfo= X-Google-Smtp-Source: AGHT+IEmtUWRaBhdr1y88oe9pKbiEyf0fgFYoUz4i6vAwFzruIvkTzGvJkvGuV2LHCXWhIyC6/QkDw== X-Received: by 2002:a05:600c:1d16:b0:427:9dad:e6ac with SMTP id 5b1f17b1804b1-4279dadeb11mr70616525e9.34.1721057494341; Mon, 15 Jul 2024 08:31:34 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-427a5ef4793sm91256445e9.43.2024.07.15.08.31.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:31:33 -0700 (PDT) From: luca.boccassi@gmail.com To: Chaoyong He Cc: Long Wu , Peng Zhang , dpdk stable Subject: patch 'net/nfp: remove redundant function call' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:27:02 +0100 Message-Id: <20240715152704.2229503-84-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240715152704.2229503-1-luca.boccassi@gmail.com> References: <20240624235907.885628-81-luca.boccassi@gmail.com> <20240715152704.2229503-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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/17/24. 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/0c73b671c88aaef8fabf1ce5622ab6ce2b9a42b5 Thanks. Luca Boccassi --- >From 0c73b671c88aaef8fabf1ce5622ab6ce2b9a42b5 Mon Sep 17 00:00:00 2001 From: Chaoyong He Date: Mon, 24 Jun 2024 09:57:12 +0800 Subject: [PATCH] net/nfp: remove redundant function call [ upstream commit d16a42f4a7cf2e73f0e2f7daa9bc64aa63e7bcd9 ] Remove the redundancy call of 'rte_eth_copy_pci_info()' as the API 'rte_eth_dev_pci_allocate()' already done that. Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework") Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev_vf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index 435127604a..60e90cd5cb 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -320,8 +320,6 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; - rte_eth_copy_pci_info(eth_dev, pci_dev); - hw->device_id = pci_dev->id.device_id; hw->vendor_id = pci_dev->id.vendor_id; hw->subsystem_device_id = pci_dev->id.subsystem_device_id; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:38.745739001 +0100 +++ 0084-net-nfp-remove-redundant-function-call.patch 2024-07-15 16:19:34.736210050 +0100 @@ -1 +1 @@ -From d16a42f4a7cf2e73f0e2f7daa9bc64aa63e7bcd9 Mon Sep 17 00:00:00 2001 +From 0c73b671c88aaef8fabf1ce5622ab6ce2b9a42b5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d16a42f4a7cf2e73f0e2f7daa9bc64aa63e7bcd9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index a422bcd057..e7c18fe90a 100644 +index 435127604a..60e90cd5cb 100644 @@ -23 +24 @@ -@@ -302,8 +302,6 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) +@@ -320,8 +320,6 @@ nfp_netvf_init(struct rte_eth_dev *eth_dev) @@ -29,3 +30,3 @@ - net_hw->eth_xstats_base = rte_malloc("rte_eth_xstat", - sizeof(struct rte_eth_xstat) * nfp_net_xstats_size(eth_dev), 0); - if (net_hw->eth_xstats_base == NULL) { + hw->device_id = pci_dev->id.device_id; + hw->vendor_id = pci_dev->id.vendor_id; + hw->subsystem_device_id = pci_dev->id.subsystem_device_id;