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; }