From patchwork Mon Jul 22 16:39:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 142649 X-Patchwork-Delegate: thomas@monjalon.net 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 D470545683; Mon, 22 Jul 2024 18:44:22 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B81B1410EE; Mon, 22 Jul 2024 18:41:27 +0200 (CEST) Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11012011.outbound.protection.outlook.com [52.101.66.11]) by mails.dpdk.org (Postfix) with ESMTP id 577CA40DD1 for ; Mon, 22 Jul 2024 18:41:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mJ+bXsOAzV1lg3jEC55e1jvnhhbbwxAl1/pttfWNH8S4fJ7fdkNnXpFGanRIcigZLl+KT0DC9pzX9WBv/P0EW6eiSL4DSXZLjfRTgfw10/cJMjXmA7Rnzq6MFM4Tv7kAT6u63akq9btYqexhrzqR4GIsArXjxdndHV/AH8vRmNcPy93N3TT6dBUdLzj+Sq4Ll/7gJnR5zmive3lkFlM4v09YT5cmuy7/PYqAaoOxWvrNpJ/iHN2hAwyIfxZ9ccx0GGxh3Cxk1mqpQ90claqIIBvJ6+/vGswicDdpEWPJVmTTE5WkiwfuyspFu7vXNO0BjMjsNRque53murf/cQ/MHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=QdGNxX/ruKA41O16rVCFtuII3G3z7JWCmG/SzfQMcdo=; b=MTANc0A04VWkSIHRPs8F4Xy2s3VNVlD/v7sMVNSgONRrCL0peznQdXp/zKKD9Anc9u2kcl7N4STA2iyEanFcWQJA/HvbSDgU44seu3R3/pbkTKlD+yoH1IEH5OWSSb5GbURVv+1ylIHiCVdrpMiSyNYv+uMrInLqOKYScQG8GMCf1kErXAledfRYT/x8yn+mlhgdsX9NGO72ohdAS1DgUe28krXbGRMdDKlZCeEeiXeO1OzDbouArE/qG+E9nqKGri6bJgS80UJLmu8Azk36JDx8vqtpVfyyxx+XS0VOfH5EhmKo54Ao7okXG/7SqDlsBRxCp8C7pOlZcWchlMySIQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QdGNxX/ruKA41O16rVCFtuII3G3z7JWCmG/SzfQMcdo=; b=kt1xASVcEEcJjEJmBwam5RS3+KOXfNHyIgw+uxIc335A7uyQiH8SWmEMtVjjgakZCaIwy0bhdBe1ZqcO/QM0JuziUdhvhtkrYofS+9Bu+yR0YqJQiPh/fstxRTqayq0xtAvFT/NK7SaAQQmPTlyVUZzOXNTGOO8P+DxgvLoc3l0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AS8SPR01MB0024.eurprd04.prod.outlook.com (2603:10a6:20b:3d0::24) by VI1PR04MB6798.eurprd04.prod.outlook.com (2603:10a6:803:131::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.16; Mon, 22 Jul 2024 16:41:09 +0000 Received: from AS8SPR01MB0024.eurprd04.prod.outlook.com ([fe80::c634:479e:8f8a:a325]) by AS8SPR01MB0024.eurprd04.prod.outlook.com ([fe80::c634:479e:8f8a:a325%7]) with mapi id 15.20.7784.017; Mon, 22 Jul 2024 16:41:09 +0000 From: Gagandeep Singh To: dev@dpdk.org, Hemant Agrawal , Sachin Saxena Subject: [v3 30/30] bus/dpaa: add port bmi stats Date: Mon, 22 Jul 2024 22:09:30 +0530 Message-Id: <20240722163930.2171568-31-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240722163930.2171568-1-g.singh@nxp.com> References: <20240722115843.1830105-1-g.singh@nxp.com> <20240722163930.2171568-1-g.singh@nxp.com> X-ClientProxiedBy: SG3P274CA0014.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::26) To AS8SPR01MB0024.eurprd04.prod.outlook.com (2603:10a6:20b:3d0::24) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8SPR01MB0024:EE_|VI1PR04MB6798:EE_ X-MS-Office365-Filtering-Correlation-Id: 7dc03e48-c66d-4401-f395-08dcaa6d052b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: GH4Y/VU1Ho+tXWSRVBP0bIax8d/ivFT+sYYFVrrGL68YJUGPtEmBlat39du27s4yuBpkOsqZzrwufrC5MXeREFism9YzatYO1dCAdwCFYTmvaNVB2yR2WorbTHrpS4hRVA3SnHKc6ykqxz/xS+/5RH9f+JO8HZ7nX6K4dBTvy+45iSHBQ2uAI48DwWkzaGyAyc9pJVRWU5/erk0moNGBszM2sF8RGWfffoeiSLBf+Hwa+W5MiAjlalmv5jJQk3UYE5pIgcsEm93ielYOQDEEM01/YN5iYfqxOZQrju/bQxML2+LhFrvToeUNJ/+lxISS6EzDdV+oio7w4w/030+OwZL57UbYIdcW7ywf5XFEymJhvgqdrrK6sQjRZZYKlaFdicq3dIMYUaDFiBohCj+AB/6DPEr46KXWYzeXP2DoiSfsSd3h4dRkODxlLXZM+6HZlWqVdXUCTTLkcfZWp3d5MW+lJUNT3mgXnCu0tsXoAUCqvwYEWCScIMBVY25f5q2ToxYb0pOZrlGxygHcFjJkBp14LAL9Q6d9EBfSQQibwJapnUy8zxKLKBBDx8XHnIzf4+J3+t4lG6CSkuZp2V1fPcrgxCMTh2Z7gtcd6jic+2hDWG2XDO0cJeAqC5j0QmS+DMtE7oiOIz2IjdkzuJkMxvEYr9RJMGY4kF1YEofrxH7miawdNEFVEWn+ThOo7m99yvU5g0s/+46SqHXpZwY0jSn/5mokBgNAKX21Hlben7GyBKvau2L5K/BGIxzaonm+TuOQjzj025RlP2kfavIIw7wPP0NP1z4TTwU5v2F8deky5T6NVVoex3DpAnu60zdsb9dXW72anfQYMVmy2YjEwPXx/ncsymBq/LC1do598wojtIk/Gf+3Gy973dDT4AXQSMay5jwACnGFRQt7q/C2j3Vn7hrAkD/vrcjMIeXLMk0ByyamJX1hTGJc3WGk+ZCJOvf2G0YIlEnM6EFt/q5MUqal7YREEyWR4xK8+A032cFz9gta4Bx6dWwg04CnPXVBkSLkYCEgEs4L4NPT2E2CtjffthYRqfISh5ckH4IV9ts/4A0vCMNQBnQ7uP9rpaecWT/D6YMRyq91r97g+mcr9s/Ub7gjeX0H0iq3dCC5yW7Lz8lsQr9rTMwj7cMMze8qhs0CF4kZvifTno3ygn6QxORQGPgnzu568Djm3XB2IRDYuqoOTCPobYmYz1YftlVBMKPuL2PiwBvZD7Tp44Kqgg+fc2df7VDMQOXT5CA+an/RIfInXLX0hv/8CW6mENzGJbfRuEOhLLG/MjFty07Aia5nbdMn3Q8lH/ABkCL/LduIvCvNo2RcI9g8ZzjLrA/Ctk6Y9rQpoJrzyEHh94NXuj0V7eHx87mQEXVvNMJoblU/zfX1oayY/uO4tgTYcwhIiqsNdcKg9NtYFiE9TMw3IQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8SPR01MB0024.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(376014)(52116014)(1800799024)(366016)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Z6FvqDI0rmjsJ6FPkBUQ+zqh1O4l1fIE29zWeuYGJRjLhpWcd0ZkaSqaxdTp1uNbmc0mhiliPSiy7+ecr2gL7yxDDYlJ57F9bbhc4qj1+0+2XmJANb2lYrJ0EZ7Q6OODUPL1xJ+xGgDyCBZNbb8oQ86vTxp7yiJf7gcGia7RdpvaZtdXJoE9ZfAEsao+lqCVlSwRne3B7zGm4Lobkty6Nm0DNwts3Cq+K8YYtXOxQw7SvJj9c81li755IGMpz4qGWR1e6wCVGHjsn34+igsZw5penqXbjmSGtDtWedj/Ct8dNpVjhXEt5bRisdPNscVizNPpeFEEkoI7+cXEashiMw64oKS1imT+DtM5ffHAYXhVAUadHZReR3M+keR4oYF8aDpKyQOgjwTi+oaXzz9bvAxBDN0KgpuxsGEEbiYZs8UpJc7jLc9dwIBkltX6k+64bj+C1qCD7FmHAEUUS0Vv4WU74lwj/0ap7g3U7gKfKYMTcDcjeSAYwL1j5XrX9G/RcSNd9EdVb7KDF/6R98Ef8v/WecNEBh1P70CMbGXk/G++Vmq2xegSP7GT5uA/1P1UUX8PHyl3JrF4mZ24H30HI89p5jj9IapURb80RDGLjfmNL1F9hNZnJqWKzPOUdkP3Gq1asIgOxBD1Yg1nrXm2NDGrbKJvvOZdUWX6F/ECD5RUbZxEUC06nZG18C1hVcalkzEamyP14wAtWwlg+sM6vulDKUVMhN4QytSIrUAC3pE53DhpqSk9x+LaBn3ZufSuQzvcmBI6VcKDUu38fJFWzYYov4pIm84GZNPG8JiHWA8wOLyA6P++ZxOogq/Snhh501/eu0p1LSLyAEyCpR/So2fm9P9tMSAt/ucNffnG9IXLosHUd5QtRC3E+6bMKKqMqSTbzLc8qDVMtID3fOOcEBSYOL7MnM8IFbRIhnWgXRZNg+3lrQ10VIQY75t1WWDzHrpCG+pKqlOvIFl+wRqBewIKLbCCqqeoCIMZuYwViv+Gp/YaWsCF5jqCYKHydnH+CcpKg7yd7mOPvt22Euvgr/Euahhlztmy6nHqsMg6AraDC0fqfy0l1z7VrcYgglPiRSkZQgEvWPxZ3UZt5PbeGPObSuZNyaKm3vSVTfKRagC3PlbNtJ8IUWp2yMXqHYKnDXtQSTdNw87PrJhXfxMX1Gj4GtRiIUfCdDKZrYBldG3prmCKdMuRP9B+FdcWn2hv6WHsuRmQAmQddS78Iu+Gs3pOOo72u0xL6yJc05fFnHRdy4orjnxX+X5KhIn/vNoCGZt426zlKDdEIdKGuaiTkpgaVs/ie/0O/6HPIaAeGCFhUp9NVg3yJvdJ7bSSizBPamnnTrvdEOkWuNZqCIOUyadCK9DGqab8id+wSdWIBxyFS6ckw4kUF8lYH2lVurzfU85U6BEHcZOG6qCPBTTgkZm9lhZT+A8qKJcY2PxY/WaAxwbXvlkrZh9WA8E6zq4vnUXfFXA8U9yTOVATsuZDf2fZQ7jH++iu84Yfb0/IyCEbU4Z6LKwsUZgN8umSC/bqPK9LH/8HbVHzSnpdWhiBt4tMRzJY8+fO+sQ7WnxzL5MDEDTG6LbNKVSsElf6G9zN X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7dc03e48-c66d-4401-f395-08dcaa6d052b X-MS-Exchange-CrossTenant-AuthSource: AS8SPR01MB0024.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2024 16:40:39.7703 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Xnyylc2w8yFzYmi7pKPQQNHemgGVLxp4hAiY3JT/Qbwxd5h46Ar29Bq4LAvEOPIo X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6798 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: Hemant Agrawal Add BMI statistics and fixing the existing extended statistics Signed-off-by: Hemant Agrawal Signed-off-by: Gagandeep Singh --- drivers/bus/dpaa/base/fman/fman_hw.c | 65 +++++++++++++++++++++++++++- drivers/bus/dpaa/include/fman.h | 4 +- drivers/bus/dpaa/include/fsl_fman.h | 12 +++++ drivers/bus/dpaa/version.map | 4 ++ drivers/net/dpaa/dpaa_ethdev.c | 46 +++++++++++++++++--- drivers/net/dpaa/dpaa_ethdev.h | 12 +++++ 6 files changed, 134 insertions(+), 9 deletions(-) diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c index 24a99f7235..27b39a4975 100644 --- a/drivers/bus/dpaa/base/fman/fman_hw.c +++ b/drivers/bus/dpaa/base/fman/fman_hw.c @@ -244,8 +244,8 @@ fman_if_stats_get_all(struct fman_if *p, uint64_t *value, int n) uint64_t base_offset = offsetof(struct memac_regs, reoct_l); for (i = 0; i < n; i++) - value[i] = (((u64)in_be32((char *)regs + base_offset + 8 * i) | - (u64)in_be32((char *)regs + base_offset + + value[i] = ((u64)in_be32((char *)regs + base_offset + 8 * i) | + ((u64)in_be32((char *)regs + base_offset + 8 * i + 4)) << 32); } @@ -266,6 +266,67 @@ fman_if_stats_reset(struct fman_if *p) ; } +void +fman_if_bmi_stats_enable(struct fman_if *p) +{ + struct __fman_if *m = container_of(p, struct __fman_if, __if); + struct rx_bmi_regs *regs = (struct rx_bmi_regs *)m->bmi_map; + uint32_t tmp; + + tmp = in_be32(®s->fmbm_rstc); + + tmp |= FMAN_BMI_COUNTERS_EN; + + out_be32(®s->fmbm_rstc, tmp); +} + +void +fman_if_bmi_stats_disable(struct fman_if *p) +{ + struct __fman_if *m = container_of(p, struct __fman_if, __if); + struct rx_bmi_regs *regs = (struct rx_bmi_regs *)m->bmi_map; + uint32_t tmp; + + tmp = in_be32(®s->fmbm_rstc); + + tmp &= ~FMAN_BMI_COUNTERS_EN; + + out_be32(®s->fmbm_rstc, tmp); +} + +void +fman_if_bmi_stats_get_all(struct fman_if *p, uint64_t *value) +{ + struct __fman_if *m = container_of(p, struct __fman_if, __if); + struct rx_bmi_regs *regs = (struct rx_bmi_regs *)m->bmi_map; + int i = 0; + + value[i++] = (u32)in_be32(®s->fmbm_rfrc); + value[i++] = (u32)in_be32(®s->fmbm_rfbc); + value[i++] = (u32)in_be32(®s->fmbm_rlfc); + value[i++] = (u32)in_be32(®s->fmbm_rffc); + value[i++] = (u32)in_be32(®s->fmbm_rfdc); + value[i++] = (u32)in_be32(®s->fmbm_rfldec); + value[i++] = (u32)in_be32(®s->fmbm_rodc); + value[i++] = (u32)in_be32(®s->fmbm_rbdc); +} + +void +fman_if_bmi_stats_reset(struct fman_if *p) +{ + struct __fman_if *m = container_of(p, struct __fman_if, __if); + struct rx_bmi_regs *regs = (struct rx_bmi_regs *)m->bmi_map; + + out_be32(®s->fmbm_rfrc, 0); + out_be32(®s->fmbm_rfbc, 0); + out_be32(®s->fmbm_rlfc, 0); + out_be32(®s->fmbm_rffc, 0); + out_be32(®s->fmbm_rfdc, 0); + out_be32(®s->fmbm_rfldec, 0); + out_be32(®s->fmbm_rodc, 0); + out_be32(®s->fmbm_rbdc, 0); +} + void fman_if_promiscuous_enable(struct fman_if *p) { diff --git a/drivers/bus/dpaa/include/fman.h b/drivers/bus/dpaa/include/fman.h index 3a6dd555a7..60681068ea 100644 --- a/drivers/bus/dpaa/include/fman.h +++ b/drivers/bus/dpaa/include/fman.h @@ -56,6 +56,8 @@ #define FMAN_PORT_BMI_FIFO_UNITS 0x100 #define FMAN_PORT_IC_OFFSET_UNITS 0x10 +#define FMAN_BMI_COUNTERS_EN 0x80000000 + #define FMAN_ENABLE_BPOOL_DEPLETION 0xF00000F0 #define HASH_CTRL_MCAST_EN 0x00000100 @@ -260,7 +262,7 @@ struct rx_bmi_regs { /**< Buffer Manager pool Information-*/ uint32_t fmbm_acnt[FMAN_PORT_MAX_EXT_POOLS_NUM]; /**< Allocate Counter-*/ - uint32_t reserved0130[8]; + uint32_t reserved0120[16]; /**< 0x130/0x140 - 0x15F reserved -*/ uint32_t fmbm_rcgm[FMAN_PORT_CG_MAP_NUM]; /**< Congestion Group Map*/ diff --git a/drivers/bus/dpaa/include/fsl_fman.h b/drivers/bus/dpaa/include/fsl_fman.h index 20690f8329..5a9750ad0c 100644 --- a/drivers/bus/dpaa/include/fsl_fman.h +++ b/drivers/bus/dpaa/include/fsl_fman.h @@ -60,6 +60,18 @@ void fman_if_stats_reset(struct fman_if *p); __rte_internal void fman_if_stats_get_all(struct fman_if *p, uint64_t *value, int n); +__rte_internal +void fman_if_bmi_stats_enable(struct fman_if *p); + +__rte_internal +void fman_if_bmi_stats_disable(struct fman_if *p); + +__rte_internal +void fman_if_bmi_stats_get_all(struct fman_if *p, uint64_t *value); + +__rte_internal +void fman_if_bmi_stats_reset(struct fman_if *p); + /* Set ignore pause option for a specific interface */ void fman_if_set_rx_ignore_pause_frames(struct fman_if *p, bool enable); diff --git a/drivers/bus/dpaa/version.map b/drivers/bus/dpaa/version.map index 3f547f75cf..a17d57632e 100644 --- a/drivers/bus/dpaa/version.map +++ b/drivers/bus/dpaa/version.map @@ -24,6 +24,10 @@ INTERNAL { fman_dealloc_bufs_mask_hi; fman_dealloc_bufs_mask_lo; fman_if_add_mac_addr; + fman_if_bmi_stats_enable; + fman_if_bmi_stats_disable; + fman_if_bmi_stats_get_all; + fman_if_bmi_stats_reset; fman_if_clear_mac_addr; fman_if_disable_rx; fman_if_discard_rx_errors; diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 060b8c678f..4d9a4c7e6d 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -131,6 +131,22 @@ static const struct rte_dpaa_xstats_name_off dpaa_xstats_strings[] = { offsetof(struct dpaa_if_stats, tvlan)}, {"rx_undersized", offsetof(struct dpaa_if_stats, tund)}, + {"rx_frame_counter", + offsetof(struct dpaa_if_rx_bmi_stats, fmbm_rfrc)}, + {"rx_bad_frames_count", + offsetof(struct dpaa_if_rx_bmi_stats, fmbm_rfbc)}, + {"rx_large_frames_count", + offsetof(struct dpaa_if_rx_bmi_stats, fmbm_rlfc)}, + {"rx_filter_frames_count", + offsetof(struct dpaa_if_rx_bmi_stats, fmbm_rffc)}, + {"rx_frame_discrad_count", + offsetof(struct dpaa_if_rx_bmi_stats, fmbm_rfdc)}, + {"rx_frame_list_dma_err_count", + offsetof(struct dpaa_if_rx_bmi_stats, fmbm_rfldec)}, + {"rx_out_of_buffer_discard ", + offsetof(struct dpaa_if_rx_bmi_stats, fmbm_rodc)}, + {"rx_buf_diallocate", + offsetof(struct dpaa_if_rx_bmi_stats, fmbm_rbdc)}, }; static struct rte_dpaa_driver rte_dpaa_pmd; @@ -430,6 +446,7 @@ static void dpaa_interrupt_handler(void *param) static int dpaa_eth_dev_start(struct rte_eth_dev *dev) { struct dpaa_if *dpaa_intf = dev->data->dev_private; + struct fman_if *fif = dev->process_private; uint16_t i; PMD_INIT_FUNC_TRACE(); @@ -443,7 +460,9 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev) else dev->tx_pkt_burst = dpaa_eth_queue_tx; - fman_if_enable_rx(dev->process_private); + fman_if_bmi_stats_enable(fif); + fman_if_bmi_stats_reset(fif); + fman_if_enable_rx(fif); for (i = 0; i < dev->data->nb_rx_queues; i++) dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; @@ -461,8 +480,10 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); dev->data->dev_started = 0; - if (!fif->is_shared_mac) + if (!fif->is_shared_mac) { + fman_if_bmi_stats_disable(fif); fman_if_disable_rx(fif); + } dev->tx_pkt_burst = dpaa_eth_tx_drop_all; for (i = 0; i < dev->data->nb_rx_queues; i++) @@ -769,6 +790,7 @@ static int dpaa_eth_stats_reset(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); fman_if_stats_reset(dev->process_private); + fman_if_bmi_stats_reset(dev->process_private); return 0; } @@ -777,8 +799,9 @@ static int dpaa_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, unsigned int n) { - unsigned int i = 0, num = RTE_DIM(dpaa_xstats_strings); + unsigned int i = 0, j, num = RTE_DIM(dpaa_xstats_strings); uint64_t values[sizeof(struct dpaa_if_stats) / 8]; + unsigned int bmi_count = sizeof(struct dpaa_if_rx_bmi_stats) / 4; if (n < num) return num; @@ -789,10 +812,16 @@ dpaa_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats, fman_if_stats_get_all(dev->process_private, values, sizeof(struct dpaa_if_stats) / 8); - for (i = 0; i < num; i++) { + for (i = 0; i < num - (bmi_count - 1); i++) { xstats[i].id = i; xstats[i].value = values[dpaa_xstats_strings[i].offset / 8]; } + fman_if_bmi_stats_get_all(dev->process_private, values); + for (j = 0; i < num; i++, j++) { + xstats[i].id = i; + xstats[i].value = values[j]; + } + return i; } @@ -819,8 +848,9 @@ static int dpaa_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, uint64_t *values, unsigned int n) { - unsigned int i, stat_cnt = RTE_DIM(dpaa_xstats_strings); + unsigned int i, j, stat_cnt = RTE_DIM(dpaa_xstats_strings); uint64_t values_copy[sizeof(struct dpaa_if_stats) / 8]; + unsigned int bmi_count = sizeof(struct dpaa_if_rx_bmi_stats) / 4; if (!ids) { if (n < stat_cnt) @@ -832,10 +862,14 @@ dpaa_xstats_get_by_id(struct rte_eth_dev *dev, const uint64_t *ids, fman_if_stats_get_all(dev->process_private, values_copy, sizeof(struct dpaa_if_stats) / 8); - for (i = 0; i < stat_cnt; i++) + for (i = 0; i < stat_cnt - (bmi_count - 1); i++) values[i] = values_copy[dpaa_xstats_strings[i].offset / 8]; + fman_if_bmi_stats_get_all(dev->process_private, values); + for (j = 0; i < stat_cnt; i++, j++) + values[i] = values_copy[j]; + return stat_cnt; } diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index b6c61b8b6b..261a5a3ca7 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -212,6 +212,18 @@ dpaa_rx_cb_atomic(void *event, const struct qm_dqrr_entry *dqrr, void **bufs); +struct dpaa_if_rx_bmi_stats { + uint32_t fmbm_rstc; /**< Rx Statistics Counters*/ + uint32_t fmbm_rfrc; /**< Rx Frame Counter*/ + uint32_t fmbm_rfbc; /**< Rx Bad Frames Counter*/ + uint32_t fmbm_rlfc; /**< Rx Large Frames Counter*/ + uint32_t fmbm_rffc; /**< Rx Filter Frames Counter*/ + uint32_t fmbm_rfdc; /**< Rx Frame Discard Counter*/ + uint32_t fmbm_rfldec; /**< Rx Frames List DMA Error Counter*/ + uint32_t fmbm_rodc; /**< Rx Out of Buffers Discard nntr*/ + uint32_t fmbm_rbdc; /**< Rx Buffers Deallocate Counter*/ +}; + /* PMD related logs */ extern int dpaa_logtype_pmd; #define RTE_LOGTYPE_DPAA_PMD dpaa_logtype_pmd