From patchwork Sat Oct 28 06:23:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133551 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0361943220; Sat, 28 Oct 2023 08:23:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE397402D2; Sat, 28 Oct 2023 08:23:43 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2129.outbound.protection.outlook.com [40.107.223.129]) by mails.dpdk.org (Postfix) with ESMTP id 3E75D4029F; Sat, 28 Oct 2023 08:23:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i9XhpWLzrGx1qDrbzdZxCu6SBeo5k9HS6NsqFHv+HH/oTUbxi6m5iTRLmYLRgPofX21rkY1IYfist3EuZMRGBpINoeIPjBY/F6RjqTH9dYcDNMVuwWpZDeEwYNX5yoN53j5Aw90oxouY20jJgQDViYph9i6cHMoyROfRfRZ9WcDT/WVrdtGWfuLuspVj8h9GWZFdCz94dUy/pWTjSloNdg/Gp01n2ntTK8nO9KXO3bMputYpYuGKtV+isD8EFhJVG/GFMYbMX0u7PTxxa607b4KgpKUC2aEOThZZX/W3+xCm7UYFuUAuj1rXHhNM9QxDOMcsuV4ev7TpEA6iILxz4Q== 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=uhl5Eg0enzDYURVvE5BtOza+5swxNwAyx25FzC+oYSw=; b=iaCse512314x66OVpPI+7XOVNFHOFIjhYCYzqWod4uNpYdjui4OG6TdmZlzS8YcH5ax79f1qgSmPxxPgvTInXSCQmrZFTK+p2PseyDZvtybRK13aiQ/0I2oCLdSI3z2gFHE7iKZlluvOjGm7omgnUUaYQvAVLi6L31UdphCNKh/8jnInIG0SNVAaJs6p5qFfPgqPJVhOadIsA09mbfYmsOCrT37zjkMd/lr8RPDhJRCtCSy76JkHTQcIQgL+feRhPa2yGtnwdraqVlyyQiJzER5DXRNSHet4bmMvZ40VVTMEPLeB/GtEAijiHY65c/t0ZTzld3MYbFRibT8fAC39Bw== 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=uhl5Eg0enzDYURVvE5BtOza+5swxNwAyx25FzC+oYSw=; b=JhN+gr+zqWogBs/UzzkX1YV2TZb4kKhiMpEQBtTmkS7XvKjb3D795iL37E394BjXeuTgyE9DlU6UAt51MQv3BkrrqW5MWj96oVcTu5vzAPVFOPVvVtUGzCC+Oby51jnvTEynrRTxs+N012fqvSuNEatob7+BEFg8AMbCt7tcpoY= 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 PH7PR13MB6268.namprd13.prod.outlook.com (2603:10b6:510:24f::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.22; Sat, 28 Oct 2023 06:23:40 +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.6933.022; Sat, 28 Oct 2023 06:23:40 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 1/3] net/nfp: fix the reconfigure logic in PF initialization Date: Sat, 28 Oct 2023 14:23:13 +0800 Message-Id: <20231028062315.1843075-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20231028062315.1843075-1-chaoyong.he@corigine.com> References: <20231028062315.1843075-1-chaoyong.he@corigine.com> X-ClientProxiedBy: BY5PR04CA0003.namprd04.prod.outlook.com (2603:10b6:a03:1d0::13) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB6268:EE_ X-MS-Office365-Filtering-Correlation-Id: a4403f8f-dc0b-43fd-6080-08dbd77e6d77 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UtMs9z/hbaQi58P/i85opEw2KKpE15qDfugtDUnWlg8CBuRxXeJgRYYJMxMBq185bpcCgogOxzVK3aoIKyp7m/xqxFk8MIcL9y/lTnkXlwGlTs3syNXjYzcCVEuosdKF6uSrsled0XfjQQDkZoHDKtwI+NttB8D9ZbnCewibwuz234LfCQit6Gw/QlBg8VfCSW9myOlG46+0x9QVFQ5MIBQbc9Vk066+C6FP739LXh+TJRwws21JB/ghJDf2Uork/HXpTb764NAzDLZiuNiqi70rSl2IDOAnNRv9AdqbjRwBuGhNwuNsQfpVoiWV21oe3ctjhGvt81opDhODaNR9Rc/fgl5HEgB803cup+iSphz5kTrxjjDKys7XdM/p1erc1/hgb2g0203N2obzGNabaeZfVEzCgtvhwH4CXyJH+67g4axrm0HtCIGGpfyIGJXvFnv0EkHZJPai/9KpKY4dRlcDwjBvO07BHOUkiFkDBPJBVXOfVaVIS01szp0ISS+frFxhDRrXPVKE7uA/FzNBXEPNfEPkg9SZ8ID6ti7XQtOhFXQ5QJLd+aZZUGa5k2uopCb3bzbd8E92PBL94htUq1luyVmJeisDK1VJcf6DJaWH4IrxJ6SdIlV2Y2iX+hCkKNygyE7ZgrE/z/Khc7bPQYZusdDyYVQoUGHCAvuC2jY= 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)(396003)(39830400003)(366004)(346002)(376002)(136003)(230922051799003)(186009)(1800799009)(451199024)(64100799003)(2906002)(38100700002)(83380400001)(1076003)(107886003)(5660300002)(2616005)(86362001)(6512007)(41300700001)(44832011)(36756003)(38350700005)(66476007)(316002)(6916009)(66946007)(54906003)(66556008)(52116002)(6666004)(6506007)(6486002)(8676002)(26005)(478600001)(450100002)(4326008)(8936002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /8KXS3xI1wJ/sWjImSKxPQoA3j9AO6+D+Kh5bJSpWsLsAIosnHjSHSmOa2NEesS8XAfI0+OsBrVlAPCg/Ucn9zQqWwEAwVQ8vrFvEPtuVmLGXJyunyy2jszlzl8m+S/VpwHzYK5fRicLYAL44clHfVKHCYn9iQXYACBe+xgzCm3mVIGK5tICOoX4x4X4oNNQo3OMpVlV0abgDV9CVYphXyDQuPmm1EJc9SzW/To4Fd3KMEIh6n+eEca58RLsKk5ah9Wiaq1DVYpoB1pDxdwoJ001UB/JA8+i9a+O7+qfng9deyt2CkBJK+QdAVTcbqh4475vyz4bF1xfizVdEGJB4nXt+P2gRHylORZShqChKAris3IPYE65IUPp+d8lpwXH0vWHAaHnfjPkgjwGRsGrUTBjP5Rtx2XsnAYyAd/PlMic5Ak8TXKkK1pokg3LU/AKOQyo3BYLaUZOyjy03LXTvSsv1/LkVYgfh4VAkyTq0ZbPu7XZv87hIj3E9WI+BFC3NdTM1s/zPJvZwlLGIA6K9hcEmd10m9pV5LPweFaNlQJV8fPXVsBEaEuVzweQUWki3K9d5nS3rJaoVS07w8+ZvX3+hMo8cnnM3O5P48MBxrLLWE6kVPGqiIyUXP4LeKHedNOIoGNxmve9jwbP9MZCzs0XX6tUOGaTC4i4c8FKEzgyVQhFPE5hCrXOUmyBqHfMinPulZvscqYnzL+4avJqxqaCRsDEjUg5pFsT49ObtteZhrZANC5KHztMjEQZ7Oo+o2ILiMvne98YVdQKsYCUCnvb/RtBFq6bM+/UQM8SApY22PD9ISIT/9uIfYAPfmR+XdmVfPoq0n2nROpPjohq+uBG7ZUHmcsCczw7Dz225KA7889P/sh41GBLFewoiWfjbv3A4SPKHkL107XzMrJLlBP0CUzO17KU2qY5TRT1q+KTnZUreezYgPZmpv4LTXdAQcAgTr+JGEt4FkILr4E4zjzqOwcr6JJ6gI1icPzJgfrgFzVbEVvbsYi1uTmXI2amdHZDi+wO7fGiX0AxALjHHiqgo1qOPmhmiExTNEBq0QjNvm7YBzoQVLt8Jz3tXago5hprTT5DlMoZFewmO2nHLU7/QdOjV6k03r0C7GbzJDGBcenG0N03TOo353WXdg9yLi7WIfvShGE9JqhgxxRReyBkVn++Uri4Sa0NpsYyidJ0YqToEf+4eYQvakFISA+LuUsXHDn997eJQFDamrhcVrRclqkvpw9t3rawc9W9xyhMa4YIDa7/3PJHtbH4L0AQdhDi6jko52rjvvdwQnTL23wX08x9PNn236ryHVOLBsCIVmDn6dXH3WksvbRrUZ9kWs/QM3yYrI5RyguLducFarNGoHf6/xMan5GrRVJhMCGOF5jaDhRrrfKZCeIIQaFtIFZfBhZj2YBRU5D/GI+A1iSdtmu6WbB1/vzMTboAwHTv/ftqm20dnmCfyUiD5I+hS24+VBDPuyorLYxBERKL/KIc+h83GfC9Eo8JJ/Kzwse3oz3I0w+tmZV2ADcbqmw1iTtWIJGoH/7L8b0u47xJRPjF8/mL4OMSJTZ16IM1AjAmXnZxgoG25vKv3XXm/4JI+qtWNyoDzQ+GhjeIqk6lQQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: a4403f8f-dc0b-43fd-6080-08dbd77e6d77 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2023 06:23:40.8207 (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: DzDPjt6MpZWinWGgoyYTb7gOzUL4BRpUzMHmEaKnQBO5Fi7IPEdFpIyhtEfl1ylW5RuHuvu+NbdYmoNdd5tkRoZGTC1HDKW2et8rNA2POqE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6268 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org There exists exit point between the reconfigure logic and the stroe 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") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- 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 76317925ec..0a0e3d6375 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -141,6 +141,8 @@ nfp_net_start(struct rte_eth_dev *dev) if (nfp_reconfig(hw, new_ctrl, update) != 0) return -EIO; + hw->ctrl = new_ctrl; + /* Enable packet type offload by extend ctrl word1. */ cap_extend = hw->cap_ext; if ((cap_extend & NFP_NET_CFG_CTRL_PKT_TYPE) != 0) @@ -171,8 +173,6 @@ nfp_net_start(struct rte_eth_dev *dev) else nfp_eth_set_configured(dev->process_private, net_hw->nfp_idx, 1); - hw->ctrl = new_ctrl; - for (i = 0; i < dev->data->nb_rx_queues; i++) dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; for (i = 0; i < dev->data->nb_tx_queues; i++)