From patchwork Mon May 22 08:04:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127142 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 B522B42B6F; Mon, 22 May 2023 10:05:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BECC642D3A; Mon, 22 May 2023 10:05:33 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2121.outbound.protection.outlook.com [40.107.95.121]) by mails.dpdk.org (Postfix) with ESMTP id 616A642D38 for ; Mon, 22 May 2023 10:05:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f1Zp3RDwS4SLz79hkZyaWGApZ+dpzxMLOPO6m8XhP2H82z5TCekddUHRLLbKpAEhZvP/e+v4xp9SlU2Bxlu7klGJVsCFDHdE65FhJwMtIYR7DNV85C2Y8XPFsEgV6sssLMnwYpG5GagiICM/2049Kcx+7ZlqXcUkwjEaATZSGcYvOsIxUH2CzXwRJBkTz/LH/CniqLbCwoVDxht/RX5jjQBT3jBTlDNWlh2TyFad07meOfj5UyGBa/JE3+Z6kSqLlipQsKfQ0UcqeyW4Io3pv19oRFi+6hUB1UeuZ1Gf5RBtDwF84PK6Y7a/lsU6ZgVuNrbTeBC85ztMwcM8sI4NBg== 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=HzrNLWcD2qGemt+F9aZGlHTiiqrl0N3F6XLTTr0gIW8=; b=B4uC/kTBXp+dHHW/q8XHblnn26xuMkVSv5GYkG4QP4vhbvgHEh2LFYDuncc+4VW3g6xMVL6q1BPZygSc6kWtFrCR3EcMfoF1rXnTeRdfWxulgglLz6lTozhUFo7Yb3Ao83M6EyeRu+B8+KAraqOfbBE4l82OTLcF0hMYVCYcXRVU+TbI0ECVUHmd8SyqrqtO/+9v4Hr9FbZEUgrIV3yvFXH4LE+akcyLRm+8+Uw0CsNivUo1lr54XWCDHc8oDR7Fxr8WlQOINN3QhJ+j4Rue54Cs2LGlAzmwWHkWCXINc0khvnYZhjeX3hQfgZMgDHlCqZ/DXDph8eqYCjGSDZir3g== 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=HzrNLWcD2qGemt+F9aZGlHTiiqrl0N3F6XLTTr0gIW8=; b=MQTiJ8pPegEPNLTVPSu02QzYDBNvqeAGwE4wJnv9IEeJkgkIQnJoxdRPMl5ilgY5y4zrVfsIkDfMOuAE58aJM8CWJ/MN6qOFj/nbIoDDXSC/DSpSmPQeLvWBFOL4w6pGyTYsCRDeplB3qVDR9M2d2ccGOoQmhE/E4Z5v68yqKX8= 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 SA3PR13MB6395.namprd13.prod.outlook.com (2603:10b6:806:3a0::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.13; Mon, 22 May 2023 08:05:31 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.027; Mon, 22 May 2023 08:05:31 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Qin Ke , Chaoyong He Subject: [PATCH 3/5] net/nfp: standardize the logic for nfp reconfig function Date: Mon, 22 May 2023 16:04:58 +0800 Message-Id: <20230522080500.2014001-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230522080500.2014001-1-chaoyong.he@corigine.com> References: <20230522080500.2014001-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR03CA0109.apcprd03.prod.outlook.com (2603:1096:4:91::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_|SA3PR13MB6395:EE_ X-MS-Office365-Filtering-Correlation-Id: 119a25b0-1e27-41af-235b-08db5a9b4fd4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HIy34aSyRcRMnOlfcCLqVDJw9vBf7w1y1FJtGgyDM8iEm/Gx3592yZ83z9npoBdXeEvHLNMJMgg577Ltnp6HFNUIVAfx4utN9s9MZYP/YYTwZ6yzpGglMyVEkU0V84QMscgqyMRnhIks2+1+EuDYslhd6iYt9h+Pn84S2IrdL0J1wA39dvtq8sRASLX2foZwY5AR8c6aXn9uIL5oNudo6xp6SoC+2WYwSZC6aA99qwMG+jPynDNAoKQHvxMxi8ULL/uBxQiZeAkBPfpNz7FJI/p3P0lJLAzKY4U4LXs6XVijtQ3dCvuYoTk3GXkmxOTaDWdnLcWSRgKqHFu2h9iDo8PNWUK4QFxB+M0s0CPHEvEKgncrOukqH6RVCa0FhjY9Y6Wx6qQsvqwi76Ap2j9nQ1lJYp85GPNdSHPJcQdsT2723DeB2438mi4a5/3vxaeQbhlyyFZioK9N23NEaAJl9f9uRbwNnuvWOD/Gpcoxss0QFI6obxI6qHYXxYvbNCcywGapmFqX9gPnTAeLTOEOuu4BfUlDYN08YDevajJNCiT3zLQZjF6b8xMuerHA7p+TGhSf45zmPIUXLm5kCoc9zPbFyG2c/xpKw+B/m9a0GiGViJF0tHY0kjvRWz2oi/wc 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:(13230028)(4636009)(396003)(346002)(376002)(366004)(39830400003)(136003)(451199021)(38100700002)(38350700002)(8676002)(8936002)(5660300002)(66574015)(6512007)(6506007)(1076003)(26005)(186003)(2906002)(2616005)(36756003)(83380400001)(44832011)(107886003)(86362001)(54906003)(316002)(6666004)(478600001)(4326008)(66556008)(66476007)(6916009)(66946007)(52116002)(41300700001)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?elrUUKw4emGfPmO2FdXUo3zNQi52?= =?utf-8?q?aL2pHIcQoKNBDeMLFK9FAGsshsj1+lQLh86Fo9gmnrQrndJNeumvM8xP9s/CB3+iK?= =?utf-8?q?/dNJIrbogqWvngA3S2l5ZziOsA10mr6gqEWjNI59WG5OGBgUGvj44ZD+FTOwuzl89?= =?utf-8?q?rugsjLrF/1hEuJOiMOksSCW2J7IY0lV0hqCLPDJyqQqC5rCAzEuLWGPRb14o8lTCu?= =?utf-8?q?Kcvz23/xHEvwKWFkxL3HPfHlVcg2HVvqt+zVee8SMLHZoZFLigb7zQoWd9Xgdzt7T?= =?utf-8?q?bpP7tgZu+1Ziwwpf1I/NKamhLN/uTtNsq3+7Ei2rks7qbTFAOZX78c2idX2Y3NQUb?= =?utf-8?q?JcJ59D3+148Be8ElTfWA9Ca5ICilvY3MslYuoUdrMqqGiJY+YrNv2XELjanvU3E1V?= =?utf-8?q?eDNvtTLZKG5Q6arwBQCr2/hyLf3rj1CoSlVOASoCQ5tLqGYusEEq6sogthr28p+8t?= =?utf-8?q?/BMJiO+VGYY0+3CPOcVfRAQU9HlqwpwOM66AaXYQikH4fctb4P5RPvY9k/aJyS4Q/?= =?utf-8?q?FF4INb5yGdkEKfFW5WTwDDcOw6MvXTnMywsDCTPnuORZm9RB41LBzC74HPuO7fgK/?= =?utf-8?q?NpkFMfkMcus2JdLJ/VIiO68Oti5VNZA7UhPQsoTd4+Vq4MXSlpalJxibhycCa3ZNI?= =?utf-8?q?+dAQxRn3TtbfqvgoAxpKLzOreEIb9+2yTQjdcNTyjNiABsD2EVKco7leKNaRexKqW?= =?utf-8?q?q81PmQaI6C5gtIosgWqGJehEnrlGONQxChKA5SIPdVJR+s3sxhng58DyRxmRGWAZU?= =?utf-8?q?oZwI1YERxFO5Rs/0nA8r1ldpqjiyzAab2Dd4DnQXxT5j7fxsD2lCNmqI7Lh0B/NPM?= =?utf-8?q?pCLykVnDlOcwYry14rkTss+ccJCAYHguO107LNAqJihmp0jceSE5r3xFKBgRrUpSo?= =?utf-8?q?Zdg+mfuAvGtGaa5BJQIjxApDztWX2tkpQlpoLdNzXjG0Y0WWvbzSnWCaXPLR/C/SV?= =?utf-8?q?ADMiXOUc3rf8n6Av84TbwESh3Pwly6XNJ2jcu/3A93aXtizU2hoKUAtbwV6wMWGop?= =?utf-8?q?pb99b7HusuYnCoyRIox+sGtBjxfCRS8BweadtVpibyKEJF9FBR5Fr54Px5lvAm1aI?= =?utf-8?q?3Qghl3RCtsmJSPbhsksZen7kIwhj/JQKQqXIw/fB4nXmkdl+e/hlqj+DZ3/7DCEPe?= =?utf-8?q?v7pTXH1lo9ZJeB3N4w9tOII+sD4/rfxcjgP2awklX5GZR7lAGgQqANuRLQxvNwSBM?= =?utf-8?q?LqwMyPmU8SYr6KzGD3r+gySjYjiADMUl3UHg07hdQ0MqiHHSMJRgXTR7kS8xut6WA?= =?utf-8?q?XEhjBEFeeXTxfRXyRlcQO6IBdnhnCjvElIrQbaL16hUHaYDALXHUZRiRSVWZSHdNp?= =?utf-8?q?DkeQH5Nz1dHQimZ81NbDkRQPQsvsmqHuu2PrJxnhxx07OrEKPL0KiRUEtjjIyiSHp?= =?utf-8?q?PD82bX/TpKyJlum9GktTUhW8zxkX0AMXuThaIQLBetO1BE67DJTz3qBb8J/Y7tRZr?= =?utf-8?q?4pjhtdIawfFbw8vgxeGaL8BdyVKkALP+ZHnHFg3wLXDRzhix5Y0BMHEZjWUHBAHmU?= =?utf-8?q?kj6xFsKzH4nYv1fl9kXjr6lz5w04TwttbQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 119a25b0-1e27-41af-235b-08db5a9b4fd4 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 08:05:31.0775 (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: 2+5JrKoi+9jDxFtCYRTA5DeevNr2760wpS8Ems+M1/o0tcD2g0NdrGYNO+VpRgD+QlZqUpvedFvKV+dkTICNLnJLvQXOr1bwyt1GC/HI0vM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR13MB6395 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 From: Qin Ke There are some issues about return value and code style related with nfp_net_reconfig(), standardizes them. The line of code nn_cfg_writel(hw, NFP_NET_CFG_CTRL, ctrl) only needs to be executed once, deletes the redundant line in nfp_net_start() which has called nfp_net_reconfig() including the line. Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_common.c | 32 ++++++++++++++++++-------------- drivers/net/nfp/nfp_ethdev.c | 1 - 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index c9fea765a4..0644f6f1a8 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -256,22 +256,27 @@ __nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t update) return 0; } -/* - * Reconfigure the NIC - * @nn: device to reconfigure - * @ctrl: The value for the ctrl field in the BAR config - * @update: The value for the update field in the BAR config +/** + * Reconfigure the NIC. * * Write the update word to the BAR and ping the reconfig queue. Then poll * until the firmware has acknowledged the update by zeroing the update word. + * + * @param hw + * Device to reconfigure. + * @param ctrl + * The value for the ctrl field in the BAR config. + * @param update + * The value for the update field in the BAR config. + * + * @return + * - (0) if OK to reconfigure the device. + * - (EIO) if I/O err and fail to reconfigure the device. */ int nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update) { - uint32_t err; - - PMD_DRV_LOG(DEBUG, "nfp_net_reconfig: ctrl=%08x update=%08x", - ctrl, update); + int ret; if (hw->pf_dev != NULL && hw->pf_dev->app_fw_id == NFP_APP_FW_CORE_NIC) nfp_net_notify_port_speed(hw->eth_dev); @@ -283,18 +288,17 @@ nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update) rte_wmb(); - err = __nfp_net_reconfig(hw, update); + ret = __nfp_net_reconfig(hw, update); rte_spinlock_unlock(&hw->reconfig_lock); - if (err != 0) { - PMD_INIT_LOG(ERR, "Error nfp_net reconfig for ctrl: %x update: %x", - ctrl, update); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Error nfp net reconfig: ctrl=%#08x update=%#08x", + ctrl, update); return -EIO; } return 0; - } /* diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 722ec17dce..1ddb7a92ee 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -144,7 +144,6 @@ nfp_net_start(struct rte_eth_dev *dev) if (hw->cap & NFP_NET_CFG_CTRL_RINGCFG) new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG; - nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl); if (nfp_net_reconfig(hw, new_ctrl, update) < 0) return -EIO;