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 ECC37455AD 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 E576040E31; Mon, 15 Jul 2024 17:31:36 +0200 (CEST) Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mails.dpdk.org (Postfix) with ESMTP id 0860340DFB for ; Mon, 15 Jul 2024 17:31:36 +0200 (CEST) Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-36805befd01so1650244f8f.2 for ; Mon, 15 Jul 2024 08:31:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721057496; x=1721662296; 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=DT5uguyNsUJzA+SWaEhNWISk2iHipNwcuQXpfDg2zUo=; b=ZN+DABEi38JF2dpAyU9Z0ZCHCnlib9lO0a6zqn4fXcZBUHhKuzQPiOUK2iL8UgZlsQ jvNbeA1WSRkRpBIvWR+VdxslIdiRmSL+X9D/3YJApOC9eyWGgAx7znqX+5+ZObzcrrB0 Xo3llOPsO2Vv/lwyuCoEtcjyT28P+sbjPEWtWhE+XAiupQ5LPvPM12eWdUuPdoliqaj0 n93LIk4ZpFPW0TXc0RQOLI3WUouq2zZVKj9iPYBdERjEqTNt99M4EigbA0pxp+KVFes0 sZ03aREg3Bnf5SYNE3POe5IjbMC1WugDqfc0wAu1Epy1XZXu33TnBiVNc/2isbLRi/OW iv3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721057496; x=1721662296; 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=DT5uguyNsUJzA+SWaEhNWISk2iHipNwcuQXpfDg2zUo=; b=fckv3rZ+8bjONDdR2+zWOlxuyX6jdW1e5v6qaSKRYHwAlQhpD1Oq4QSMhoM3sSgdB/ SZL+bYTVTRvxXUGNQqMaZ05VE2GC1eXUMpLLfyuMCRtdnABOKLdz5WHN+pca4yBD5Tzr hdGl4CoGya3w0c/RjDcmTW6Lejrn/U8GRfC94WrM5C41zX/BJD/IqbRn6vouWyjxuUtA vaVcCn23lDC1QfuA7SWC2c9t82cuFWjs3LU38SF3+2APoK8xI8DKpKv8jJ48pK1geTSI YVqIxJe6h68q/rNVHd++2ycgI5UJe/Oy2tDxTx2bGEDXjTffhPaHOMnPZfeUDT7Qj1MF p66w== X-Forwarded-Encrypted: i=1; AJvYcCVsiHAHvtcjU/cO3hlVtbKPgyAPLSXAbC1ScblH+ZmoCUEyCaVne6VjKWYUV90G/GFNhWsCEBofVkId45vJdeA= X-Gm-Message-State: AOJu0Yx4SDdJkaMgEpX0hTxKZ0R6Fr8XTNfTsbC/s34Z2Uw1Cq0bPjeH btgSjreAY6XgTjVTset6aHhqMvLNMkcgMHwMIa3Nl0U+pzbYAlcp0xiJKI8lWRE= X-Google-Smtp-Source: AGHT+IEZiBp84kGGXPG7FeTaY8ImTfFIw6/oomE4ctRWbjUTtwahxTB3QxhCgKvK+XqyJxyyHTlcHA== X-Received: by 2002:a5d:66d0:0:b0:366:f469:a8d with SMTP id ffacd0b85a97d-36824094e18mr61555f8f.35.1721057495681; Mon, 15 Jul 2024 08:31:35 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3680dabef9asm6721090f8f.39.2024.07.15.08.31.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jul 2024 08:31:35 -0700 (PDT) From: luca.boccassi@gmail.com To: Peng Zhang Cc: Chaoyong He , dpdk stable Subject: patch 'net/nfp: adapt reverse sequence card' has been queued to stable release 22.11.6 Date: Mon, 15 Jul 2024 16:27:03 +0100 Message-Id: <20240715152704.2229503-85-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/f0e36f585baa5f80a93c3bc50a81c62fa657ffb8 Thanks. Luca Boccassi --- >From f0e36f585baa5f80a93c3bc50a81c62fa657ffb8 Mon Sep 17 00:00:00 2001 From: Peng Zhang Date: Mon, 24 Jun 2024 09:57:21 +0800 Subject: [PATCH] net/nfp: adapt reverse sequence card [ upstream commit 497b94dc2c8795d31fa2020bcdb0cd62a156ccb0 ] The NFP chip-wide port index is 'eth_port->index'. In the normal card, it uses 'eth_port->eth_index', but because 'eth_port->eth_index' and 'eth_port->index' have the same value, it doesn't have any problem. But in the reverse sequence card, the value is different, so it will lead the 'nfp_eth_config_start()' failed. In this commit, fix this bug by using 'eth_port->index'. Fixes: e1124c4f8a45 ("net/nfp: add flower representor framework") Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower_representor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/nfp/flower/nfp_flower_representor.c b/drivers/net/nfp/flower/nfp_flower_representor.c index b6e58d31ff..d5aed8791a 100644 --- a/drivers/net/nfp/flower/nfp_flower_representor.c +++ b/drivers/net/nfp/flower/nfp_flower_representor.c @@ -970,7 +970,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) eth_port = &nfp_eth_table->ports[i]; flower_repr.repr_type = NFP_REPR_TYPE_PHYS_PORT; flower_repr.port_id = nfp_flower_get_phys_port_id(eth_port->index); - flower_repr.nfp_idx = eth_port->eth_index; + flower_repr.nfp_idx = eth_port->index; flower_repr.vf_id = i + 1; /* Copy the real mac of the interface to the representor struct */ -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-15 16:19:38.784601749 +0100 +++ 0085-net-nfp-adapt-reverse-sequence-card.patch 2024-07-15 16:19:34.740210136 +0100 @@ -1 +1 @@ -From 497b94dc2c8795d31fa2020bcdb0cd62a156ccb0 Mon Sep 17 00:00:00 2001 +From f0e36f585baa5f80a93c3bc50a81c62fa657ffb8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 497b94dc2c8795d31fa2020bcdb0cd62a156ccb0 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 086dbc58e3..b1589cf78c 100644 +index b6e58d31ff..d5aed8791a 100644 @@ -28,2 +29,2 @@ -@@ -845,7 +845,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower, - eth_port = &nfp_eth_table->ports[id]; +@@ -970,7 +970,7 @@ nfp_flower_repr_alloc(struct nfp_app_fw_flower *app_fw_flower) + eth_port = &nfp_eth_table->ports[i];