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 200D8432DD for ; Thu, 9 Nov 2023 03:34:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 191EA4021F; Thu, 9 Nov 2023 03:34:47 +0100 (CET) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2134.outbound.protection.outlook.com [40.107.95.134]) by mails.dpdk.org (Postfix) with ESMTP id C3D384013F for ; Thu, 9 Nov 2023 03:34:45 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c7z1OaB/Zgmxhq93yQpScwlHLuZ8l/HRwL2nR0f0iEgkK5mJPOd4/tViK6aOVCn+RscIP1jDeFX6MnPfp9j2Ihr/2mvQe1Y3atujHkqvgH9Sx2IUPS5SXIF9fUOYIFK2vncNNF9nuefDpiKor/Pjhbm1li50NAWnc2qR8MZQxnFiLjXwoT2NUs16rpDQeKF9/NEFKPfQbZBRihjRXIB05xsjH/rJ/f4ApmmznkZS3xBjvB2n5j58lbV3JxMD93vZCqwo3T5krAOkffJ9ZFPER8/vjXxUReQny2DsNoiPZfITu427Dy8/888wguYyEDIIVPE6oBjXRPNJ8gfHbSEiHg== 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=onkk0Qx1E80rz0pjZe4siSoLbjeULbfHBL+/bU7OUv8=; b=nquPJiqdmswKR7YAvTjv92DpaGJZyL9deaPFQaT6j4k8Id7LNhTQIl4nEmqS3xGej05PwwEpl1tBlQzTQMZ1ozDPNd6Dok/cOFIeVC1TokZvm1o1RNgA2ltQMlEXAGPmrSccDhNHgLeEBdug92+yNVS/fGGhgCJI1hAr+UQA4v+JjqD5L7Dp2B+rn9464Tkoee5KzS1siuEPFp7RsWFqS2t6pWeeqbDNQPk+rMqe/TYygVmY8MfFXCJ4GVIuAFvcB4CzbXj5C7XGDz+THVdO5xPNK1MH8SfZs2ydeHtKmp1+bmQUgd5RwmkZ88l5xXVOjhICNFddNSqDiQIfQKP1MQ== 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=onkk0Qx1E80rz0pjZe4siSoLbjeULbfHBL+/bU7OUv8=; b=T0wup8LCOz+z0SYBcF86H7HC1jMmLK4l36R+D3eAdlgYLqrgbGSfUbN46xr3IrbmwSeVbU+A/k6XqEUnn+CAwtkm4ZE9koLq8OV9l+rJyEcpT/gteAfWFjBA5qjk8JFOoeHIkDdYV/SpPl/xXffTPAVs0+l0sO/0e01yzv8xVbI= 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 SN4PR13MB5791.namprd13.prod.outlook.com (2603:10b6:806:21a::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.18; Thu, 9 Nov 2023 02:34:44 +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.6954.025; Thu, 9 Nov 2023 02:34:44 +0000 From: Chaoyong He To: stable@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH 20.11] net/nfp: fix reconfigure logic of set MAC address Date: Thu, 9 Nov 2023 10:34:20 +0800 Message-Id: <20231109023420.3771726-1-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: PH8PR22CA0024.namprd22.prod.outlook.com (2603:10b6:510:2d1::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_|SN4PR13MB5791:EE_ X-MS-Office365-Filtering-Correlation-Id: 52358573-a019-4b2d-e7f6-08dbe0cc6e5a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cQ28z6TbIffJ64YIl2Lwcamn6M9ZZc3MrELuhl9KrydZtftXcS5zc8dx2X1smCyauyE5AyhwvdFLq2wapRKfCxpFosYjZMdRDZNS/XqjGovMdrLHdee1DcRS9xC6/J13EhPRcYm2BTFqxlULQRquRBRv923GeInumtBTTtNtsy6MCs6gXbxM7NIZ9FnBOgugrpoYuGFpkZ9q4EfkbFpUh69UYW7aC0NbkDQhLv6O7RYSSwxrZBqHvF74WV5XQav2l3t/0R1bIg3xRhy7ZHEw9SsqweokpsD4wo0jBY+G1ix9MaUCWGmLcjZjv8aNBzXPdKWo0qb08C6QGpKPfB9w1wv9o5McJs5ZA9z5r4dcXwScWr6Llh93eExKWxS1heleli/XIXe6WfkOdWb8Wfd0WND8rfSVTfjpH0+9mmzxSSuQulcQpIBt5qxuihnLErqDA55eqyXfuaauorG96qHSxkalrDcDvTMXl2QvQlgq5dJJe8bt3/XNoUDAxn4QeiVPmoeEx7uOjGJKMADC+f1LMTFvqu2mLMHRTx19CYOyn8udFjnIHcPIYob6yOM2klonddMsLif9c2OrGuMrph7hJjWOzO08aUaNe8dVvuOkF9Y4/y8IKu2hwV90JlbJwh+umMPaCpKyvTDg/biFyzq8xXxbBDZGj0MNTpx7YUEEyP0= 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)(39840400004)(376002)(136003)(366004)(396003)(346002)(230922051799003)(64100799003)(186009)(1800799009)(451199024)(478600001)(52116002)(5660300002)(4326008)(44832011)(2616005)(6486002)(6506007)(6666004)(8936002)(2906002)(83380400001)(8676002)(107886003)(1076003)(66476007)(26005)(66946007)(66556008)(6916009)(316002)(86362001)(41300700001)(38100700002)(6512007)(38350700005)(36756003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?H747X//OCzlkZ7/L1jNzJhSOT12bmUsD/e7iZvx+Dg9OSItOfoubBWC76hdN?= =?us-ascii?Q?ChwBdx9bg9HnX/Zo9zNxsQ9SmPJIMob8Fou/avEgA8QJ9aU9C3ZYp5CZRru4?= =?us-ascii?Q?E95Er8tCVBZ8trvPzXPlq3MZkZTGIqILZ47l/W4rWobSGhUa9tzqF+QwjYWh?= =?us-ascii?Q?nIlAxVO5r16zPCVHIjfMoNdLjwuWoPXbRKYQs/3TcqCAxoZ+aQn+qEHsUuuf?= =?us-ascii?Q?3wfWd9P8cJ9Ju0GK0FTF+lO+gaWRJx+SexkP+47KMqONnZBZSTz1XIa2NOrm?= =?us-ascii?Q?9zhV2I/uqLgENRtLVezL0PXdFQNKCLRaSumsFofGIpz+D9LZFJugaektL4fA?= =?us-ascii?Q?rfasM2KvgrCPniZq2MrmNXZmsSXa+9P0SR8r4imkX/QTsO/5/+qKvHlrntF4?= =?us-ascii?Q?TidkDtbnnUPXxQYCQqUJw4svr50tLP1PO+pxyvplnp9Vwzg1TGHnhrUT3M7l?= =?us-ascii?Q?IPKZk3rgucy/hVCVqIXl5UILxlXt9MuKpT97GXy3wTUTjdYmqOkveGsK6lt2?= =?us-ascii?Q?25OfuIga3Lfy1d8jSgrJNlFJmfduMaaqEqFrif5P7P0stE3foINw8IHX8ts7?= =?us-ascii?Q?g0r6ZOm0sGVB98Oi2XCp24zj6UhWJH96RzRW8awdoUEKqtJRALYEfDKDDOd9?= =?us-ascii?Q?ITKnEJ1XZ/rlALjWSEDt9dmeoVtJhI7+LFK1hZy/xXh/x92/yp0gGdbHB+UV?= =?us-ascii?Q?ugS/fEWxBZsuRNRNr59BeGaLj6pjzuPBVsZomRe2nakDOjJfT+LhLbp6ypvd?= =?us-ascii?Q?zE7lklTcma91gHKHo+3+HF9mYX0v8c6eVCMFNMmYjwwrvtlHFJ7A1r90FrB/?= =?us-ascii?Q?qy/HlM714IWGVt8whuqM2hPE+JwtIUn/n43CegIU6KKXOogMx0Isrrn9xEbq?= =?us-ascii?Q?+iWBZ3caKwVi0rjPlU7I3gw58kKof2l0bdidb3+ga6osZIdBqNezN5u9fhW2?= =?us-ascii?Q?G/OQL/h/GkBvjOrWRmJkG7lTXXB5qQEJC0o77UYBwLsgLqYIjQkmUqGtm8gk?= =?us-ascii?Q?99ugDlO6RTLF31UnEjJitCiOtzbhOPTmYxqjdRNBQwYpnHZQYxuFF4Q97F8u?= =?us-ascii?Q?4JwJAVkjZ5p6fnG0AQu8NWnxqn2BhqIuzwkxz1hWXp0JNpHdynuKJQkwuXWZ?= =?us-ascii?Q?dgGulpUxRST3qGOhG0evtTDSeCxPQgcb1G1kn1DU2GfJizDSdyY3Mb1UHIP9?= =?us-ascii?Q?D+IcwsQcwWUFVRAcU3eAvR3SUEGrMTvVQH2+FQwKQ6nebFta8YeNug7zTZve?= =?us-ascii?Q?jX1zQrUtIOjgFfceOyRoRiyCa2aczT8tBB8y/nyD0Tkkw93qSyzvuPmXS3/f?= =?us-ascii?Q?J8jl3EiUvI8cZRH8mw23s++xCG5e/HCvy7BvsJORqFEiU9chs7/puPkyclD3?= =?us-ascii?Q?uchTYPcDW1/P0r+grq/hsXK4+cZViAvh2hM74tMBKoUOo4Cltrz41EPmDhNt?= =?us-ascii?Q?13uAaiwQZYbaM0KFh0PRn+tpQwNovHQpUN9r1ZVKc9KeIL8IrbIfQhD+Atpx?= =?us-ascii?Q?aZ14zBm4RKdgzfMmxZJlX2hOb2PDVOaGX80hKW4Yb2GjOxOCsO9jt9D99lNR?= =?us-ascii?Q?uzuFUpY7iHQjkysgQZPczmFlrITvz8KoOtQVwjmz/LDlNTsY00DAeH91Sfrd?= =?us-ascii?Q?YQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52358573-a019-4b2d-e7f6-08dbe0cc6e5a X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Nov 2023 02:34:44.1472 (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: 5iYOwkqEMXcxAq5QTa/3X9FDVf6FJi/HcbqLWJe6QpGJAxhRI6BJdaVSJ15b3F+Nv6QJyPyTJCWkttgLVHLwaVR/r7HPd6RrqSbynxVfr0o= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN4PR13MB5791 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 d67022275d3b423850c629036d33fdfadeb874a8 ] 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") Signed-off-by: Chaoyong He --- drivers/net/nfp/nfp_net.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index 102d8f2938..ac2c99e547 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -537,7 +537,7 @@ int nfp_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) { struct nfp_net_hw *hw; - uint32_t update, ctrl; + uint32_t update, new_ctrl; hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) && @@ -552,14 +552,17 @@ nfp_set_mac_addr(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr) /* Signal the NIC about the change */ update = NFP_NET_CFG_UPDATE_MACADDR; - ctrl = hw->ctrl; + new_ctrl = hw->ctrl; if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) && (hw->cap & NFP_NET_CFG_CTRL_LIVE_ADDR)) - ctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR; - if (nfp_net_reconfig(hw, ctrl, update) < 0) { + new_ctrl |= NFP_NET_CFG_CTRL_LIVE_ADDR; + if (nfp_net_reconfig(hw, new_ctrl, update) < 0) { PMD_INIT_LOG(INFO, "MAC address update failed"); return -EIO; } + + hw->ctrl = new_ctrl; + return 0; } -- 2.39.1