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 D6D1C4334C for ; Fri, 17 Nov 2023 04:16:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA63E40271; Fri, 17 Nov 2023 04:16:10 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2111.outbound.protection.outlook.com [40.107.94.111]) by mails.dpdk.org (Postfix) with ESMTP id 0215F4014F for ; Fri, 17 Nov 2023 04:16:07 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZIm8g4xcBY17RytdbLhb0p5go5J5SAcvpl+KvrMqaEzzZqU5exd5IpCKNrz10X7JnIyrIZSbwC45SQRYFopnHLBGqQecqr4pGEvEySsnNwNwTCtwR3eEludQ2gUjeknPxbnDuJV3meYT7nq3aLBtVhx4ffOLeijnnX/kCXWVuWNg4tRUxUTtKL/IhkMEO5a7afINDY60RGKu+BgiRdrZFVJpZ1PAVzJDDrb37cMYDiPaWKqoLim/y6oDHyQYGN+TXyX2mrYMQI6j9LRnedLGnB1fVhF0m2CJtLAqywO7CqSNOl2bI02y13qpSFF9ERBFv8G4J5ZAJvjUAZaU8ZijEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HeIh49qgMj1YaxRUq6pN1ZhwTbWUeqQntG2/4E5694w=; b=OWWuR2RInLFBvfzSKWUdc0pmu4Ad6x3viof+ob30DYhJMHG7pSvsuuP3Fto4dcfkDPOUG99nB/9bWCawQaGsr13supSI9xuiv+k2CULPIgtP8ncwjAos7QV7hu0VpqXINuYF/7171NqJb83Z74kaWBzNe0WZnMu2WWhjiYCl9TnKOQf5nrponvFwHQ2QxRwSsUmkpq8HsOnBxofL475mAfgp1vd0vqPOSxp+2IfmN0LxUB99MR07cD7HqW9zSTGfuIFWz14he+Rr056d3C47LA5NeU6Ogudwdn6sWruf0oK+cOLgxaXZ1EcpdgjUxMT3w3cyWbA/fFrd8sdOHRv25Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HeIh49qgMj1YaxRUq6pN1ZhwTbWUeqQntG2/4E5694w=; b=F0rR3iiXm88MtRgelgoPHAUGWgOKmMmwgFi6hY8QSV/8054rDtWzHJuipfAm3jIzpMfLst7Jyy5TWrvPCQ1xRlbv3KlrHeCAu2T+igVY2TnzECJ+LJ1eBVqxYStnbU7FCWmWcchu6ht7Nfqqy5W9VRwtj8EJhjmpa+fQLw7sCXA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by PH0PR13MB5976.namprd13.prod.outlook.com (2603:10b6:510:16f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.19; Fri, 17 Nov 2023 03:16:05 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::45b3:d83c:cff2:4a1b%6]) with mapi id 15.20.6977.029; Fri, 17 Nov 2023 03:16:04 +0000 From: Chaoyong He To: stable@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH 21.11] net/nfp: fix reconfigure logic in PF initialization Date: Fri, 17 Nov 2023 11:14:58 +0800 Message-Id: <20231117031500.1609817-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231117031500.1609817-1-chaoyong.he@corigine.com> References: <20231117031500.1609817-1-chaoyong.he@corigine.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BY3PR05CA0040.namprd05.prod.outlook.com (2603:10b6:a03:39b::15) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH0PR13MB5976:EE_ X-MS-Office365-Filtering-Correlation-Id: c8cb7799-e90b-4f7b-ba02-08dbe71b88b2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 702BghDQNptk5YTqDQSLBEDH+LnWsEQjTvrhHKHwWaDsZqRitiUzmaPnw+MmBs6/dEvrBlrkz74T9RmzdYwLv8UUD+yNi85tJM89ESoCqUvMxbpA+e6J/ynYqtwNptp4hZglvgYQT6iPJCYRsbi7eQo/dIDWdWQgQHjMCxg4WcAayd743K39FsUyE7eNFkeGhn7CptFYHxuVNqv5upgYlOdtGxzjNOt1XPz0Y9AGwuHao8uGHCp73YH6JU2/JWNKB86gucvtD7TdM1ISqHsa42RoS0hsdcUg4sRHI83/6xf/KOzCTPm/IGmKLW1VqmQHqLzgi/4wIIB/nZpgUhAaEETkDef9PJzgDhFBGS8gNGKRSdMlr6ieE6jAsjEx1mYIjoXSG0DgNsB2QlZbPTvQX1bj3vlNs4Mc9N9uIwb2/eWQcyfK8AU6y8oFhDZCTI9w48ANkZzOk5yfaqCeZ0U93pYrf5WdrpgfNJfW+wzWWU85ZLgdHyVRlgoRJjH34gdQW4snbz1kj1I5ekuDw3J9fIkEmXGfdlrZ/WEmBdimUxjKKl6OXlewW/h2/hT9qkhbO+Tx+lcYdPS2pTRODJM6wOLKakAOx14Vkig/KLFhmshyjvwMVb4lJ1/q8MApuQRbFe7T9IoFWaKXkFkmwrz3KtVyJiSsZPchS8dgVgQY7P4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(39830400003)(366004)(396003)(376002)(136003)(346002)(230922051799003)(186009)(1800799009)(64100799003)(451199024)(41300700001)(5660300002)(38100700002)(86362001)(38350700005)(2906002)(36756003)(4326008)(52116002)(83380400001)(2616005)(8936002)(316002)(6506007)(8676002)(6486002)(6512007)(66476007)(107886003)(6916009)(1076003)(66556008)(66946007)(44832011)(478600001)(6666004)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?oHxHS0gPyUhJfiUrTLAytOnrUNgisBKrbGAnQhF3z0icWu1EcfRlPh24oT10?= =?us-ascii?Q?+aMKGfpHx/Pz1SjaoUrZR9kip4TLDj3pJsPZ48eGvkYrUgc2ZUD9MYOVyiTX?= =?us-ascii?Q?Ttgo5H+Susb239YTIombOsScNx7XxFwDrH75WiGbUw/rDjqqTiz5IT2ijewy?= =?us-ascii?Q?LUPRXKvcx/00wapC4dyNgB6uU1/WpK8tErw/Nr7mtG3aeDsLQ+FnotPyEaiK?= =?us-ascii?Q?mvI2+7eKs71BAcuDKDPuW4fhyTI0bxPNoDfL+dapgAHXmU74TERfA7zkrgE4?= =?us-ascii?Q?TU3f9Cgk6jhPEueFZIKtPiHVJjZTNCxipAO2K0a8Gxk2e1IruVILQfl9BYWW?= =?us-ascii?Q?/SoNxcKhm2yTFCmvAw2m230e3eBR/EyLzADHii4P72TOCUbmv8fKP+d3lEd/?= =?us-ascii?Q?Z3Dlow8Yg0mFylrbad1/FOWArjqk2yzguGDZxgJTukQdm9hqxEYljors82fP?= =?us-ascii?Q?ckcR9skAYkrMTakypDsucXiYphgv6xjU5Zih5+jcFChI7mD7o7/YuzVlGrcN?= =?us-ascii?Q?GCpStuWvpLgmooVTLpTanHfJawqe4cK5qbwqcqgScwOnbgwUDSKde80v3YXf?= =?us-ascii?Q?OkcaCo+DNeS3H3tI/bSdc52e/DbLtzHaoRCk0UddFSjjTFnherwWk1BSQlfS?= =?us-ascii?Q?mM2Z8Q4ja7ieHcnmRWnHk5GpTLwk641Z57GvyPdVXAdd24kUq+d1S8/TrSnA?= =?us-ascii?Q?/We7QsyE4JPT3OJaaz745Df14R/A+DK8Eft4hOqHs5m/Xs3QEiBi1W0m/Ols?= =?us-ascii?Q?lTMt7ZRlsUNyi4WoeAg82fiSqKyaIF+3W9Dhz4qO+7KrcvAy9lxt3F+LoDU9?= =?us-ascii?Q?jj8BDoQ8OxMSfn/A1jwExRObAryIIKrbCpl8sCKLkcRBHzz0oNFzufqFWiSg?= =?us-ascii?Q?RS0/9gKw4RFoyuU07gTdaicxZ5k7c/fguagzAKFZlHfegH9psjayFOTyP0BH?= =?us-ascii?Q?/HgWjRhzv6Lel5C1snc45Yd7H+IAkB05goGgPrC1KZC4v1BleIQIt0vGM04Z?= =?us-ascii?Q?blvs8YnBAIy8aX9yXNIESCeAij34epdu13+QbA4hDyah8NAgRZiwXxU7gmgQ?= =?us-ascii?Q?lYz1yOdsxdTEg5iLhFYHMwCmBW8K7K0942A4tF83yQ4VSVvtm/8VXxyxPtGh?= =?us-ascii?Q?EvIKWVfFSxeeqnJqkwrqH+IFF5XnZMrkSdjY/0+thTjG2ZqqCB4rZAP9ZyLd?= =?us-ascii?Q?VFAE/Dmb6hnQAarPA2vqNYYXo/SXmwLElurbsnZj4vkjGdAiw1GCdtDkSR13?= =?us-ascii?Q?fBiwbfhHqa4mkEgrHc9889a6EmMmNx6JM/f9DhVZuHay6h95qqR/eCapP920?= =?us-ascii?Q?joOAk5y0YHA40k8eboxmH+b6741Hp3jrgexNLey8mGwoiXf2gFvDuPfKg61b?= =?us-ascii?Q?NptH1QQHuPMMb/LK4v7LEEoGmslbeULXfg0zxzpHsZGjoAmh+DuuHnLTM/Ka?= =?us-ascii?Q?RcWOY0CtkblC4+qVatSYGnKWTcObF38xapKQPQQtTCOOuEFd4yQ44ZG67T6Q?= =?us-ascii?Q?aO6yi/GIimvY5xrQHk4FAKUHpqXbOGhXI5iSmPBCm/AmIw56wEhcilKlhnyT?= =?us-ascii?Q?SuLbD06GBa/QVMC0GyYzJLQr37jQIcBcMSx+Yy4sEiOc1ZR9mzMmZr9ZN60/?= =?us-ascii?Q?iw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8cb7799-e90b-4f7b-ba02-08dbe71b88b2 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Nov 2023 03:16:04.9240 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gxHyO/x2uR31Am3laKKEIUO4BMgTVmaJnqM75f1MmfhifhFJCQiEIiyEbuy1/7bTGBWTOGyqndsXXbkJABrAHulNfvM7VpwJQEG2sP0HKvA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR13MB5976 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 [ upstream commit 1e80c07472aeed5669c79c0430b8aeece5129a20 ] There exists exit point between the reconfigure logic and the store logic of the PF initialization, this may lead one situation that value in the config bar is not same with the value stored in the data structure. Fix this by move up the store statement. Fixes: b812daadad0d ("nfp: add Rx and Tx") Signed-off-by: Chaoyong He --- drivers/net/nfp/nfp_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 37593fd216..83232d4b73 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -167,6 +167,8 @@ nfp_net_start(struct rte_eth_dev *dev) if (nfp_net_reconfig(hw, new_ctrl, update) < 0) return -EIO; + hw->ctrl = new_ctrl; + /* * Allocating rte mbufs for configured rx queues. * This requires queues being enabled before @@ -183,8 +185,6 @@ nfp_net_start(struct rte_eth_dev *dev) nfp_eth_set_configured(dev->process_private, hw->nfp_idx, 1); - hw->ctrl = new_ctrl; - return 0; error: -- 2.39.1