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 2A5114334C for ; Fri, 17 Nov 2023 04:16:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 21DDC406FF; Fri, 17 Nov 2023 04:16:12 +0100 (CET) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2114.outbound.protection.outlook.com [40.107.94.114]) by mails.dpdk.org (Postfix) with ESMTP id CE16A4014F for ; Fri, 17 Nov 2023 04:16:09 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EyzvtN0QFQhInJJPT54AOtRVUnR7s1vbL4p+LRcxUOzvEYEeZ5nQ3OovjI1j1tlDWqGW2OsmayOEphzP6XyXm7Fem3NhPGrci0jUXDCUrWn6u/ZTu01n9/7XZxkJF5vVh7GIR/h1LK4EmpYHGWvjDJWGMzMPpe6tkcL7WIKB685tTSlFY83Ym2dpHpmRE3ocx8GbUsYi781pt7twN1FmUNtR2g9FQNf64KOofWw6bkz1k7rfDWZ1YXqbau5WTJkmwKdgWtfQKCKi+sh4yMHbRi0FZFBXl87lKWbUok6yglzXA07SGtQrEPx6vck91I0fAR/Tk++xWLFTYvDT4QoWuQ== 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=wJIH9XXEHFzuPyxDJQ5Mo5yfyo1z0Zszx9ziNW0sUBE=; b=WBELiquYQ/UJYhGWQ3qadhfq5YJZtcRoQ1bl1GyHu74Aa/Wl97S2Bbwo0u+GnO5GSCBuzjlWRzDDEwEEux6pTdDrH1EbgQAMfa67yRdDUrXE9IVJjtLg1sKA7gTbuCJwg0A7+Pzv6vQ8cu1vWfkmAdunUm5ykawsgoiLQo4ecEDfJN+7lSwdviEHcmUnVXwJrjN/53xnCItGaOKfl0dBuBz+Vlf8hb9ZPHuGDgNLocQ3lcdJoi8mb4Py6w8lzoTGTGsr53BNv10/SuFzoTb94wnD1tx7kdiAcJUg6H5eAKXxC5Jq66IcfGD2868qiisLoju6CyF1F24eNqbAQNQMqQ== 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=wJIH9XXEHFzuPyxDJQ5Mo5yfyo1z0Zszx9ziNW0sUBE=; b=b57c7TYvQEuiA1EzZ+uec7Bg8SZhgG0GxqjYE0UNIO+0UxGeBFGyUarpW4lRYNbL1Jwa7F8fYNeCisIlDGx5ghux305uagJ4mz8S54MCL6pGhnGEvjTOvkGenn0BInPUENATy/UepXvAg8Zx3K2oX+qr7AcdvInUhLeQ3sv+24I= 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:08 +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:08 +0000 From: Chaoyong He To: stable@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He Subject: [PATCH 21.11] net/nfp: fix reconfigure logic of set MAC address Date: Fri, 17 Nov 2023 11:15:00 +0800 Message-Id: <20231117031500.1609817-5-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: ff745af5-d3f0-4791-2d09-08dbe71b8aac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QPwZXoh8tReNLfjhSdD6gwH5BrJXkP5CJUaxdL0lRyHq8cwm9KA0VnrBvQxPDJVhbh2VyuQgmU9NzpCRZdLfnK6RITRB/pRPTIF0WNW9p9atudRllimBtT9XOgI+5A0DFeqo3+xkKwjkT6Prh+NhU/HpcEDove4D1lxHr0hQ4TI34W/Yd/JANe5deK3Axiaw3ge+BiCM/I6XP4heCdjeyig1UjldHhaF0toVi5PtdKqkmclekgw/bOg2qxXu3M+YR0gk/d6xL2o+wP2+4X0i8VKsqXMG7EoPdQDzi0y7g9yfN+SzU5X5aIJBGkxier2tJ/GkK2YHPecBXXFtUOpMI1wh3wOc484OOLEjVJAgEvgyMFVcV8MzlMfSDagCSdz7ot99SDLkmOma6Cs+3YOz6MSeN5qowbjUWBZdj073zwjc5t6aqY2xbnwTPxSeXOjUj+c4zz+mvQbXuk0C7kBMriKmSMNLLz6du/5VzIxSA3pjn4hYDiowMaz26Cg5j39xITC/xzAgASUhtg1a6NdvYHkaRwWap2tCbOFJc4rn4Ab1HU5T/UVAEiDQvv2h5eyPXwJdPNCi9Q1Et9wz3TP+0Yu+jmQU+RnA4qVRg/iaaw6dmhsqkWhM8laLxkqoIccHwqdbVNigiyAyEcog3ac3GuWOODuEAZrGIl87EjE5g3g= 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?KP68k6gskh8B4RGrB3ZZdvZGUS4WnaC9bAE1CE8Rd0NfdtFxwLju039fLpD/?= =?us-ascii?Q?CPhEvEh9nst+qIPJtdzNYmbnxKe/Gp8UygYbmtckg1Ou92Cp5V84w/UB8H7L?= =?us-ascii?Q?FBVsvUmsH5R/LFvltwxdDMMJCOK1uIcpXAO78hoovtFvXDx4qtELMXxYgrpj?= =?us-ascii?Q?INUmEqsWa/Plf7Yc4jc8rhR7O98SjjycE4iqnnZOSNQ91v1uIWjV6q0RDgK8?= =?us-ascii?Q?l9WIWazJt6BfAD8AFS4iQixJlhWzXHTpoTSo+Ezr1pQ1tFAiknM6UlYUy0vN?= =?us-ascii?Q?wIMGEQWdKbnOg6zIK9S/hbigXRLC6a1oEUfRvgxoGhAgz1jAWUzFe2Gm1I6N?= =?us-ascii?Q?8HgvKTEDdtJtizsloqJuLLzL2wtxm1HO4lJRfMuGsp5O5z8EWFGiiO6ctb4q?= =?us-ascii?Q?M3k9wWLEZYGTI+N1NWN3lV5Wh3SyVtZj+3vTHEu2Ty3LMeAscRxGsvPPMtbo?= =?us-ascii?Q?K7JTpxLyiDCrwsg8A6J7/5SXl6CDytzh699cnHOEM6IDpCIrGEZQCTiI8M7s?= =?us-ascii?Q?zksuSKtz9c8dzhcAS8FeE1OHXfPOSLZkVApWKMroJl/L/IP5Vmjq179qrd3f?= =?us-ascii?Q?B8ZpdFb6Y4W73Yl4+v1gmfAnL31KTNzzmeNFqIWRehBhPJboyypnilxrh5D1?= =?us-ascii?Q?FpXYcs0ZYBwwcslD2naFXhLch36MmyfD12gJvPGTxk2dn1sYY87OGUGbzzjT?= =?us-ascii?Q?fg72ew7tf6OM4w8dsWBg9P6k+kSoCRkoIGgsmLxcYGvLifnAbahEFF7zGMiF?= =?us-ascii?Q?iQgVo5814tpphdAMIm+1D7aLGyFZFPckSEPAqcKWtwkgPYftMnZKSuSnpR9b?= =?us-ascii?Q?Y/HROp05RhZ+KKbaUlKiEzqcowzkhxQJXQy5isAxFDmOhT1DkbauyCwNuHO+?= =?us-ascii?Q?bCqTOvHP1bxxMgTUN9PfIdp2Dv/Jzf/cP02xWvJYgkUJW6D6jqReBW4GZlYn?= =?us-ascii?Q?wxA4vTRXeQKuLqDuLZbznQumuuXbe6WxSNuJzv2vTKoq6BUIOrMGSGOcrtcM?= =?us-ascii?Q?DnCx/TLfAKWgh65r1H1Utn4gMztUqANqdDe8BY2y3HALGKFNJSvqOQByTlZj?= =?us-ascii?Q?fJCDT8kVrHixhqRol3kK8IO5ilM6rtF6Mz6dqUP+Jq3zsj66R0qGUeFmotp6?= =?us-ascii?Q?3/X08wQtCRZvzqwmlemgu6DphV8+/4+zCbZIQDY2WKcml5AXDe8V7TTUF4b8?= =?us-ascii?Q?A8k43vSnPrb/sPgVr6wOCM0DmkjvI/JuhMEN6EBuxsSivdC7RFKxSJFEyr35?= =?us-ascii?Q?ppUkojQpWK2icZ/ilzkRjWdFfH6DoJuElWG1i+XqyR/nOooQwkJ0+uNDoB0X?= =?us-ascii?Q?ZcMw++ST8D9xzvz9UcwLFxUuWZZyUnik3TpOI98OTkc4H3eMdHAKP8g1IBIF?= =?us-ascii?Q?qQYWimcWmJT4jixUNt4Z+McrhTlLd5J9zoa4pOm4UZseMGQnLyYrp8W5LyeG?= =?us-ascii?Q?qdhRnWz0P2BirhwYCVd86D01dQXnuRjeBeQC8m/mPdVqgDmS0hAMBZTCRLUW?= =?us-ascii?Q?SevFmGmel0ICjQ7bt+dL5bfV6H5qZq0/ViVbbF5TxUeNG7kEr6fuNoozVajF?= =?us-ascii?Q?EphB/kN+j44YgGX1Stzqw9YDTvIJ9saV85/OlcOKGUtsa8k1Mt++TQZpMYPw?= =?us-ascii?Q?Ug=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff745af5-d3f0-4791-2d09-08dbe71b8aac 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:08.2652 (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: 5dJvhaUt3pxVz4iPGjZxrsRBYhznPHRt4WCXjyM4vRh/0OLNCm47aavITV01x3RDRdND/B873r3+41duzGQir/rlhJFyTc7WU8k0Ied/nSw= 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 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_common.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index 279c344666..7dce3cf9a9 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -277,7 +277,8 @@ 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; + uint32_t new_ctrl; hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private); if ((hw->ctrl & NFP_NET_CFG_CTRL_ENABLE) && @@ -292,14 +293,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