From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 237BF45A79; Tue, 1 Oct 2024 13:04:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 011F04068E; Tue, 1 Oct 2024 13:03:54 +0200 (CEST) Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazon11010060.outbound.protection.outlook.com [52.101.69.60]) by mails.dpdk.org (Postfix) with ESMTP id 0E39640656 for ; Tue, 1 Oct 2024 13:03:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=y7y+dr4Td144JddvDOuVZ45vBCbAVrRkXbXwF8uKE9KpLhrk7DFWpZ805jXm+GMfZ4GA0Ab/amo5rrSm4zY5lxA72mgLP3T6+ckhz79xCfsCL772T/+sZryfLGcyR/wIsUIFpzN0wqNHzsYEWG4Zr+rE7s//R21F2MbtYIGZnP710DhARTqrYqfkvGYSk4XO/0pkj+By9iSALSwfsU1/AP1+r6h0pe81yoI+zpGQkiUsE/V3zbb7c49CKhEQNfRw1m0gItfMysfhJiv2ZSOjO43UsM7sLgPxtxrvDz7ibbGHMbmEAAIOPyQFCR9Q2dGf/FDs1yw5TNT6KwNWXMDfmQ== 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=DCkwUhX0Onay0Q4xpiNrYdQS7RUc6RuxFQJUgQV1g7I=; b=hIedKWtP8PTQ2QE0W1MYDH5L3z5gqWus48VPFuXAGLJ2XZftx3Q2obC16ZAEjiPiiB46yJTwijq5LLP/3cOXEMqRWtazBG6vpcy0zcynEYe53kpikLH+CWTE1a4Tqh4W28S2xkzVu+1GjfXdzeMYBeB4fs+lJg/0sYRh4cTLXbz5QZH3SP6/cAWqDWJ6fOtdaRKoeIRgEMWdgHaZrKYKE62/jVSyCf7nGmsmhKC1lDqS73821gOvYUbK/T+Qfmslbgw+MkJ4o6Qsqq7+zTxrjABLj5xgTyI0ZDYcP4USzusIsQdhTmDXtGNLkOx+YdVBTZlmUD1MvgvNV2Mw+CgkuA== 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=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DCkwUhX0Onay0Q4xpiNrYdQS7RUc6RuxFQJUgQV1g7I=; b=nbi5vmlSzTugjPNPO+a9GxMHvkHUZ8og6wrYqi0YKYVKAZBbOYnEfFfU40d3hUWf9zgffxG/kiLS5Fs83KZS7V3+17fhWqgkrOOVl5BX21sx/ofCz9ViWLNERbCVMZa1mZ6BVG3ykuwKuhnwAhgWFycMtwwfoBA/NMK1n/XIsJdbZ6FH/ydSRNEqQXO9LS/qaA3zZ2t5N5ycwxiaOr5Yw58QF7V1MFEWvShsbTUL4x/yvY619e3g1ewQNgdFts9tCrQs3ENqB4E/GHEylk468Xfre+GOQoNvfEBVmCH0UGBa1P7Wu+aqqQsAbb9LNnfJqkqs7jXY66wyTO8nfYzeow== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB9328.eurprd04.prod.outlook.com (2603:10a6:102:2b6::15) by PAXPR04MB8702.eurprd04.prod.outlook.com (2603:10a6:102:21d::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7918.27; Tue, 1 Oct 2024 11:03:49 +0000 Received: from PAXPR04MB9328.eurprd04.prod.outlook.com ([fe80::367:d59:375:fb87]) by PAXPR04MB9328.eurprd04.prod.outlook.com ([fe80::367:d59:375:fb87%3]) with mapi id 15.20.8005.026; Tue, 1 Oct 2024 11:03:49 +0000 From: Hemant Agrawal To: dev@dpdk.org Cc: ferruh.yigit@amd.com, Gagandeep Singh Subject: [PATCH v5 05/18] bus/dpaa: add port buffer manager stats Date: Tue, 1 Oct 2024 16:33:12 +0530 Message-Id: <20241001110325.4173762-6-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241001110325.4173762-1-hemant.agrawal@nxp.com> References: <20240930121525.3452847-1-hemant.agrawal@nxp.com> <20241001110325.4173762-1-hemant.agrawal@nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR02CA0086.apcprd02.prod.outlook.com (2603:1096:4:90::26) To PAXPR04MB9328.eurprd04.prod.outlook.com (2603:10a6:102:2b6::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB9328:EE_|PAXPR04MB8702:EE_ X-MS-Office365-Filtering-Correlation-Id: 05667b11-6265-40cc-2b9b-08dce208ba40 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|366016|376014|52116014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Z6BRqvBsSbhUGgO4fHdOm5TLL906EEQchqrMRF/57rW4pi4B4R67LKJwVwKR?= =?us-ascii?Q?y3e8PZ6ErGqSzSB+kqaSnI2FNwNDx1WNLpsQ44iO2fxWqOdRRW0ePJfguo+T?= =?us-ascii?Q?E23NiDnl8Jms0ppiDJ0s9XCWQXlVwayEqUiQZ1IyUELmWbZusQMX3gmwHZVf?= =?us-ascii?Q?+Jra6L2NeIXQa9r/QiVVGe0zWWXtG98Eg0K0h6gpb0hcirC7/xiBAotE92NE?= =?us-ascii?Q?pwn2GAQ02W8doLE3Xhs8FXtdx8ycYT7qJoI6V8vatCMvtURfjuCFPCVRg8Pr?= =?us-ascii?Q?MQaMs1p+iHODQKWCE3/07y/zkRJV2c1acJXQpMSMm7v4f9xdlmdXVlAXBJXF?= =?us-ascii?Q?tHRsjYxa/2m9mgYnWocwP8hfEVqt03QoTZxhTbOTLpq7kK2ng9E7pNkEvfR+?= =?us-ascii?Q?nvojS/w/ZDdQvj0hP9MvvZLkG1TXghuoxxRMlGMagy9xuZBSU4oCo61uOGLV?= =?us-ascii?Q?jGUJJsmFl7jss0Rc0D5vBKN62MgKmZSd9FsRS+U/3hoBJ38elfUl8vPVcIcu?= =?us-ascii?Q?10c6QDcdJsAkutiNTS7v68hgnqcw+PaIgp9J3YxUg2b2jrU2jJjQveUu+0Q0?= =?us-ascii?Q?+q0IwePpHBNlsb+dILkyTXVuBSm2ZiFG2AobRqOTsZhfpv/7F9TTTPPI9Znp?= =?us-ascii?Q?P9018O0Jgeg+CsCUsTvWyXpKu+Eqm3FB9gDVoc4qqiSe7Q+4Go+w72uejv2P?= =?us-ascii?Q?4XqpkuxLWammcbeQaNITvwjX6lAHiMiTYAa99DwImFnTQEg1FxJg6CssBMDq?= =?us-ascii?Q?3f+gZdX5KeUdnDo5hcT0TfVWseuICzUR8JZuDApp3Crb1wBIjqz5UT8dtnqe?= =?us-ascii?Q?tnnOdjRm+UeEkt6ly7p8WOO1QrNMaPtfi9oNEeOlpTx0E/gOYxPWJTPv4bK2?= =?us-ascii?Q?9aHWSaO1M0Xqgakkose8VTd+ISMYCNWndnMEd7noO9jN+UevAYnhKAaGdABI?= =?us-ascii?Q?FS3DmUdSF5IfZU2774MbrrqaBdh6w9US1RGYZMepQEa7BtdjvWqPEZRtvF9L?= =?us-ascii?Q?z7+O6IcVf/lTfVzKXjZVqYrKXd79KvfP6zyDnI/Iyy8/XqTUlmTpUHpzw1q5?= =?us-ascii?Q?Fv4iaGM+JC4mvzko8/492WkFrRZ0nrTAHxjCIEc2zydjffKbIRmsLIMlruIM?= =?us-ascii?Q?JX6Cibqvb4zRGhXJCQvh+tbir7JUvxwNbif5PYhmHs9G3huMLNg4bj8h0lIt?= =?us-ascii?Q?rLC9bPOIk82Hbt9AqZTBddv6gcYvIv17/f+pvsOVf8qMRgY2ZXKupJFCG8Cg?= =?us-ascii?Q?DyKlBU8r2de+YZoUTE7l1QTBmSShHHHug/itIhI4lW5IgXBEAyLY5RYkynyM?= =?us-ascii?Q?5/DrEs7mVXHTdhDymvdvuNPshgz+eDbKOQ5bsk8U3J1iEA=3D=3D?= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXPR04MB9328.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(52116014)(1800799024)(38350700014); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?TWIbZ1QR2/PIWF/pHIds3T5tFjZ0tWY6Amdb2bnEGtz5FP8UeNAkkxuqdCiL?= =?us-ascii?Q?eYUnSqW8cgxWiWG88MeTFEqLwi4fjs/RTlr3SctUwdjnuZS5AOCN2fiS/Heu?= =?us-ascii?Q?fSNUBPmhJQzzxXLzdfvDP3/6b9N0AOfZ3G1j369V7iXm6n4WPjrHYjr4/kkc?= =?us-ascii?Q?vtn7bBn2O2S43avigxrjhbBcEhqFNVVdi7kpQ2gI3dSGMf4aTnX6egrDEr0T?= =?us-ascii?Q?2XBZcuSIngp9a0beqP99ZVfvji9i8IoDJnWFBrZmpoIQkB5ShP56qHcgYFNm?= =?us-ascii?Q?BnthDglLTyHO/gU2Llmh3Z7Q6KLOEpcHeP7Fc/8o0ukdVrwTxk+M7eRWo8GL?= =?us-ascii?Q?9+B2lFttLcElP9VSolfoj9djj1Gc39lcL+StNHIfs0C4ykSoVvRx6BF8nku8?= =?us-ascii?Q?8wiO4I1We/dUupd3/BUkGMu3UfqSDGYqVkpilawCo6JClix3dAm1VXTN1LhE?= =?us-ascii?Q?dbDf0gTJA6kGiEh5trcuv0VlpbY5J/5yLIeLkubkVYTFELOyDU8RKvNJ79YR?= =?us-ascii?Q?kjS4fq541ahoBt7CT12gmdBaxUs6ykQ+gxuXgl9Pew3R0WfibuZu7dePVb3Q?= =?us-ascii?Q?u6s300wH6E24sUJ6W8Mhd7+etjUBsY6RGzVd/k/QLJ97MU9gleEM2fwl/0JU?= =?us-ascii?Q?/KeDyxC7NsemVq9CfOvF6NwnMyylrtifyYwuPyTrOtm0kwVK/XSJQG/tTCjO?= =?us-ascii?Q?QgycAhazAjBfPKocS2uqJ81ImR8nI4AuIQbKfFf3t3welThllSalwAWRBj3r?= =?us-ascii?Q?FlTkv38CJlUaH1ECPwRboY6hlfOOquWVKchz2D4+/JBW3oXP4mIn4IJHC3av?= =?us-ascii?Q?i12shFW+9Yg+R4C9iJkALV8VyIpN0Lbh93iUAVBowWccSAbS6kMPpu+XV6Rh?= =?us-ascii?Q?WQhU6MZmiPtbOR7R4Ds93EKy7m8TBXjQLHHvvbqsYgGVmHfjQ/shPuQtUsk5?= =?us-ascii?Q?E9T0FQgTDmjoVpcIRxGToWHNQQ2pwUI9Agj8BQEKFKEKbGo1xzXOiz10SadJ?= =?us-ascii?Q?CH0GR9L31eeX6ecWCyxx4YlUSSMpmbNTFnp8M1q01D2mO6hjji1+j42lmhzl?= =?us-ascii?Q?6//vCaVQ4cjnWmt5WO8gbkqmXRd795BXBbl2tCxQfhDBPISCSZeEliniFSTp?= =?us-ascii?Q?C+vix1n1rdrrbftBJg6Kug2mRBG1ka7M5I4fIG6vPA1MC4acPURa5MLXihzt?= =?us-ascii?Q?ZOOKGK2g2tPOyZOgZl4LuiLS/GSho0WCXpUHguPHrc3RvmUO5e+fV6S7BuNM?= =?us-ascii?Q?p+KtwkfVFzF4igaWpiYp1cjq7zfPNUbB+1OgGzR3bQPN9CihKdmg8I9j/EJq?= =?us-ascii?Q?bUcAz0wCEe5Vw6WstaHKyOd81SgtiS+I661UyBJBUOkBtP1cPk8z1YSYxzsu?= =?us-ascii?Q?ogOZtfDn933tOGlIFHplKeNhDGKLeHE+ODgIcFCMyhybw12nJ8v6b+leiBkf?= =?us-ascii?Q?5GWoHsZL8IGMg+eY2HP/eIz92CZeBtk309lBl1iKHzRJ7kok4lvPFoXQBMPu?= =?us-ascii?Q?7NqfhxpH2to0i/RXEZEWjAoZgiy83lzKGMnovooS7iQgaFI6w3mIQuvC1dqp?= =?us-ascii?Q?Qi9PmFRFMOddOLfzKUJnZvlXu2Qn4weHd5EoehaILo1QHPi3MpB1dMLsQcmX?= =?us-ascii?Q?Uw=3D=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05667b11-6265-40cc-2b9b-08dce208ba40 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB9328.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Oct 2024 11:03:49.6399 (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: 7QckwHVe58q1Vr/7bc91llsaGzAGyKWuJ8k6QQ8hEAMw6oOn6jYrWS1DKi+npVgy9nE5lkrsDtbANPY9mXOozw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8702 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 Add BMI statistics and improving the existing extended statistics Signed-off-by: Hemant Agrawal Signed-off-by: Gagandeep Singh --- drivers/bus/dpaa/base/fman/fman_hw.c | 61 ++++++++++++++++++++++++++++ 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, 132 insertions(+), 7 deletions(-) diff --git a/drivers/bus/dpaa/base/fman/fman_hw.c b/drivers/bus/dpaa/base/fman/fman_hw.c index 97e792806f..124c69edb4 100644 --- a/drivers/bus/dpaa/base/fman/fman_hw.c +++ b/drivers/bus/dpaa/base/fman/fman_hw.c @@ -267,6 +267,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 1a2de5240f..90b34e42f2 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 -- 2.25.1