From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id A0AC6425C9;
Mon, 18 Sep 2023 04:48:10 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 36FC640ECF;
Mon, 18 Sep 2023 04:47:29 +0200 (CEST)
Received: from NAM12-MW2-obe.outbound.protection.outlook.com
(mail-mw2nam12on2101.outbound.protection.outlook.com [40.107.244.101])
by mails.dpdk.org (Postfix) with ESMTP id AAF8D40DC9
for <dev@dpdk.org>; Mon, 18 Sep 2023 04:47:24 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=njfirGVx+o66vxBzjutlUW4gEdDRgqKKpzLs8LjS/HM1vvpqxNiq922oJPA9Y9Gi17PEj+WD//WtDWYZ0xb7ed8QrYdeSzKrnSOwPduiDQpIjrx1aOrIELEZn3lW1z+vqfvTVzfWZAEuaULY5cPy0T4Nq2PZYi4TQKV6ZxK553007ACcxwtOrBd6ZNXhfQtbGYUOtdhkp+s9i0q+BiCMLpcA8yceV98jDo2qyEz68muQGKbrzypTKknOhM3EurY8py/TFtMDQwz+yKBbKHo/nF4aCETQGZ3cfdhg/FXP9CAvCJ9fdFSNWjYy0ntcGfSBxqDDE62Mgnm6BM0/eleGWQ==
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=P+egFwu2VaKd2IPzhwAunRRJgKBSVUVl1m3jfWok2y0=;
b=QX4fimJucUkDX9gsOreZd3dd4O8Y/ZqmwMBXiR9LTBefN8a5gi64oINS8ItmrBewwKyVGXI0hK9rHK1ktngvIYSmctpeBpfoJedwNqkiQi/tef/OFsDFUKWDJb6dJY2Y7k9Rcx13cch29RTCQrEdyJrkbFGL3PmGPmmDNunQBausz8Dij4n/BVSFg8hxne10hA6Q39LMKAH4XfbLpghnkYo6E/PJbz4GhWUPbQEUDApb9A59/RjwSk/KkcCEEkk/poahu3+0PvXCuFm3c1EF1UmblLayFTcAya7PDuOmPfEed2RC6fkgn6rkidaCoe1ZORo5OYunlevlY7uxa3Dz1Q==
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=P+egFwu2VaKd2IPzhwAunRRJgKBSVUVl1m3jfWok2y0=;
b=OlVp6pKWbxQHTeMeLAY2E+GMPfLjqb1QOS72uq7yc77MrrwgWhHo9O79md6vaVCd6oySaZXnifinwvnVz7bsp++BtnDKhGmKUQPQdy4dD6JuIUA9EetpL4O2xETqXorCUC1oO+kmcHV34WtwDO16YeScGpRzAPx1FpiLfgzeFgA=
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 PH7PR13MB6435.namprd13.prod.outlook.com (2603:10b6:510:2ea::9)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.26; Mon, 18 Sep
2023 02:47:22 +0000
Received: from SJ0PR13MB5545.namprd13.prod.outlook.com
([fe80::7a1c:2887:348a:84bd]) by SJ0PR13MB5545.namprd13.prod.outlook.com
([fe80::7a1c:2887:348a:84bd%6]) with mapi id 15.20.6792.026; Mon, 18 Sep 2023
02:47:22 +0000
From: Chaoyong He <chaoyong.he@corigine.com>
To: dev@dpdk.org
Cc: Chaoyong He <chaoyong.he@corigine.com>,
=?UTF-8?q?Niklas=20S=C3=B6derlund?= <niklas.soderlund@corigine.com>
Subject: [PATCH v4 06/26] net/nfp: adjust the log statement
Date: Mon, 18 Sep 2023 10:45:52 +0800
Message-Id: <20230918024612.1600536-7-chaoyong.he@corigine.com>
X-Mailer: git-send-email 2.39.1
In-Reply-To: <20230918024612.1600536-1-chaoyong.he@corigine.com>
References: <20230915091551.1459606-1-chaoyong.he@corigine.com>
<20230918024612.1600536-1-chaoyong.he@corigine.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-ClientProxiedBy: SE2P216CA0016.KORP216.PROD.OUTLOOK.COM
(2603:1096:101:114::20) To SJ0PR13MB5545.namprd13.prod.outlook.com
(2603:10b6:a03:424::5)
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|PH7PR13MB6435:EE_
X-MS-Office365-Filtering-Correlation-Id: 64ebf28e-43d2-4631-38a7-08dbb7f1958d
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: +lYEt1ycRUIsX6Py3zE4BTNvt8QOzoqTLTQFJM2zkJLtzej6kUH+RtY0srOaTA9GgOnAuv/MhSHkOOwqOjyiy/mGCAcmSobv573C4+MKo7ImDIrr4tpE0rop3rPiq8qaI1DaTIVR0abDciLQeT5eSb+eJfQy7W7vRWpziDJT6oTCXdcBKHm+5USMzfZgEaSbOZJSRbTLkNtX3DXIfLQHPSUnNSEF8dgEgEiGDW4Hx7DhMTwccCf/qEGm6BjS+wSwLNwBTfGq1Kdm/eX4tnKYQm+r3Rgac7UYv0eGRzs0939aEmsg7EcmAsASFYsEVV30DZ447W3M0amIzZADq47e5JiQwApK43yIXCBoNy8nd2H0LVo35nlni2Mq1qanZbxaFoOaay2j+iXtu058aCzYaDbmVqGEPcRt3e5m74j9UMeFoY5ryv2ZiOEDH6sLovtmN+A4j6y5bhtl1N49iBrqUh6HhWANAHUHuCmPZQJfvJ4WbT/BuPFX1miGM4blNrsQ8xl+8YVA+SBg2i2gAxEOixtGSiBsbWzN+4EzNdWk1CTFibw8YEqI5L4WDAEdABnhWgq11of8AtAO3Dk8VD0EwItmkaYs8fSdEUR9EzHJtoZDMhRHfbBw2U1XX1FAehzDcHl7uM+S36y2uqxjkCPTczzYeyRvDFtruRyWKULPFOU=
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)(136003)(346002)(366004)(376002)(396003)(1800799009)(451199024)(186009)(54906003)(66476007)(66946007)(66574015)(41300700001)(6916009)(316002)(8676002)(4326008)(8936002)(52116002)(6506007)(6486002)(6512007)(478600001)(6666004)(83380400001)(26005)(1076003)(2616005)(107886003)(86362001)(2906002)(30864003)(44832011)(38100700002)(38350700002)(5660300002)(36756003)(66556008);
DIR:OUT; SFP:1102;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?N1UwaGlWQWhYQ245K2lQeWtRSFpVdjM5LzlLL01KK2NkdlRYZ0FybUZpenlr?=
=?utf-8?B?dlRqVGlJdDNNWlc1UzNUa1ZhcU9QZGw5S0hwRnNER3F4M2RCek9RRkVkQW1r?=
=?utf-8?B?TWdrVTJRaUlWdXZaUERhSnBZZnJpSmxRd2xJR3VWY0tDc3hYSWZkQUZEQWhp?=
=?utf-8?B?WTM1NkVMWGxRUzEwNGhVZ2x5UWREaG5PckdRaXM0U0lxZHpYR25vdkpNY0dw?=
=?utf-8?B?bEtmVlpnMi9XZ3o1cDFiMCsxRUtscTMyRkhXWmlNcUpmbVZ3UFdyZWxESWk2?=
=?utf-8?B?UWk1YjZPaVAvUnhuUkttcjkveEFUZ0kxY29US1RoTkpxR3hnVmdBQXJCeFRs?=
=?utf-8?B?T3BHVmlBdy95bUQ1amRiZ0VrREhsR2VXREJQMXMvQUtMb29yZFdJSUxTY3JH?=
=?utf-8?B?RVZFMytjR3AzSTZDbm5vSE5IZzJPYW9vcEp4NWUrbnJORDZEQ3hwK1d5WndK?=
=?utf-8?B?REFQTW5raXlmZEkwLzFvQWlCZlRIWmxQc1dzdkNPT3Q1VkJVcThBU3F3SWtW?=
=?utf-8?B?eG5kdkNoaVJyalJMa0o3MElSZmxrTVc4WkIzVGQvcHpGZEdZdjhhcCtURDFF?=
=?utf-8?B?ZUdOcUtPVnRtY3EzNDNSNG9CRy9IRC9qbGxpV1lDdi9jTHVCRFpPSlEvQmdP?=
=?utf-8?B?TW8rMHlocG82UmZ3ZGZCSTZtRVdDaEMzK25NeXd5TFZKazFYam9tdzdPckhv?=
=?utf-8?B?QjgxNzFrcGpCSDBTdDdJc3cvL0R3Z1dncm5VM1I3Y1V2bk5ieWQwbWVSL1JP?=
=?utf-8?B?bnl5SG1lamRwOGVUZUp1V2xHRlFTcjJQVllCMDlhMzJKTFl2bWloRTlsMUdu?=
=?utf-8?B?dk4wSUlDWUpaRlkxcnZLRnNXaTlCQnV3b1YvdXZvU0M1eXRKM1FSZDZsOEFq?=
=?utf-8?B?aTRsZjFOcC9aRHZxckdsdlIyRjI2YXMzMUJ4cWhEOUZSSWN1a0pTcDVobW0y?=
=?utf-8?B?VW5uV3lMQnRmZU5MRUNPZCtMWmF3d213M0JQa2lSZEtzNktWY09OSFFrVUVE?=
=?utf-8?B?dXRDdlY3bHMxNjlNOFRvNnN3aU0yWHhvc3FSYkNFN1NyTnYza2pSY0trRzcx?=
=?utf-8?B?TDhQWEE1c25ZeXR1bVNVT0s1K3g5RFd0c3ZRZ0JmWXlXVXBVL0pMUzBiYWFp?=
=?utf-8?B?bHhIbnYrOGJtYmRxV1hwaUJqcjRHcGRxajVJbXFVanNKMm5wbW9iUkg5VnJU?=
=?utf-8?B?UXBLVU0rQnBLSGwySUErd2NnbVVvWnRLcWtVT25ES2lJNmVUamlzckhsSXh6?=
=?utf-8?B?cVhzdXZvaHRKSytObEV4RWtVbk1Oc3MvK0ZNc0E4eEh2OFV0OEJuMGt6WFRK?=
=?utf-8?B?bFV3clJsWXRwcGdlb2FRbDM1cFFGcFVTZG1pMyt3TFd2ZFlSRVNKK3RYeDFF?=
=?utf-8?B?UzUzQnNmL2lsY2ptTnp3bjhuNk5IZmpxWDVQc1RIRkFjQkFIZ0duNWJjTTZP?=
=?utf-8?B?L2xaakZNQXhmYldZN0t5VmU0Ky93dEJHbGNGQnFxMnhLYjRveEFCNXA3SFZs?=
=?utf-8?B?Q2FLbVFjWXhxQkpEeWFHeEwzTzc3Nmp1T09EYW1URGtwOXgrcVlQLzF2NzJ4?=
=?utf-8?B?cnpOMjdiUWx5RzZIa1dUWHFrQXFlaWliQjRSTTIrTnBRdzZPeGU2MUtldWNk?=
=?utf-8?B?L0FiKzh6Nm1rK1pmbFJXMEtmRjQrM0lFMzNzemV4aWl2L2NsbGdmd2w1S0ll?=
=?utf-8?B?cDJRdDlrcTRZcmlTMVVZSkFqa0JMcDJ2TFJzQ1RncGRqdE5KV3MvL094aVJ2?=
=?utf-8?B?aW1rQWU2S2lMaE1RWGJ0ZGlmZXJQSm8xeGRiNDlSTFJSdGFhaUhCc0hrYy9Z?=
=?utf-8?B?bUUzM1JwRTErZnJ6Q3VpbVVjQVlCdVZocHJVdmZiZHEyQjJoaHFNaUZRTm1v?=
=?utf-8?B?U2wzNUVDN2dGR1cwb0xMYzBadHpZS2RtbFlRbVpKeHN0bGpCcGZUbkxqaHZk?=
=?utf-8?B?a2Vtc3phTFpucUkrQTNhMW5rQjNibjBNd3lRLzVYVEN4WDNxYlBJNkRCWTU0?=
=?utf-8?B?cTF6Nmt6bFZtSDFaREVzdFlLYVdWUEtpVGx3RjFOQW1BUjZVYlVUMDd5bHZZ?=
=?utf-8?B?SGlodmsyUCtzREprVUVrcG9RNWQ5T2t1aVdZSWhrQWhhOTcwaGs4NERwSUJS?=
=?utf-8?B?Tk51SUJ6VWFvQU5VK2s2dm9XeDVjbFY2cWdTdDJheVFyUmcwcUc0bW90S2pI?=
=?utf-8?B?YWc9PQ==?=
X-OriginatorOrg: corigine.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 64ebf28e-43d2-4631-38a7-08dbb7f1958d
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Sep 2023 02:47:22.8883 (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: dhSJWEp0E2nH0X8Fc17PlA8pwMGtHncpieW5rrw+bX7esWcDqJiRpgSA4Kh2cN/eN1msnuqDWmLh/WRbx0pMrG3sDgrMumsmmcyE2YigV9Q=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR13MB6435
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Add log statement to the important control logic, which means
more strict check of the return value of function call.
Also remove some verbose info log statement.
Signed-off-by: Chaoyong He <chaoyong.he@corigine.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@corigine.com>
---
drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 37 ++++++----------------
drivers/net/nfp/nfpcore/nfp_cppcore.c | 20 +++++++++---
drivers/net/nfp/nfpcore/nfp_hwinfo.c | 28 ++++++++--------
drivers/net/nfp/nfpcore/nfp_mip.c | 7 ++--
drivers/net/nfp/nfpcore/nfp_mutex.c | 5 +--
drivers/net/nfp/nfpcore/nfp_nffw.c | 9 ++++--
drivers/net/nfp/nfpcore/nfp_nsp.c | 25 +++++++++++----
drivers/net/nfp/nfpcore/nfp_nsp_eth.c | 10 +++---
drivers/net/nfp/nfpcore/nfp_resource.c | 17 +++++++---
drivers/net/nfp/nfpcore/nfp_rtsym.c | 14 +++-----
10 files changed, 92 insertions(+), 80 deletions(-)
diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
index 78beee07ef..bdf4a658f5 100644
--- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
+++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c
@@ -174,18 +174,10 @@ nfp_compute_bar(const struct nfp_bar *bar,
newcfg |= NFP_PCIE_BAR_PCIE2CPP_ACTION_BASEADDRESS(act);
newcfg |= NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS(tok);
- if ((offset & mask) != ((offset + size - 1) & mask)) {
- PMD_DRV_LOG(ERR, "BAR%d: Won't use for Fixed mapping <%#llx,%#llx>, action=%d BAR too small (0x%llx)",
- bar->index, (unsigned long long)offset,
- (unsigned long long)(offset + size), act,
- (unsigned long long)mask);
+ if ((offset & mask) != ((offset + size - 1) & mask))
return -EINVAL;
- }
- offset &= mask;
- PMD_DRV_LOG(DEBUG, "BAR%d: Created Fixed mapping %d:%d:%d:0x%#llx-0x%#llx>",
- bar->index, tgt, act, tok, (unsigned long long)offset,
- (unsigned long long)(offset + mask));
+ offset &= mask;
bitsize = 40 - 16;
} else {
@@ -198,30 +190,16 @@ nfp_compute_bar(const struct nfp_bar *bar,
newcfg |= NFP_PCIE_BAR_PCIE2CPP_TARGET_BASEADDRESS(tgt);
newcfg |= NFP_PCIE_BAR_PCIE2CPP_TOKEN_BASEADDRESS(tok);
- if ((offset & mask) != ((offset + size - 1) & mask)) {
- PMD_DRV_LOG(ERR, "BAR%d: Won't use for bulk mapping <%#llx,%#llx> target=%d, token=%d BAR too small (%#llx) - (%#llx != %#llx).",
- bar->index, (unsigned long long)offset,
- (unsigned long long)(offset + size),
- tgt, tok, (unsigned long long)mask,
- (unsigned long long)(offset & mask),
- (unsigned long long)(offset + size - 1) & mask);
+ if ((offset & mask) != ((offset + size - 1) & mask))
return -EINVAL;
- }
offset &= mask;
- PMD_DRV_LOG(DEBUG, "BAR%d: Created bulk mapping %d:x:%d:%#llx-%#llx",
- bar->index, tgt, tok, (unsigned long long)offset,
- (unsigned long long)(offset + ~mask));
-
bitsize = 40 - 21;
}
- if (bar->bitsize < bitsize) {
- PMD_DRV_LOG(ERR, "BAR%d: Too small for %d:%d:%d", bar->index,
- tgt, tok, act);
+ if (bar->bitsize < bitsize)
return -EINVAL;
- }
newcfg |= offset >> bitsize;
@@ -254,7 +232,6 @@ nfp_bar_write(struct nfp_pcie_user *nfp,
*(uint32_t *)(bar->csr) = newcfg;
bar->barcfg = newcfg;
- PMD_DRV_LOG(DEBUG, "BAR%d: updated to 0x%08x", bar->index, newcfg);
return 0;
}
@@ -795,7 +772,11 @@ nfp6000_init(struct nfp_cpp *cpp,
desc->cfg = dev->mem_resource[0].addr;
desc->dev_id = dev->addr.function & 0x7;
- nfp_enable_bars(desc);
+ ret = nfp_enable_bars(desc);
+ if (ret != 0) {
+ PMD_DRV_LOG(ERR, "Enable bars failed");
+ return -1;
+ }
nfp_cpp_priv_set(cpp, desc);
diff --git a/drivers/net/nfp/nfpcore/nfp_cppcore.c b/drivers/net/nfp/nfpcore/nfp_cppcore.c
index 2e5a4e7349..e2af888a28 100644
--- a/drivers/net/nfp/nfpcore/nfp_cppcore.c
+++ b/drivers/net/nfp/nfpcore/nfp_cppcore.c
@@ -200,6 +200,7 @@ nfp_cpp_area_alloc_with_name(struct nfp_cpp *cpp,
err = cpp->op->area_init(area, dest, address, size);
if (err < 0) {
+ PMD_DRV_LOG(ERR, "Area init op failed");
free(area);
return NULL;
}
@@ -243,10 +244,13 @@ nfp_cpp_area_alloc_acquire(struct nfp_cpp *cpp,
struct nfp_cpp_area *area;
area = nfp_cpp_area_alloc(cpp, destination, address, size);
- if (area == NULL)
+ if (area == NULL) {
+ PMD_DRV_LOG(ERR, "Failed to allocate CPP area");
return NULL;
+ }
if (nfp_cpp_area_acquire(area) != 0) {
+ PMD_DRV_LOG(ERR, "Failed to acquire CPP area");
nfp_cpp_area_free(area);
return NULL;
}
@@ -294,8 +298,10 @@ nfp_cpp_area_acquire(struct nfp_cpp_area *area)
if (area->cpp->op->area_acquire != NULL) {
int err = area->cpp->op->area_acquire(area);
- if (err < 0)
+ if (err < 0) {
+ PMD_DRV_LOG(ERR, "Area acquire op failed");
return -1;
+ }
}
return 0;
@@ -662,7 +668,7 @@ nfp_cpp_read(struct nfp_cpp *cpp,
area = nfp_cpp_area_alloc_acquire(cpp, destination, address, length);
if (area == NULL) {
- PMD_DRV_LOG(ERR, "Area allocation/acquire failed");
+ PMD_DRV_LOG(ERR, "Area allocation/acquire failed for read");
return -1;
}
@@ -691,8 +697,10 @@ nfp_cpp_write(struct nfp_cpp *cpp,
struct nfp_cpp_area *area;
area = nfp_cpp_area_alloc_acquire(cpp, destination, address, length);
- if (area == NULL)
+ if (area == NULL) {
+ PMD_DRV_LOG(ERR, "Area allocation/acquire failed for write");
return -1;
+ }
err = nfp_cpp_area_write(area, 0, kernel_vaddr, length);
@@ -746,8 +754,10 @@ nfp_cpp_map_area(struct nfp_cpp *cpp,
uint8_t *res;
*area = nfp_cpp_area_alloc_acquire(cpp, cpp_id, addr, size);
- if (*area == NULL)
+ if (*area == NULL) {
+ PMD_DRV_LOG(ERR, "Area allocation/acquire failed for map");
goto err_eio;
+ }
res = nfp_cpp_area_iomem(*area);
if (res == NULL)
diff --git a/drivers/net/nfp/nfpcore/nfp_hwinfo.c b/drivers/net/nfp/nfpcore/nfp_hwinfo.c
index 819761eda0..b658b5e900 100644
--- a/drivers/net/nfp/nfpcore/nfp_hwinfo.c
+++ b/drivers/net/nfp/nfpcore/nfp_hwinfo.c
@@ -74,7 +74,7 @@ nfp_hwinfo_db_validate(struct nfp_hwinfo *db,
new_crc = nfp_crc32_posix((char *)db, size);
crc = (uint32_t *)(db->start + size);
if (new_crc != *crc) {
- PMD_DRV_LOG(ERR, "Corrupt hwinfo table (CRC mismatch) calculated 0x%x, expected 0x%x",
+ PMD_DRV_LOG(ERR, "CRC mismatch, calculated %#x, expected %#x",
new_crc, *crc);
return -EINVAL;
}
@@ -94,34 +94,36 @@ nfp_hwinfo_try_fetch(struct nfp_cpp *cpp,
struct nfp_hwinfo *header;
res = nfp_resource_acquire(cpp, NFP_RESOURCE_NFP_HWINFO);
- if (res) {
- cpp_id = nfp_resource_cpp_id(res);
- cpp_addr = nfp_resource_address(res);
- *cpp_size = nfp_resource_size(res);
+ if (res == NULL) {
+ PMD_DRV_LOG(ERR, "HWInfo - acquire resource failed");
+ return NULL;
+ }
- nfp_resource_release(res);
+ cpp_id = nfp_resource_cpp_id(res);
+ cpp_addr = nfp_resource_address(res);
+ *cpp_size = nfp_resource_size(res);
- if (*cpp_size < HWINFO_SIZE_MIN)
- return NULL;
- } else {
+ nfp_resource_release(res);
+
+ if (*cpp_size < HWINFO_SIZE_MIN)
return NULL;
- }
db = malloc(*cpp_size + 1);
if (db == NULL)
return NULL;
err = nfp_cpp_read(cpp, cpp_id, cpp_addr, db, *cpp_size);
- if (err != (int)*cpp_size)
+ if (err != (int)*cpp_size) {
+ PMD_DRV_LOG(ERR, "HWInfo - CPP read error %d", err);
goto exit_free;
+ }
header = (void *)db;
- PMD_DRV_LOG(DEBUG, "NFP HWINFO header: %#08x", *(uint32_t *)header);
if (nfp_hwinfo_is_updating(header))
goto exit_free;
if (header->version != NFP_HWINFO_VERSION_2) {
- PMD_DRV_LOG(DEBUG, "Unknown HWInfo version: 0x%08x",
+ PMD_DRV_LOG(ERR, "Unknown HWInfo version: %#08x",
header->version);
goto exit_free;
}
diff --git a/drivers/net/nfp/nfpcore/nfp_mip.c b/drivers/net/nfp/nfpcore/nfp_mip.c
index 1e601313b4..086e82db70 100644
--- a/drivers/net/nfp/nfpcore/nfp_mip.c
+++ b/drivers/net/nfp/nfpcore/nfp_mip.c
@@ -46,16 +46,16 @@ nfp_mip_try_read(struct nfp_cpp *cpp,
ret = nfp_cpp_read(cpp, cpp_id, addr, mip, sizeof(*mip));
if (ret != sizeof(*mip)) {
- PMD_DRV_LOG(ERR, "Failed to read MIP data (%d, %zu)", ret, sizeof(*mip));
+ PMD_DRV_LOG(ERR, "Failed to read MIP data");
return -EIO;
}
if (mip->signature != NFP_MIP_SIGNATURE) {
- PMD_DRV_LOG(ERR, "Incorrect MIP signature (0x%08x)",
+ PMD_DRV_LOG(ERR, "Incorrect MIP signature %#08x",
rte_le_to_cpu_32(mip->signature));
return -EINVAL;
}
if (mip->mip_version != NFP_MIP_VERSION) {
- PMD_DRV_LOG(ERR, "Unsupported MIP version (%d)",
+ PMD_DRV_LOG(ERR, "Unsupported MIP version %d",
rte_le_to_cpu_32(mip->mip_version));
return -EINVAL;
}
@@ -109,6 +109,7 @@ nfp_mip_open(struct nfp_cpp *cpp)
err = nfp_mip_read_resource(cpp, mip);
if (err != 0) {
+ PMD_DRV_LOG(ERR, "Failed to read MIP resource");
free(mip);
return NULL;
}
diff --git a/drivers/net/nfp/nfpcore/nfp_mutex.c b/drivers/net/nfp/nfpcore/nfp_mutex.c
index 5be437b354..82919d8270 100644
--- a/drivers/net/nfp/nfpcore/nfp_mutex.c
+++ b/drivers/net/nfp/nfpcore/nfp_mutex.c
@@ -221,10 +221,7 @@ nfp_cpp_mutex_lock(struct nfp_cpp_mutex *mutex)
if (err < 0 && err != -EBUSY)
return err;
if (time(NULL) >= warn_at) {
- PMD_DRV_LOG(ERR, "Warning: waiting for NFP mutex usage:%u depth:%hd] "
- "target:%d key:%08x] addr:%" PRIx64,
- mutex->usage, mutex->depth, mutex->target,
- mutex->key, mutex->address);
+ PMD_DRV_LOG(WARNING, "Waiting for NFP mutex...");
warn_at = time(NULL) + 60;
}
sched_yield();
diff --git a/drivers/net/nfp/nfpcore/nfp_nffw.c b/drivers/net/nfp/nfpcore/nfp_nffw.c
index 9123fc742a..b5a354137d 100644
--- a/drivers/net/nfp/nfpcore/nfp_nffw.c
+++ b/drivers/net/nfp/nfpcore/nfp_nffw.c
@@ -3,6 +3,7 @@
* All rights reserved.
*/
+#include "../nfp_logs.h"
#include "nfp_cpp.h"
#include "nfp_nffw.h"
#include "nfp_mip.h"
@@ -132,8 +133,10 @@ nfp_nffw_info_open(struct nfp_cpp *cpp)
memset(state, 0, sizeof(*state));
state->res = nfp_resource_acquire(cpp, NFP_RESOURCE_NFP_NFFW);
- if (state->res == NULL)
+ if (state->res == NULL) {
+ PMD_DRV_LOG(ERR, "NFFW - acquire resource failed");
goto err_free;
+ }
fwinf = &state->fwinf;
@@ -143,8 +146,10 @@ nfp_nffw_info_open(struct nfp_cpp *cpp)
err = nfp_cpp_read(cpp, nfp_resource_cpp_id(state->res),
nfp_resource_address(state->res),
fwinf, sizeof(*fwinf));
- if (err < (int)sizeof(*fwinf))
+ if (err < (int)sizeof(*fwinf)) {
+ PMD_DRV_LOG(ERR, "NFFW - CPP read error %d", err);
goto err_release;
+ }
if (nffw_res_flg_init_get(fwinf) == 0)
goto err_release;
diff --git a/drivers/net/nfp/nfpcore/nfp_nsp.c b/drivers/net/nfp/nfpcore/nfp_nsp.c
index 4861772a98..ff19446173 100644
--- a/drivers/net/nfp/nfpcore/nfp_nsp.c
+++ b/drivers/net/nfp/nfpcore/nfp_nsp.c
@@ -82,8 +82,10 @@ nfp_nsp_check(struct nfp_nsp *state)
nsp_status = nfp_resource_address(state->res) + NSP_STATUS;
err = nfp_cpp_readq(cpp, nsp_cpp, nsp_status, ®);
- if (err < 0)
+ if (err < 0) {
+ PMD_DRV_LOG(ERR, "NSP - CPP readq failed %d", err);
return err;
+ }
if (FIELD_GET(NSP_STATUS_MAGIC, reg) != NSP_MAGIC) {
PMD_DRV_LOG(ERR, "Cannot detect NFP Service Processor");
@@ -119,8 +121,10 @@ nfp_nsp_open(struct nfp_cpp *cpp)
struct nfp_resource *res;
res = nfp_resource_acquire(cpp, NFP_RESOURCE_NSP);
- if (res == NULL)
+ if (res == NULL) {
+ PMD_DRV_LOG(ERR, "NSP - resource acquire failed");
return NULL;
+ }
state = malloc(sizeof(*state));
if (state == NULL) {
@@ -133,6 +137,7 @@ nfp_nsp_open(struct nfp_cpp *cpp)
err = nfp_nsp_check(state);
if (err != 0) {
+ PMD_DRV_LOG(ERR, "NSP - check failed");
nfp_nsp_close(state);
return NULL;
}
@@ -180,8 +185,10 @@ nfp_nsp_wait_reg(struct nfp_cpp *cpp,
for (;;) {
err = nfp_cpp_readq(cpp, nsp_cpp, addr, reg);
- if (err < 0)
+ if (err < 0) {
+ PMD_DRV_LOG(ERR, "NSP - CPP readq failed");
return err;
+ }
if ((*reg & mask) == val)
return 0;
@@ -234,8 +241,10 @@ nfp_nsp_command(struct nfp_nsp *state,
nsp_buffer = nsp_base + NSP_BUFFER;
err = nfp_nsp_check(state);
- if (err != 0)
+ if (err != 0) {
+ PMD_DRV_LOG(ERR, "Check NSP command failed");
return err;
+ }
if (!FIELD_FIT(NSP_BUFFER_CPP, buff_cpp >> 8) ||
!FIELD_FIT(NSP_BUFFER_ADDRESS, buff_addr)) {
@@ -261,7 +270,7 @@ nfp_nsp_command(struct nfp_nsp *state,
err = nfp_nsp_wait_reg(cpp, ®, nsp_cpp, nsp_command,
NSP_COMMAND_START, 0);
if (err != 0) {
- PMD_DRV_LOG(ERR, "Error %d waiting for code 0x%04x to start",
+ PMD_DRV_LOG(ERR, "Error %d waiting for code %#04x to start",
err, code);
return err;
}
@@ -270,7 +279,7 @@ nfp_nsp_command(struct nfp_nsp *state,
err = nfp_nsp_wait_reg(cpp, ®, nsp_cpp, nsp_status,
NSP_STATUS_BUSY, 0);
if (err != 0) {
- PMD_DRV_LOG(ERR, "Error %d waiting for code 0x%04x to start",
+ PMD_DRV_LOG(ERR, "Error %d waiting for code %#04x to complete",
err, code);
return err;
}
@@ -352,8 +361,10 @@ nfp_nsp_command_buf(struct nfp_nsp *nsp,
}
ret = nfp_nsp_command(nsp, code, option, cpp_id, cpp_buf);
- if (ret < 0)
+ if (ret < 0) {
+ PMD_DRV_LOG(ERR, "NSP command failed");
return ret;
+ }
if (out_buf != NULL && out_size > 0) {
err = nfp_cpp_read(cpp, cpp_id, cpp_buf, out_buf, out_size);
diff --git a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c
index 9b7c8aa7f8..74daa92aed 100644
--- a/drivers/net/nfp/nfpcore/nfp_nsp_eth.c
+++ b/drivers/net/nfp/nfpcore/nfp_nsp_eth.c
@@ -260,7 +260,7 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp)
memset(entries, 0, NSP_ETH_TABLE_SIZE);
ret = nfp_nsp_read_eth_table(nsp, entries, NSP_ETH_TABLE_SIZE);
if (ret < 0) {
- PMD_DRV_LOG(ERR, "reading port table failed %d", ret);
+ PMD_DRV_LOG(ERR, "Reading port table failed %d", ret);
goto err;
}
@@ -279,7 +279,7 @@ __nfp_eth_read_ports(struct nfp_nsp *nsp)
* above.
*/
if (ret != 0 && ret != cnt) {
- PMD_DRV_LOG(ERR, "table entry count (%d) unmatch entries present (%d)",
+ PMD_DRV_LOG(ERR, "Table entry count (%d) unmatch entries present (%d)",
ret, cnt);
goto err;
}
@@ -358,12 +358,12 @@ nfp_eth_config_start(struct nfp_cpp *cpp,
ret = nfp_nsp_read_eth_table(nsp, entries, NSP_ETH_TABLE_SIZE);
if (ret < 0) {
- PMD_DRV_LOG(ERR, "reading port table failed %d", ret);
+ PMD_DRV_LOG(ERR, "Reading port table failed %d", ret);
goto err;
}
if ((entries[idx].port & NSP_ETH_PORT_LANES_MASK) == 0) {
- PMD_DRV_LOG(ERR, "trying to set port state on disabled port %d", idx);
+ PMD_DRV_LOG(ERR, "Trying to set port state on disabled port %d", idx);
goto err;
}
@@ -643,7 +643,7 @@ __nfp_eth_set_speed(struct nfp_nsp *nsp,
rate = nfp_eth_speed2rate(speed);
if (rate == RATE_INVALID) {
- PMD_DRV_LOG(ERR, "could not find matching lane rate for speed %u", speed);
+ PMD_DRV_LOG(ERR, "Could not find matching lane rate for speed %u", speed);
return -EINVAL;
}
diff --git a/drivers/net/nfp/nfpcore/nfp_resource.c b/drivers/net/nfp/nfpcore/nfp_resource.c
index fa92f2762e..363f7d6198 100644
--- a/drivers/net/nfp/nfpcore/nfp_resource.c
+++ b/drivers/net/nfp/nfpcore/nfp_resource.c
@@ -118,16 +118,22 @@ nfp_resource_try_acquire(struct nfp_cpp *cpp,
{
int err;
- if (nfp_cpp_mutex_lock(dev_mutex) != 0)
+ if (nfp_cpp_mutex_lock(dev_mutex) != 0) {
+ PMD_DRV_LOG(ERR, "RESOURCE - CPP mutex lock failed");
return -EINVAL;
+ }
err = nfp_cpp_resource_find(cpp, res);
- if (err != 0)
+ if (err != 0) {
+ PMD_DRV_LOG(ERR, "RESOURCE - CPP resource find failed");
goto err_unlock_dev;
+ }
err = nfp_cpp_mutex_trylock(res->mutex);
- if (err != 0)
+ if (err != 0) {
+ PMD_DRV_LOG(ERR, "RESOURCE - CPP mutex trylock failed");
goto err_res_mutex_free;
+ }
nfp_cpp_mutex_unlock(dev_mutex);
@@ -171,6 +177,7 @@ nfp_resource_acquire(struct nfp_cpp *cpp,
dev_mutex = nfp_cpp_mutex_alloc(cpp, NFP_RESOURCE_TBL_TARGET,
NFP_RESOURCE_TBL_BASE, NFP_RESOURCE_TBL_KEY);
if (dev_mutex == NULL) {
+ PMD_DRV_LOG(ERR, "RESOURCE - CPP mutex alloc failed");
free(res);
return NULL;
}
@@ -182,8 +189,10 @@ nfp_resource_acquire(struct nfp_cpp *cpp,
err = nfp_resource_try_acquire(cpp, res, dev_mutex);
if (err == 0)
break;
- if (err != -EBUSY)
+ if (err != -EBUSY) {
+ PMD_DRV_LOG(ERR, "RESOURCE - try acquire failed");
goto err_free;
+ }
if (count++ > 1000) {
PMD_DRV_LOG(ERR, "Error: resource %s timed out", name);
diff --git a/drivers/net/nfp/nfpcore/nfp_rtsym.c b/drivers/net/nfp/nfpcore/nfp_rtsym.c
index a34278beca..d15a920752 100644
--- a/drivers/net/nfp/nfpcore/nfp_rtsym.c
+++ b/drivers/net/nfp/nfpcore/nfp_rtsym.c
@@ -60,8 +60,6 @@ nfp_rtsym_sw_entry_init(struct nfp_rtsym_table *cache,
sw->size = ((uint64_t)fw->size_hi << 32) |
rte_le_to_cpu_32(fw->size_lo);
- PMD_INIT_LOG(DEBUG, "rtsym_entry_init name=%s, addr=%" PRIx64 ", size=%" PRIu64 ", target=%d",
- sw->name, sw->addr, sw->size, sw->target);
switch (fw->target) {
case SYM_TGT_LMEM:
sw->target = NFP_RTSYM_TARGET_LMEM;
@@ -227,7 +225,7 @@ nfp_rtsym_size(const struct nfp_rtsym *sym)
{
switch (sym->type) {
case NFP_RTSYM_TYPE_NONE:
- PMD_DRV_LOG(ERR, "rtsym '%s': type NONE", sym->name);
+ PMD_DRV_LOG(ERR, "The type of rtsym '%s' is NONE", sym->name);
return 0;
case NFP_RTSYM_TYPE_OBJECT: /* Fall through */
case NFP_RTSYM_TYPE_FUNCTION:
@@ -235,7 +233,7 @@ nfp_rtsym_size(const struct nfp_rtsym *sym)
case NFP_RTSYM_TYPE_ABS:
return sizeof(uint64_t);
default:
- PMD_DRV_LOG(ERR, "rtsym '%s': unknown type: %d", sym->name, sym->type);
+ PMD_DRV_LOG(ERR, "Unknown RTSYM type %u", sym->type);
return 0;
}
}
@@ -366,7 +364,7 @@ nfp_rtsym_read_le(struct nfp_rtsym_table *rtbl,
err = nfp_rtsym_readq(rtbl->cpp, sym, NFP_CPP_ACTION_RW, 0, 0, &val);
break;
default:
- PMD_DRV_LOG(ERR, "rtsym '%s' unsupported size: %" PRId64,
+ PMD_DRV_LOG(ERR, "rtsym '%s' unsupported size: %#lx",
name, sym->size);
err = -EINVAL;
break;
@@ -396,10 +394,9 @@ nfp_rtsym_map(struct nfp_rtsym_table *rtbl,
uint32_t cpp_id;
const struct nfp_rtsym *sym;
- PMD_DRV_LOG(DEBUG, "mapping symbol %s", name);
sym = nfp_rtsym_lookup(rtbl, name);
if (sym == NULL) {
- PMD_INIT_LOG(ERR, "symbol lookup fails for %s", name);
+ PMD_DRV_LOG(ERR, "Symbol lookup fails for %s", name);
return NULL;
}
@@ -418,10 +415,9 @@ nfp_rtsym_map(struct nfp_rtsym_table *rtbl,
mem = nfp_cpp_map_area(rtbl->cpp, cpp_id, addr, sym->size, area);
if (mem == NULL) {
- PMD_INIT_LOG(ERR, "Failed to map symbol %s", name);
+ PMD_DRV_LOG(ERR, "Failed to map symbol %s", name);
return NULL;
}
- PMD_DRV_LOG(DEBUG, "symbol %s with address %p", name, mem);
return mem;
}
--
2.39.1