From patchwork Mon Jan 15 02:54:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 135866 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 7D629438C7; Mon, 15 Jan 2024 03:55:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A286F402F1; Mon, 15 Jan 2024 03:54:57 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2130.outbound.protection.outlook.com [40.107.220.130]) by mails.dpdk.org (Postfix) with ESMTP id DE7F0402EB for ; Mon, 15 Jan 2024 03:54:55 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ERenlys53xsi64RTpTpsjTX0DKZ9t2SCHLnFKPUwdrM7GHyAKr87rgjxVy2ccpoqkQD8MMTfNdXLrDiWGfvNxc9foJB5kQmZShHre4bWtSIGnsjlHyFiu4GVgJEjy7cuBptWYN/ENAseLZCxAd7prXJU8ijSB5L/DmwH87InjOAeMo9iVyEDgOL/AJdGmlxd3OTCyn9BBdmrrovLSBcmwtKt29XVQ3sOdpuLUnw+iPshSfMn84DcNEJeIWtRmz35XhIYMuIc6mi93qWHdMLdyK6RuRchj6WLTeXvDJiUl5/RdCBZyhFQT1CJlJldt0Lr/X6+0ABt75jNt2B6xWYwQw== 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=Zi+11BAq2PS/zez7DLkZu+FVSHPN0LDTFKAJrXXgR4c=; b=mkJbEpWGeClB8zSgwhQfCMZZ7Y8QaHHCHcxZ3qcRSn39F4rDkAXggR7g5OOqNwrQBINE7F4TSw5KTPoQLqWclGj6m8BhTAqJyIBQ8cUvtzBRTZ78XG/pcCXm6D/O/YMHzTG4N6jK+EzgKlc/dBLKBfbrRPqfWOepVnn6GH4wpPV/CupMqvHF2i4qrUvgavM2Su0NNweZ4l27+Ux1DZsDn3kAvPZfi0YYk0BHLENmQrR21V7tsuNhUVg3qaDoK9a+FAFYNRohggOPxN6BLIpg1NZ3lCm+5zqUS6W4WRB1VwYffnSPd94+g9+O8cW/Ww2zpEjDRBxgCWpsYy36Am1bLg== 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=Zi+11BAq2PS/zez7DLkZu+FVSHPN0LDTFKAJrXXgR4c=; b=e5TfRAHY4Awxgvq1JAQPmucpCoYOhb0cIlpyJF67UvtfnbA2lX/qdunYVeulfpwioEaSQ1mQHnEm0xf8/fqEky7TgHkytha7Zioc0o8CTnli8VV6G8AOtmLgBbULmjGoaWCvQMnSkZeJ0MG7iOync3v5uXx24zHIBW/GKTAtT3Q= 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 BLAPR13MB4578.namprd13.prod.outlook.com (2603:10b6:208:332::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.26; Mon, 15 Jan 2024 02:54:52 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::8e02:f738:570a:f8aa]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::8e02:f738:570a:f8aa%7]) with mapi id 15.20.7181.026; Mon, 15 Jan 2024 02:54:51 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Peng Zhang , Chaoyong He , Long Wu Subject: [PATCH 4/8] net/nfp: enlarge the range of skipping loading the firmware Date: Mon, 15 Jan 2024 10:54:15 +0800 Message-Id: <20240115025419.2447759-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240115025419.2447759-1-chaoyong.he@corigine.com> References: <20240115025419.2447759-1-chaoyong.he@corigine.com> X-ClientProxiedBy: PH0PR07CA0025.namprd07.prod.outlook.com (2603:10b6:510:5::30) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BLAPR13MB4578:EE_ X-MS-Office365-Filtering-Correlation-Id: ac6cafcf-76e0-440a-c2c8-08dc15755819 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VIsbwz6y5pbWn+29fELI7Y4LCiFZfOguv+gCIJyqRX1wYKtsGVdgg9raEeeNAjE1F7HCgtcK8Q5n3aOkq0zT9/pikei28KwI9kc+mmxGjGbJ7xJiJPLqTs06O25HwPLfTigxyeKC6CH/U24U7cXwbez9jQ7JdKe9YQ161XdvEY1Xz3RXbl4bNjOWRMAPPvrdKLbInk4L443daM50zPX/H6VUGg1WXFEwHprQhqDNq2xUZjH6G2en0V916ib4VuLD+e66i7ia5YCga8NXxYnQonfPDra8AoNiRapvger76XYzsKBbhuf6CIYdMZ0kmwzmEJzTp63BhsKeburhsEyTqFz6fBtrNHyVynNFCsHPkFlI+c82LtM2FgT0LLbrv1dIOFTHOKj30//I6UEgQwx3oXlq5P9DTViNXwrgqnEi0MpZzYbrIcJI6VE5JXLyRnasg9UJ6TJXxJyN7WIiZYXDcTAtXzggF2PkB+5CxLiY0ggpIiPqoDVKAvEdyafoH369oeGdUqFDnDEN0hnf+Xs2nnDf6E87Meuc9o9y3xZcSAXH4GdR8aWNfm3sdqKY10fME4cIcWW4Swy/79QF684e+cbQv3o2aEbJNz9jLEGuwm2LlHJEc1EyaMjcjxsjOeHxZLyQYINt/XrMPW28IpALIMo2pOYR8bBoYgcb0m7OPGZaA3xlBgo+XXtx5s1MowG4 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)(376002)(396003)(346002)(366004)(136003)(39830400003)(230273577357003)(230173577357003)(230922051799003)(1800799012)(451199024)(64100799003)(186009)(83380400001)(107886003)(52116002)(36756003)(86362001)(38350700005)(6512007)(6666004)(8676002)(8936002)(4326008)(44832011)(5660300002)(2616005)(1076003)(26005)(38100700002)(66946007)(6916009)(316002)(66476007)(54906003)(66556008)(2906002)(41300700001)(6486002)(6506007)(478600001)(147533002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g+2DexU2YwAO+Q+zbqE5Zsaw09vnWkczwRAYuzfBshErG3DnxnJTYIv+RNIDRzPWFexeS6X0SRzCkG4mgPR9jQzcwd8gO08OiwbIkMI2BFDw+AkdCyD7Dnoijldo7kltkONftYuXSaLCJHIsK6P3VAoK+1HV6DMgmR8HeQEzHBUWc+t2n0qo94MwGBqoJrv6q7P2seyS6iQ7uhDtdh4DVfVN7r45I9PsPgTnu7PTm+8WerXX5gAp79EcV5oDagsdErircWgYgDrbHkUAFN+qZYSrElUdtNt0NZpj5SMOCe2t8864VvQYJLO5pKjHQ3DKraN42E712qIfiTqoV+c46yqjcLPFKmzToliaZgeVoeWgkWlEz2/t0fdxROXJHl2x5nTFOxwlIGHbDNrcusmTsn9MqNIJjmHfJ1blGIoNU/kA5qYMd/JNOaOphUF/bV0sU9DSvAmOZHGIze/f5W1Xz3g/FVKU60+DynarYkWp9bKr/ddVga5/AuSjc0I+VVVNPWBgRWFuZ1vazbEKtwv2p2omisEDzUB85yP+R6n649+oUhn8fg+jJsNYMdQ2a+twbM2+QDBlzv2+IfX3SfrT2mTcs/iiN9qsiSsPI0nPulr+iJpueIOKVBLDbzqYH45eFyxxNFruaQpHIU5EEahAlASmYvOi6MB4uq5uaPbHl8SUbQ1BdRKn8J4F63vPgERsE8aUbr4/RzkARcQ4/5siWIGNuA5uFgjGc6LXx/yBAckVq3qISR5f2lu965/SgV8km8T8BtNyTBUDTDCpVP8J6ZxJPYp2PD1kVTJHKrRNr4aB/gPaONb2LO4DOffcQ7HpQ02H8pVk5D7Ir2QpAKk3Lu+7xfeWmEJAx5WLKYjkWXR0Wn+padDDlrhQRrtxi4io8pK8ghlmiAgc2oLQgEeKBx91gZndWZ1VHc4A5GLA0Le9pqgbVp+Z1IVinNug+T/8AIeQHudDXnni7u0p6/nejXA7VafAFt7A5S0UY1fb+werc+ZXnhoAuL5mcPTh3FR4QF93cADutvz3DC4RxXa7iHmjQ6IN/Ypwq2WNZ4VQ7x21jLyHVGFKYEfuTkeT+nxe9il2qvLhn0hvz6mR+pLJKY2U2y48b4gtXhJlzuyIy5h1ouuPsthKpLgSoUSai8ercIAM2KvnPB/yoSn/WMn5sHlhjhse+50XxmbIQWOnGtU2Ljeyzo/uwPnLo+PrxBqh5ucoLcqGtf9bLBYhIItbwrve0D6ceBGtw//3Bk73duiyeCXd0SQ2WlB/QcsKvkX9atXZjyQjZpCXe3UvR02RMXGhuR2jkljZYdVdP5ikrWSkeklGsz4thPgcM3QQy+Rzj8AzknxEM1G3VE9LjkMwmJXbvwq7SKYzHkVsllDNPHSImPOqNV8nbw0l19B2iDgrpuOO06CXjdEPQYRCMzNB29Kq2eooP7ViwOIqz4EJTLUOY6LYV9CTZROz34poijiSpUklf2sxg2GwZrwOAeY+i+F2jNQ1TSri9ry3iwZun3PJ74L8zc5Q+ReEGICKctr/Vxe7NuFq284WuXMqN1hQtm/505CW0I+khQwXudfYrzW6jyBFR3E3wDn9vomnDEOmxA8Mnle9PWhpvFieisPvKw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac6cafcf-76e0-440a-c2c8-08dc15755819 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2024 02:54:51.6205 (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: OYzQPGJtTTZ32ROvV1voviUP83XZxRAn30uxfKxz+mkD7SBtd7WSQ9+hMMd6RRhfZNsynJ5q+dBS/W+ZpaLHi4FdmYtEoWtdWCw3FCdope8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR13MB4578 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: Peng Zhang Enlarge the range of skip loading firmware by add the condition there is no port with the condition of abnormal. Signed-off-by: Peng Zhang Reviewed-by: Chaoyong He Reviewed-by: Long Wu --- drivers/net/nfp/nfp_ethdev.c | 30 ++++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index e908fc8472..25f5fe483f 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -1066,28 +1066,46 @@ nfp_fw_skip_load(const struct nfp_dev_info *dev_info, uint8_t i; uint64_t tmp_beat; uint32_t port_num; + uint8_t in_use = 0; uint64_t beat[dev_info->pf_num_per_unit]; uint32_t offset[dev_info->pf_num_per_unit]; + uint8_t abnormal = dev_info->pf_num_per_unit; for (port_num = 0; port_num < dev_info->pf_num_per_unit; port_num++) { offset[port_num] = NFP_BEAT_OFFSET(port_num); beat[port_num] = nn_readq(multi_pf->beat_addr + offset[port_num]); + if (beat[port_num] == 0) + abnormal--; } - /* - * If the beats of any other port changed in 3s, - * we should not reload the firmware. - */ + if (abnormal == 0) + return true; + for (i = 0; i < 3; i++) { sleep(1); for (port_num = 0; port_num < dev_info->pf_num_per_unit; port_num++) { if (port_num == multi_pf->function_id) continue; + if (beat[port_num] == 0) + continue; + tmp_beat = nn_readq(multi_pf->beat_addr + offset[port_num]); - if (tmp_beat != beat[port_num]) - return true; + if (tmp_beat != beat[port_num]) { + in_use++; + abnormal--; + beat[port_num] = 0; + } } + + if (abnormal == 0) + return true; + } + + if (in_use != 0) { + PMD_DRV_LOG(WARNING, "Abnormal %u != 0, the nic has port which is exit abnormally.", + abnormal); + return true; } return false;