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++) From patchwork Sat Oct 28 06:23:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133552 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 496D243220; Sat, 28 Oct 2023 08:23:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 764194067B; Sat, 28 Oct 2023 08:23:47 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2108.outbound.protection.outlook.com [40.107.223.108]) by mails.dpdk.org (Postfix) with ESMTP id 7761840272; Sat, 28 Oct 2023 08:23:44 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j02A8ruV8yfgfO76lb3sdWaEH+37S4bTJ2Ux2It1ClrGLQf+78yhjkZj89bTqxdl8SsS3T0o7KLQrjdr/RyatZNQMlmpKG9E3Aa/8psuubN0GHryHcZJxac48Pmg1f1bpd+G7h8EsZUl+VqvBubPzrESOc+NwbZggZ7yXpWYTO5vbclYWXoo+pAjmyipOLBNXda46Azde/D8As2aEyUUfC5w+8cQlHqDG2I0PHKv29H72kmiaLnS8v7g+otZDXYWDbdXKdYw9nYv/aWqFzt39rRE7RoQvuhFH4xj91D2uldYHrutUT1rkG06RP48/MD16rDRoV+loe1q4iLVUEnrrQ== 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=nNhHr76sEyuNh0HytnS+WxdV+cw2IiqXmKh+lXcYEy4=; b=eOInL20mvpFw2EB0ICfLh25VVd6CuQpLChg58IdP5/3ZkUUrb4PtRo+5p5szvCU5nZoEJgv66zpvHR0yGkChP1lLng5Cp8dVuh21aRsqVlsF3cmPPOs+TbqJAv5OA1ju8pbE0J7HqfKFBYMoOZCmfRikB3a/7/bUqja8mQ4Xqsv1xJ5qXrYA6JKEoOSsN/JhoAotb2GlR/U+sGBvH3t+g0JOLOM/pkht1U+C2O6pSGaa+2IW/NG/JicHFfERhSqrPBV9jAZjT1QgHoZ5A6aGRcRw8X+fSHE6an1GOd19OwAfqew4AfOBCz0PQjrjHElDM8cpWulPrqkojqEAoPWJmw== 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=nNhHr76sEyuNh0HytnS+WxdV+cw2IiqXmKh+lXcYEy4=; b=k4UemvstDYx4PcpMiJBKyLv9vFlkQ1wnoyoEI1cCvXAF16VG/SVJzwEOVwQaX3/k25n010hHYEUN9EyGjcl9lqecvVzRdmVHjsvqDdfA/VhssH1XmFa3y2zkj0LrOzh6m21+HfBWwRjQUXHtfiymU4hugNNpr4bZca4IPqu3BIM= 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:43 +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:43 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 2/3] net/nfp: fix the reconfigure logic in VF initialization Date: Sat, 28 Oct 2023 14:23:14 +0800 Message-Id: <20231028062315.1843075-3-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: a01ef9e1-99c8-42a2-4044-08dbd77e6eb9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3d4z2nVbbtJDy0Cg+ytJJoRlEj5q+2UwlALsJimIZ2tNLOq7TUoJ1LHY1Dcxas04fnp20V29bd+tidRr+VcyycpJ5UW1Y/MbBeagGZb6j2eFqJgp0tevlUyvvFxDqsj3D/LBPuHLkgUdzVd7BPkI2RRvFBzdqghj88wF+6FigZcEPH8F+y8VslugKn9n/7e5NliPu9qC1aY5PugWrQm73xTeflMzzHBuIlXigAXjWWzcjGro/rnyeG7eE/t6z/gDcjCe633VOPkDVShrhXgmcGXhJY10pjf+9CrjaINkJjfZHm6QGcppLclZ2P2xNkeKDelmPFFPSz3awDLJA8nOipmL4NzSutrmhqxQqfsIPvjl7juYJM8f9l4sbgZJjskSTv+xbximVPb88gDRW0//tXJT+QO9hL0R1UWBYknrXJPz0HLZ5jFYiASFFbwPo4pdQNtgk7w75T8qymdcJDuPPKAW7nv/B7fpc5VbbDf/VpvTx9qHd/Ukj6j8C1yHYxTcFd9z9SOO7n7qfAXW+TuCnjBD0nttpkIxZqDuWwoG2T7A0nNf8/OTkuaimfViFpYEECzNNGdBBxU4Mccjfpqx5527MNhtc6ZjyNj4xmANPwEgv8KmMJoM/2U4Pb2v4yt2GOFqJwm0ZrO57zBQn3uJwRcFsNzIj6gKuD2d+gnmWz0= 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: W/6yFvVTm0mo9Gb7G1kirSP5OKcmPwQT6PxWpJ/dLM0ts46BzIdPHDPMi0eL6xigBVj6QK3BxOgsRlCDfpn3ObzQStQpG2yoR4jBgEwkV3Ae1U8xpQNgFhBedgMSYa5IlsgI/5XZyLnuq75psPS4OfK8WcH9Kbg7f/ceC3Fj+cP9M7QMQdcYDBfXRJrJwnhfEnOsKjFjJbeS3NgkanXJESg7aIFB1N0TvzTKX0TtGpZMXB7yRR2G9tssLlHhIBk4TcA7bJ/2ljD9jSEvwZA1DmX2GKGIRH3e8usaHrKOL4pIPdqZXKSrlq2EbzQwQBghbuKfuWB1GJ4yadQVTUG0WZtLlcLrlHbpqbYuliHcP1ggFY3OHrS/l9cYjAqu67MAIzCqZSIkr9yVfTeSuAGwYl4VbgRhNEHB9VSh7EzwdFNHjfA76tTY9d6Kec/TUZy2wEqIId9LrdtAtB1uswWw0rFnahZoLN1rMd3yTdZlBVN9UEixryHuow0zD+iExVAETJU5+CZh90/oLuQ4Cl8/eH809o95r4mqgDABgiMiey0D0zkEYHLhAyUMFf2MrwbvVOxoYrbWG2HekZgks7lbaf+Aemlel6a/4VkIptgFnYEtJQCAN/7Zi2BuA2Twt96mBJAuzYmpzEtT0fuzRmPHkLSIkjNG3SYA4xT4aY4rkzeZuRLxdROksdZOOt4ilTFOmhsS4n/fK3LrSDVrhemSKmlxPoIuEDk4YRSuuA+hDzCivh3ZDWKNy7xaWNk62s/xKxn46GcUtAbA+ZNioPe8t09zKtg4x6jdk+bcEawRxJZ0bG2eOVVntn6YMk8GGzVWV0NvAxPLW1tHORyUBMRAZKCuvrThgNPAvS5w/h5MYHAirt9uEzt5Stu1SsjgZXxJC7fLiOrMq2RQSODBrA0+Ix2MEq1dDWkYaIKwjf5dcgWqUUd690iOo6V+XQ5pSbyL7WJIT7cmQNOc1xH28MzyhJZRyDSziEOUZjgjc5H7KC967uj+1pcsM9XuqrFJfASVQOYwf9akS0DXv49ujiIS8A3Bh+91052S8b1yxfkzZp45uD0MTirmHCGFHFA/qxPGCgMKeqtb23PShvh7L5WhKA+OJPPT24hsbvUXFlbjgky5WJ2uThzxVphgw6uB3V2ytysvhn+xZhmzt04fPLkP+E0JkFb2872AH8p2NhRZo4oHW+KHOxS8uOkyOfQEfV1O0zY8/4Hj8yMlbLqhr/djjFWMGGayTc0gsHIH/LCqgvoNBWx71NLIoO8jwetGg6Kwsj7nqSsFiDl/Qp+7sQX6STTNFNkBcZybGkZBmGJ34kN6RJ8M2E8Fqb4TdxQLRZVwNGJxucQK8CYNK/cJAhzEJUT4SlxGtpQabuLaAsZtfRJo7EiFQ9pUkNrzUneqs7dT7/01DyiHsWYGN/sm/RnHtIRSRSYntyT+Gzjm/7+ETXpn0RiNER5FXq7964kjhGtz2IuzA9kx9s4egDSUxY6HLW1GzxnTqX575Sjqg3t2y9sbE9oaRj0w5pUWnTzZWr+V/1sYCjo8dGOQNdA4oeyyGKZfaJg81s1rPUNMNVa4qLIuq3VuHH5Jaqzrxznw10KvIgBewA9Vm4VnDENwz67ZYA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: a01ef9e1-99c8-42a2-4044-08dbd77e6eb9 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:42.9377 (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: iHw0mpyRp29caZHMbgS5c3gn/gxjid5YyBB+EWGvml0452XczAIxg34DoK9TL6v3DLJhEyIxkzmpyBOHcls4v7vi8Z9CBxGVHguuGX5wD3c= 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 VF 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: 7f8e73201dae ("net/nfp: move VF functions into its own file") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_ethdev_vf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev_vf.c b/drivers/net/nfp/nfp_ethdev_vf.c index b9cfb48021..2d08a07913 100644 --- a/drivers/net/nfp/nfp_ethdev_vf.c +++ b/drivers/net/nfp/nfp_ethdev_vf.c @@ -91,6 +91,8 @@ nfp_netvf_start(struct rte_eth_dev *dev) if (nfp_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. @@ -100,8 +102,6 @@ nfp_netvf_start(struct rte_eth_dev *dev) goto error; } - 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++) From patchwork Sat Oct 28 06:23:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 133553 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 EDE4743220; Sat, 28 Oct 2023 08:23:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 917F2406BA; Sat, 28 Oct 2023 08:23:49 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2103.outbound.protection.outlook.com [40.107.223.103]) by mails.dpdk.org (Postfix) with ESMTP id CEBEE402DE; Sat, 28 Oct 2023 08:23:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L/cd0Ku47mxOCmQH7hojyy8+18zjyWYdUi19685CsJksC/aSQRPSqpDcxMB9VNRl5ORkYi5rs6mqoJ3/RTBSYsXUJ6gnUNMYNqKnPrBHIrh0gaAWSIttolDBcwhW5VtvFXar3Yzt5Pnub/F6emNKkinj/hBqXdj3+mFNZtys/Z8Q6vVrCCfrT93E91RiHjQaxM9MI5j13Rag+l9qE4MirxZZpmqtswHMjaE2kqgupkDbwQFislwWEXhOaTUNuOX7t3ZFaR91xNLqm2zckOS3TZd6LdaFpSRIvIZKD/V8aOpEseBd7e1amVfTcuFGbPYK3liQS3Hdd7LlWiyt8HZFZw== 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=VW76zRL5X3TNcOyOuFKEMqd3l0X/eGDbDnHphBDgID4=; b=jaWnuHhkM6dz5Fcdrg1XwNbU0Hc2CuREw/vyernmWZ75iXq8nF5Rou6RhgtZcO4omlAj6nhKoU9YmuElC1WbrAKCYwgZZOkZGs7jMcu1SMaaxso3i//pBytFKPL8PbyR9PR3uJAG3DRLE0VMo+OAJcaIXk8yAckninV7JV2AXpk/0MhAgAo4Cno+elmVuRkHQH9IvUjOYq6jfbVZy+fpjKMDhcV4WjoZmSKYbnD/rtfg6br0bVq1dtfZ04G79POBNKuIc3LBxTg6Szye2l2BbRXc9slcDLBsKO5xVMGX5ov0tT/DjlYjFFu85MXC2Popl2otEBxejgHW365VK1oaag== 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=VW76zRL5X3TNcOyOuFKEMqd3l0X/eGDbDnHphBDgID4=; b=N6mwb1dhnV0emQpRJhSIAs/E4mYyfMK0wUt/P6knrX2pCPnvtM5nMkpRDRCp0X5cOfkragoYREAFaDaH7nniYe/XEwnq/tO5ZPGkEYtO5WCVAGwBleiMDsbuEmjdf3U/Nm7DHGoFlkzBCGAMxuE4YdNE9kNYwx4aQkm+h8wW3T4= 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:45 +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:45 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , stable@dpdk.org, Long Wu , Peng Zhang Subject: [PATCH 3/3] net/nfp: fix the reconfigure logic of set mac address Date: Sat, 28 Oct 2023 14:23:15 +0800 Message-Id: <20231028062315.1843075-4-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: 6eb3b0b1-f444-4f8f-0634-08dbd77e7026 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iVzMHBkKqnij+qjZ7Yy+124hu6cKl1929mllcEOumRXA95vt2Jm8eyvkxcGfEJOtTtWdw7Ob8IWW1wtld7koQhkbQh42aPKFi2bsA5U+9Tng5YURvIAnLGxIp9kqcvZn2QqZ9dYRoxr0n0AaDdCeMSpSbc9qon1JxcB9ntoSDJXibFF1NAly/BbGT9CDzZnDOJMWLn6D53HuyXamgpzk2B87DyyCzQR2pdEu0OBuZre2FlhGQns80npAYrssrTBjydKmtDKJbM9FCEo94rwS/pziDSBkgK0JrA2nmCsO/eSN7q4PBnekiLXyiYlObvTI9C5CcueqR0qCdR/De0rflXhurhVPDS+b7FC2HGvBUMNKT13JbpO2g81MjtmWYl4EWAx0gj3R4ik9WrcF2aCJxkdIgvh45/5Nafv0YaYKjnTEfXYJ7fdHwJMS3N6laJzS+FrwjZlDvIuUHWNkidDPxlJWqmLkjKuXSFt/mOR5U2EgwZr56ySt1behlmWca8dPkP+Ume8G3OHbRRh0xdpwuFoVpxj/2sthlVqrEkTWkH6sf7ybSvo4lyRiCoE5CaJwZk+nD9GVjSSk2gqY+lQZ4C/JCNYmTDdJtLxqjqKUulD1GBolG7pomXU5tZrerWavV5z6fCIv3VwfEKf7YWlRIvaI2YsjcD67xCh9cT9ZSjc= 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: 2lwBx+zZyf50c6EzA7QIlOQIzWoHR1nMgGgfKfqKGER0nlmPz+yFpcyBd5EoIW/nG7Gl4t/BvogkdNh5La69jee7D5+pnLnZcM515prCL5uH4uA5xKgBvb13EWXbfT0+9dXGs9sRoHJvRSdVJxo9JBtETRIGEhtNrmRe8fl4vamF204uYAq8Y6uJFgyVXGvB95bjyNqVoDhE8hxkCiM7P39e/BrNMTkgBvDlWT8x4jS5Og7F3pbNW4lWFDHUBnONSbHpsJNjSmjM926Gnw6wYgFK1CzHpULzQYCCgwKexh+XlmvJkbhEbvbCwkPu6qtdU6+bf8tW4LqNClnGn107W1jdxFSSLnqlCIz06JIPfaPzLp8EbFKSSu5uAVRZzfegSI6lsoXiHwONVgY91TGWrRgMgbbA7UJiEVqiuhtxS4o2/zF8zkorJAE2McsaKmujqd/WQ2wAnfzSMG4ogNNLzgsA9WrTLVn4k9/hTTgt9EuU71myeS2FOZGnW4aq1t4JZrakG6VuGybTXdPfCZQGCTErmmz7Q9qAYIVHzxGOk4jDa6XCumSTBXjEjQuVLPgca5V8T93YDkm9mdu+lA6cHn7ncPjHsVHso4O1fUzngfP/brVPOQTheglUxnas7G79CvVS6KHUzxau9urJ+gdsQnmQNtedxJFiWdF/Fc60yqKyV+uq0jLal8S6iFKdJEwKGVhGtaAUGCT6vjz9SWxmfJEICeH8Qkd7w7Z9HvO3b4RUDhN97LjT32DAi8kE9f4bOc1Wm5XPOlqxmBauQFLBj14Hp3bkPu6vPKu1RJlzVPLsbqg5QX+5Vfm9pzaDnVagWDseHU9O/65aREQ3jHq/joa+r0Uu0CcdKgD0TusCETxQhTPH6Q2VwqEl7kmvkKf58FJhsNhMh6PaZaNR2mpIE3WvLuLSHHqe8IxBs7/bWCtXE/PnJRFwhcMfFtpje2IEqDhXkM3IclkpY7bvC2yMfya/llv+OJn2MVDM7s6aCravYgsuo358ILaw2V02LSfw6bds1Z7dDHwwqJJ/3b8sCtJisGbF9CGyjJz+7e/vxr0ZFDFnWlcQSrf421Nll+X03p/Oz6RuUVA0cdWau+QjTxRSQ7K22ZpNWXyDG+sjZr6AVqoxnPVPMV/UqoZR1YXM4yMk7/s7GvqfSXjGPv9uWVp8y2vkawaCo37Sz20HUylp+gpeBMAPrI779VWc2QvnuAfS0sbFcv5pg+Ro3NWRvn8WjZjkgpI2mlXExRL6L+6rRWqYc4X/1AHLQ/FUOvT4dNsIRC8QfyGwWJyVpuiJDFhBLrL7NriEMdoa1dDJZr+kKvdlDFQlwMJs2ynGW33T7lpK5VyJ2y5xG57RzH7iIGUl2jSi3mSzmzRheoFw5hSmBWWWKndbvh5/FGOiDUZv8oEgnmw2QZExrpNhqFUVGTuci29x1BpZ/FHa9QgCxf6jOMikCMzRNVZSjmOEZLH2WBjHFsOTCqXys/1owBoFXcfgizebKRmhm42Ne55rT/3YRr6dUmGHqfA6Sb4Jzv6AyOPSiFHWWIcucZ3eCj/F7sr4HZ1A8WXIFKE8bzaUNOuIYuz2qNLx/GZej0AOCOAiSmK8glddgasZ5zfYg3a1SA== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6eb3b0b1-f444-4f8f-0634-08dbd77e7026 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:45.3250 (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: SrkKrfN6RUi2BSh5lcXIYIjiICb7CpLgiq2tuAfoPYIrkP80r6TyZu8OYweWp7sjQc6YnFylnWwb0mJuJUhCsxZyib8JRUufU1Lx574FdGc= 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 If the reconfigure API exit abnormally, the value in the config bar will not same with the value stored in the data structure. Fix this by add a local variable to hold the temporary value and the logic of store it when no error happen. Fixes: 2fe669f4bcd2 ("net/nfp: support MAC address change") Cc: stable@dpdk.org Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_net_common.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/nfp/nfp_net_common.c b/drivers/net/nfp/nfp_net_common.c index ac97e3bed5..a4ba16445d 100644 --- a/drivers/net/nfp/nfp_net_common.c +++ b/drivers/net/nfp/nfp_net_common.c @@ -362,8 +362,8 @@ int nfp_net_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) { - uint32_t ctrl; uint32_t update; + uint32_t new_ctrl; struct nfp_hw *hw; struct nfp_net_hw *net_hw; @@ -379,17 +379,19 @@ nfp_net_set_mac_addr(struct rte_eth_dev *dev, nfp_write_mac(hw, (uint8_t *)mac_addr); update = NFP_NET_CFG_UPDATE_MACADDR; - ctrl = hw->ctrl; + new_ctrl = hw->ctrl; if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) != 0 && (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR) != 0) - ctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR; + new_ctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR; /* Signal the NIC about the change */ - if (nfp_reconfig(hw, ctrl, update) != 0) { + if (nfp_reconfig(hw, new_ctrl, update) != 0) { PMD_DRV_LOG(ERR, "MAC address update failed"); return -EIO; } + hw->ctrl = new_ctrl; + return 0; }