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 D88A6436CB for ; Tue, 12 Dec 2023 04:11:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D2B5240A73; Tue, 12 Dec 2023 04:11:56 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2100.outbound.protection.outlook.com [40.107.236.100]) by mails.dpdk.org (Postfix) with ESMTP id 539A1402B9 for ; Tue, 12 Dec 2023 04:11:55 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RTZwsmAwonRvByVqBwtWBb7QJIQTK++j6RGyFgEa+02icLi8UR2W4igjGWTIok2T8MLCKgHJ6dwmwlQNdshs3o/Ar4QI7v6luyl5WibGXwyptjQNycs1wNbGAWzUyqYz9/54q55WKqjl3q5i5uOKr2w+gE6K/KyDZDE8ocjVZpvYx7XP10WXk1tzkqovb9CUpdSpt+MRcO4WA9DBU/uWVYjJcElRSFkp8QR7NNw1en5THi7BvlLqkudleu8ZPIPn/W5EDstJPNbv2OWhGKl0RQmTIwv7wQPcVQsQ9SgO7gb3yAYM+zy1qoOIygHTB+TEca9GdLE//Rd0nLcsNbiaLg== 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=8TUsFFR0Ym+ncNav1si8ZS2ITYpIralv3o6KIN7hdcw=; b=eGYgTASka9pgrQILctIczW0J4JsfOQMPiCbUBc2CkQlbFtoubIQfPuGxzLoXsyVZSYaJ+/PPr13qaK68108LGwCrgstZBIycwAVcFQDZ5Qkp1yZtP9Inwlefc410Yz7vijdVeA59V/0XmM6soJpHJWJwGFf2S+4/pCTcOkC3T6pVvyb+8mK0TFuOx9daMf54RxbGUvsylfrNu+oxpCKvHENJzOmhqszuqC1msUVzj2mSqacEPlwvMrzrrCyFU7Kt4zGPiE8sPl3gl/G0w10aJnX8ZP40LHMyLNmJa0UxzcrcDJ1T7ezAxASAsJJTpD78Y/UEfxiOvdyyzNRDM5bZJQ== 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=8TUsFFR0Ym+ncNav1si8ZS2ITYpIralv3o6KIN7hdcw=; b=N+JeMoNafpzTloaCnsTwp4AVi+b+6Xpp6y8+e3lGCIi0Z3voKHhQHtPaNnEzi0qGkBPpHRYi1q4IMueRyE/woF2WmGB9XDPa8P+ICVsRiaezc1kcHtikVUzcsZqu24l+To44dIx5PXJy7F3nyNcc0sUu/39IN3A00fjytCIX3yI= 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 SJ2PR13MB6353.namprd13.prod.outlook.com (2603:10b6:a03:562::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Tue, 12 Dec 2023 03:11:54 +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.7068.031; Tue, 12 Dec 2023 03:11:54 +0000 From: Chaoyong He To: stable@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 22.11] net/nfp: fix reconfigure logic of set MAC address Date: Tue, 12 Dec 2023 11:11:36 +0800 Message-Id: <20231212031136.1817003-1-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: PH7PR13CA0004.namprd13.prod.outlook.com (2603:10b6:510:174::25) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SJ2PR13MB6353:EE_ X-MS-Office365-Filtering-Correlation-Id: 8126cee4-dfa1-425f-1a8c-08dbfac01773 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RnsNs5OFpriYWn+rAVmYjt99PJ6nJeg7okoZBiXCScARUbrNxgoluKBf0b90ieerwwIjALiZnDOa6P1ogF0rz5Y4XCA0cKeeZUtmrXHS8m395Xay9i+tnLi2IW8h673ODD7LWm/nPSIPtVwa4nHr0P69IhYYCwblQxRamxkbp/tfHRjAnMq3Nb/NpoyTiT86tBomgSuOQdyxPLE3Tciv6jvCFv5SVNtdjKPytwTuDvRwqjzKFmHwUXj0ZIkKlxUMfTE4So8tETbbZwBGzDKLFOOjcB7i7duXpFGmiUiXZgoSV6npakQPPdI5iFASzrHBOswkQH12uwgEVENRPmzC/kYtwYSU51ueBhSyy2KyV3O9bZSIUs6JN+p4CFoMzbjCm0LytozLUK3WigfH3AAVa9POsd8gYmkHQleCGtSYIv0WcTy5hga+jnCKGDWvRvWfHIU8g+UE8pXAeUjXIrudnuqHZpnTPEUrNWKniCL281oTi6SAO8Ut4LlWxmiaPGY7EG1b7rw/dm8kB0VxgKnlsJjEMzps6HX8l8dB5YCXerhVLnZaueeiESexqOZAhKYLrIAXB3abIxhUi0L3bw7r5S02ANxxEoL8U1DKo00GJLdYBRtpk/rYs6hPT+TELCfvaZ386hpuwZVJGDxf2hrXvNn6CGFvUnKa3KKyJv3rREI= 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)(366004)(346002)(136003)(376002)(39840400004)(230922051799003)(1800799012)(186009)(451199024)(64100799003)(6512007)(6666004)(6506007)(2906002)(44832011)(6916009)(52116002)(66476007)(66556008)(66946007)(54906003)(38100700002)(86362001)(36756003)(38350700005)(4326008)(8676002)(5660300002)(316002)(8936002)(478600001)(6486002)(41300700001)(107886003)(2616005)(26005)(83380400001)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XkNGBtB0fzDPpB7FR9IpUyP/1K2iNIfuHuVZSoo7KLTr/wn3qtnl8N28M2ER?= =?us-ascii?Q?PWdIgjj4ZSB6z0rJ6dVjhk1yLBDfrO9kYDVyKE6NE15pJmAFaJsi6/okIXWx?= =?us-ascii?Q?R44G1NnK3uI3tVI4zLOpa+5Q0k2kt2b8U/A5o1ZKQFZl+iMFRWD6ByEv5z++?= =?us-ascii?Q?XLrZAIUGKyAoRPn/iQBCpbt8uytYnY+dOJ2PlL4ldCn36Ry2CUKTf1M3MCW6?= =?us-ascii?Q?tXWml1cR8hP23jDnM6IGzxMmGrLWNeb7+jKN4w8VXNHlfVftZfIf2kF/r5ch?= =?us-ascii?Q?PBECZoHCWFSK7e26Vt8Dw4kG5gjJnlR9+4iz0uBWsGIYh7azJ4J1ibzDFjLP?= =?us-ascii?Q?wHcYV5/sqRCaH+FLlegfuzVvIt8XvpiDRGFVznCOkA8Lpv4PJskMGBGfticd?= =?us-ascii?Q?Zg6n8rT5luNro1jAkmBqpvKXbWy/mlJTzJVM68A8GUeq26wGUyWCsp/ZbzOL?= =?us-ascii?Q?UYNRmZbx251WP6u/LIPfzrcLIdxqBMxggx+cGMQu/Yx6Y/uGoPfWzGmzMEkp?= =?us-ascii?Q?/S6yGedN0w9KGtwz4snxmzwPlO+uAhXqferEgulgFZYH/u8UW/3n4iTFjRJo?= =?us-ascii?Q?8+/dqOknMYmWGFtkyRnceiCV9QccbM6rKDSwEpqT3MPEE5bvs9WsqPg3yjRg?= =?us-ascii?Q?JEi3bDnaaXLcuOQgiWOo2IzzyjmW15H+06hB0NvCG9ypMk0wR7dIaiKX0sm7?= =?us-ascii?Q?CJ1r/C4WtG9nV3SiuHSLZnKDWf8KJWhvOC0Fc2LCMbJPZEBs8PIks84oiz4v?= =?us-ascii?Q?bnKlJjj9WyFclXhdhR1jTJn8hn4PmxesNqCfDBhuXMgF+MyBr+z/4osi9XyE?= =?us-ascii?Q?FjF/o991OU7trEv1TmZLfwZ6gD8rybVNzlZRw6ozZFxUuwIHRXn+eU7ra7Jf?= =?us-ascii?Q?YfNjopUXvbEnbY6tmdo+/mpM4rIFZZdzX5EEb7llilwvOVUVEcLl+3dt61ef?= =?us-ascii?Q?fsDqslDyI/cFcgq8U6+9QOk0FCDlwkgo7lm+qvx/N8bOY2y3bV39ln5kmjgL?= =?us-ascii?Q?frTX2jhY3J1KXAWK02vDngOvWzl4Qa0rA+lkTrTvGZRLxST2fWEGlrbe/hXg?= =?us-ascii?Q?5XWWtVekrRAhBtNwLkqsjx5nRmmatrdWWDPoiJ3nG6OgFpgHATjV8RPv2uGx?= =?us-ascii?Q?34Tnpnn9FpqzQH1qqVN66kCnW4H0yWkohkkwg2WxDgwxCa39KpI6CSJmC5Q/?= =?us-ascii?Q?y3yYh6Yj5Zlflt5OD6Jj8IkVp89IKymSxt4LzFGBz0Slm52j4bn5pjS1cfuR?= =?us-ascii?Q?ic4s9EuMBHioCnSSDnjKx2TZV6Ox33gmFlxxNa0P0cpWuJ6i/2SQGw20NhgQ?= =?us-ascii?Q?UZD6BXjCWbko8auBWiP3d4mGc1+gukeQXIwdmbpD8UXNQobjb31zWbosd3UA?= =?us-ascii?Q?PKwHMECqiK2gpf2qipuvpntiBZbOplZl2VO8JEQ5SYhS0Ysu0/mLwV+nXsJK?= =?us-ascii?Q?b6C09+NJpf01XO7c8k+tu1PKj/5+sFF5eNPP5qEPmC3DC2Bsk1Nlnf+/XfXg?= =?us-ascii?Q?3d2B2oaAdsEcmA+C0chBPno+H1mLd3S+yx6KOTdMfgKDupAbrqj6u1R+zoPY?= =?us-ascii?Q?uF1FZyOhQilfcm2JrKq8YHDXhOxiQk3TUzU8Lgb0x6eMt9aHmv8IMG1us1T2?= =?us-ascii?Q?sw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8126cee4-dfa1-425f-1a8c-08dbfac01773 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Dec 2023 03:11:53.9717 (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: pjBD1KlFXvhOQz4TrAxodPw1R5RE56RHRI7/lBJrVXf98yVzKGedbfdG7AqIk4Jq6W/kHaR/C767nJ0lfGd2mCnDq4hHnIC99ZS7DiGNUJE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR13MB6353 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 Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- 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 0fa74a43e4..33613bb2b3 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -279,7 +279,7 @@ int nfp_net_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) && @@ -294,14 +294,18 @@ nfp_net_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