From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from CH5PR02CU005.outbound.protection.outlook.com (mail-northcentralusazon11012060.outbound.protection.outlook.com [40.107.200.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 833A83C5DDB; Mon, 8 Jun 2026 10:09:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.200.60 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780913389; cv=fail; b=MtFwHgpHERk3h4kjStcdUFfULnA9IMRPQdBdl66mgmqUzcc/ea5Rs+D2QGrVRjGxNvJYaYs6WO/X/1JM4B+Ik65WcD7fYyhV2nthIC5L3Q5WToPeQeHD2jKoUvUYsYH1CMG7HPfWkMt1OtsUrc4ns6zerBdruFX1vK/mDhAgA/Y= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780913389; c=relaxed/simple; bh=GsPFrXGxjDqywwmF5w2mySqqev/EzuPC6s64hE5Wp7E=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sAkG3FswAFQ0PrVGgUFkyKaxAJADAm+3+r9Oe2XydKwFQBE6iQZvORa7sLSMVainVUdnqKEfT/Cu+PT6F+9wNrq8p5F7QCC4mv64ZIzn1/slBw5zUbVZY3DyxR/UGeuB96dv925ihJzVIr4UvqND6/mmOXukj89zx6kpvi5g2P4= ARC-Authentication-Results:i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=sNgc2UzW; arc=fail smtp.client-ip=40.107.200.60 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="sNgc2UzW" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tqSh0/xHacPTo+fFHwUfnnR9Eov8P2smD/pEJu6iGF5JPmIFhyObe+YaKgWS6IVIULq1R6QLgo4cTugU/NOWR1OlwjoTlzmTn/Zmglv8EHxYvKoy9p6pmCcQbRfbSwiVmAFpeEgd4LG4kcgBSYm9I745B6cES0+b1y7L8VbM/gvlAfH63l4GfasVqDniFK7kXmcZEW9JyrSc9fwa+qHWVMJ8R/NeGVNAMUKpB7hAAbUSo4L7N4gsKJb0Tr2yQILYJKQA2HgbbZ8r33kgmJnEUhbkiVCSaX5WZIcBpxQeJz8GjOqwykA7+nFstgsAS75nGUwqq1AWkM+7Lwx3J+myJQ== 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=VunSYuPg3DSq2U99j/pbke82XIurz/Auhi89UzNzQvE=; b=ZB1eWIAt+HdZg2c+j966/sOaT5Ghcj8dtQZRvZuT0alRwa0XLzxnLdkM6CiCXIWpWsAXCGg7lO5EF1MPikvTsfIw3AbFVt52hBYhK0samQE4Nr+UeoyV6dwOS0zi7TWEbKebWExL3kw38bWf56b3juZ2qu/jkLJFpeKlu8R9LbnxA1A4scQIrXy7g6HeGMWbMSnlBAQrjnEiLd2ce3BiNtvR+jt74xs9tLSA1JB5GNNGPaR0RBxCik01+JEJygFjlYy/Z4udhKeHJw7VRiAlUM5slJhLGDvuOhykOY20pfel787ovjCpXaRPmjWOP0cA4JGM/NPc/1mIuWT7IytZcQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 198.47.21.195) smtp.rcpttodomain=davemloft.net smtp.mailfrom=ti.com; dmarc=pass (p=quarantine sp=none pct=100) action=none header.from=ti.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VunSYuPg3DSq2U99j/pbke82XIurz/Auhi89UzNzQvE=; b=sNgc2UzWIIQauNxFk0H83qiMVMIubYAHHOR2kw6oCVWOl1QZiDWpwwSXVYWG/FYqSrTEUAklZzftqudP2osr04qQGSrSkdf+aeReaZckxt8GMA4NfSzVv7scw8dhwm8eHkTHKPqG2im7SDBrnLPee+JaW16G1dnbfxBiA2KsIUI= Received: from CYZPR05CA0044.namprd05.prod.outlook.com (2603:10b6:930:a3::23) by IA3PR10MB8491.namprd10.prod.outlook.com (2603:10b6:208:576::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.12; Mon, 8 Jun 2026 10:09:44 +0000 Received: from CH3PEPF0000000C.namprd04.prod.outlook.com (2603:10b6:930:a3:cafe::3a) by CYZPR05CA0044.outlook.office365.com (2603:10b6:930:a3::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.113.9 via Frontend Transport; Mon, 8 Jun 2026 10:09:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 198.47.21.195) smtp.mailfrom=ti.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=ti.com; Received-SPF: Pass (protection.outlook.com: domain of ti.com designates 198.47.21.195 as permitted sender) receiver=protection.outlook.com; client-ip=198.47.21.195; helo=flwvzet201.ext.ti.com; pr=C Received: from flwvzet201.ext.ti.com (198.47.21.195) by CH3PEPF0000000C.mail.protection.outlook.com (10.167.244.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.113.7 via Frontend Transport; Mon, 8 Jun 2026 10:09:41 +0000 Received: from DFLE200.ent.ti.com (10.64.6.58) by flwvzet201.ext.ti.com (10.248.192.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Mon, 8 Jun 2026 05:09:41 -0500 Received: from DFLE207.ent.ti.com (10.64.6.65) by DFLE200.ent.ti.com (10.64.6.58) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37; Mon, 8 Jun 2026 05:09:41 -0500 Received: from fllvem-mr08.itg.ti.com (10.64.41.88) by DFLE207.ent.ti.com (10.64.6.65) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.37 via Frontend Transport; Mon, 8 Jun 2026 05:09:41 -0500 Received: from lelv0854.itg.ti.com (lelv0854.itg.ti.com [10.181.64.140]) by fllvem-mr08.itg.ti.com (8.18.1/8.18.1) with ESMTP id 658A9fZc3069930; Mon, 8 Jun 2026 05:09:41 -0500 Received: from localhost (danish-tpc.dhcp.ti.com [172.24.231.152]) by lelv0854.itg.ti.com (8.14.7/8.14.7) with ESMTP id 658A9dHw015205; Mon, 8 Jun 2026 05:09:40 -0500 From: MD Danish Anwar To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Jonathan Corbet , Shuah Khan , MD Danish Anwar , Roger Quadros , Andrew Lunn , Jacob Keller , "Meghana Malladi" , David Carlier , "Vadim Fedorenko" , Kevin Hao , Himanshu Mittal , Hangbin Liu , Markus Elfring , Fernando Fernandez Mancera , Jan Vaclav CC: , , , Subject: [PATCH net-next v3 3/3] net: ti: icssg: Add HSR offload statistics support Date: Mon, 8 Jun 2026 15:39:30 +0530 Message-ID: <20260608100930.210149-4-danishanwar@ti.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260608100930.210149-1-danishanwar@ti.com> References: <20260608100930.210149-1-danishanwar@ti.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH3PEPF0000000C:EE_|IA3PR10MB8491:EE_ X-MS-Office365-Filtering-Correlation-Id: 86e61354-0281-4fb3-451e-08dec5460edc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|36860700016|82310400026|921020|6133799003|3023799007|56012099006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: n0imMQ2mKuAYdsx08AsVy2xt46LO8UJIseFg7UMnfEbAPyjtsnj3PxSfsbTnW5eVSr+hQ+irUjhVKc0LbM6ZruGaMLBcwJNJLKJk9XcXalfNQWsUX806QKNTQ5T887KMVnh7zQ6+CvsgA+2QNXeTP6zCYr0OlBD27BRamOiSacX0KLz4H8rl5wUzSo4GDow4ReV2rm4ggCEAI9X/Gwgc4hd3/qUNZfRQZ/+fz1zxTZnf7f9uZ98Utteou1z09outWF1NmwPapk0f52hZuMNsBUVFiB+VQNU+fW+P1eP7Zbpq1V6xCwB7EVWY4YvrsBSSpromNQ0b1q58WnG/15MQfNcJfQSLzgScdnu9wRBi+gZNW4BWAoA32BMfJ8M55A9Ngf+XHoFabNyaJhexwyY+NNzJLgp4vxhnnPFUDNqTwA12HfYC/RUldFFG7IwIlzIl33qkLTvuX8+POtiUuyIeWkrVDRCZsA3Anbc+LDcTlOK56IyhH60Vn1km9m6H7CABwKqnEbRfkHUBzhJ6SqdRd8l5krcR6waVL8WmU9rvc8C3lM9NdYZQFrgcjNXyihJX0SYYWak8fFY5fNDEVs86ln08K77t5oVC5UFV7bCbN/HjuiB2BIayzibu9x3DWcqncMGM3RBQO3WgUz+rGpeBmDUNj1Hv6erLCSO+JOE5q1EpXQxIqEIqDpMk1nCPUvWIoO6Dd355I6s/aJZXQnakPVbWTJSrnN5Etpd1sPR82KlIHBdMQvnLpcnQWyZhDmPqLJD6JvZWWlZ0nt5VTWF7fA== X-Forefront-Antispam-Report: CIP:198.47.21.195;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:flwvzet201.ext.ti.com;PTR:ErrorRetry;CAT:NONE;SFS:(13230040)(7416014)(376014)(1800799024)(36860700016)(82310400026)(921020)(6133799003)(3023799007)(56012099006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JGk8O9hORdvwzXUnbRoZ/WPdcaJDY+dMbG1XHj/nOvlnomOxM1PRFq1toO+oSFRB+YGYxJLWO1Rlygoy0TNg68hkEGPuOwWuuemzzmgH5TL+8eN/26wcfxvl8ic8GJsGF4vvrbjsSxP9/E21BnsRIS3IwCugI8oKdDPAAy36vnQnghc/sbOZRF9B2xTuKh4kEwdtsk9H5VlOoOLNxu/jjqlEe0L787EtfF8BA6fBpnPTSfYlcO2bAmJ+6deEYqvbwmW4Q0KjNMFMDUPEbR3eBN0kWgW413zzSWl4WOY2KJmXerSXqV8OJMYcx6/+hdVhDXy1qvxhs0oQ+F7rwNQll7KluvSNkcRSzvp5Ih0S0lr0dyH8Ehzm1HLeQvhz246Cez9DI3fq1QtHOhVtatmhZT3O6ibw9L4nbM4ZfYoG9/eij2bUAoPExpeREBAlm8PZ X-OriginatorOrg: ti.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2026 10:09:41.9881 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86e61354-0281-4fb3-451e-08dec5460edc X-MS-Exchange-CrossTenant-Id: e5b49634-450b-4709-8abb-1e2b19b982b7 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5b49634-450b-4709-8abb-1e2b19b982b7;Ip=[198.47.21.195];Helo=[flwvzet201.ext.ti.com] X-MS-Exchange-CrossTenant-AuthSource: CH3PEPF0000000C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8491 Add support for exposing ICSSG HSR statistics through two interfaces: ethtool and the standard RTM_GETSTATS / IFLA_STATS_LINK_XSTATS path. Add a standard_stats flag to struct icssg_pa_stats and extend icssg_all_pa_stats[] with 10 new entries: Firmware-specific HSR counters (standard_stats=false, ethtool only): - FW_HSR_FWD_CHECK_FAIL_DROP - FW_HSR_HE_CHECK_FAIL_DROP - FW_HSR_SKIP_HOST_DUP_DISCARD IEC 62439-3 LRE counters (standard_stats=true, excluded from ethtool): - FW_LRE_CNT_UNIQUE_RX, FW_LRE_CNT_DUPLICATE_RX, FW_LRE_CNT_MULTIPLE_RX - FW_LRE_CNT_RX, FW_LRE_CNT_TX, FW_LRE_CNT_OWN_RX - FW_LRE_CNT_ERRWRONGLAN The ethtool get_strings/get_ethtool_stats callbacks skip entries with standard_stats=true so they do not appear as ethtool counters. ICSSG_NUM_PA_STANDARD_STATS is introduced and accounted for in ICSSG_NUM_ETHTOOL_STATS so the sset count stays accurate. ICSSG_NUM_PA_STATS is updated from 32 to 42. Implement ndo_has_offload_stats() and ndo_get_offload_stats() in emac_netdev_ops to expose the IEC 62439-3 LRE counters via the HSR stack's RTM_GETSTATS / IFLA_STATS_LINK_XSTATS interface. The HSR stack calls these NDOs on slave A; the callback reads PA stat registers for both ports (MAC0 = port A, MAC1 = port B) from the shared prueth instance and fills struct hsr_lre_stats. Port C counters are not available in ICSSG hardware and remain at ~0ULL. Export emac_update_hardware_stats() and emac_get_stat_by_name() as GPL symbols so they can be called from icssg_prueth.c. Also change emac_get_stat_by_name() return type from int to u64 and make it return ~0ULL on an unknown stat name instead of -EINVAL, consistent with the hsr_lre_stats sentinel convention. Add FW_HSR_FWD_CHECK_FAIL_DROP and FW_HSR_HE_CHECK_FAIL_DROP to the rx_dropped sum in ndo_get_stats64, as these represent frames discarded by the HSR forwarding logic. Signed-off-by: MD Danish Anwar --- .../ethernet/ti/icssg_prueth.rst | 19 ++++ drivers/net/ethernet/ti/icssg/icssg_common.c | 7 +- drivers/net/ethernet/ti/icssg/icssg_ethtool.c | 10 +- drivers/net/ethernet/ti/icssg/icssg_prueth.c | 91 +++++++++++++++++++ drivers/net/ethernet/ti/icssg/icssg_prueth.h | 10 +- drivers/net/ethernet/ti/icssg/icssg_stats.c | 6 +- drivers/net/ethernet/ti/icssg/icssg_stats.h | 85 +++++++++-------- .../net/ethernet/ti/icssg/icssg_switch_map.h | 10 ++ 8 files changed, 192 insertions(+), 46 deletions(-) diff --git a/Documentation/networking/device_drivers/ethernet/ti/icssg_prueth.rst b/Documentation/networking/device_drivers/ethernet/ti/icssg_prueth.rst index da21ddf431bbc..faa1fc18a6737 100644 --- a/Documentation/networking/device_drivers/ethernet/ti/icssg_prueth.rst +++ b/Documentation/networking/device_drivers/ethernet/ti/icssg_prueth.rst @@ -54,3 +54,22 @@ These statistics are as follows, - ``FW_HOST_TX_PKT_CNT``: Number of valid packets copied by RTU0 to Tx queues - ``FW_HOST_EGRESS_Q_PRE_OVERFLOW``: Host Egress Q (Pre-emptible) Overflow Counter - ``FW_HOST_EGRESS_Q_EXP_OVERFLOW``: Host Egress Q (Pre-emptible) Overflow Counter + - ``FW_HSR_FWD_CHECK_FAIL_DROP``: Packets dropped on the HSR forwarding path due to failed checks + - ``FW_HSR_HE_CHECK_FAIL_DROP``: Packets dropped on the host egress path due to failed checks + - ``FW_HSR_SKIP_HOST_DUP_DISCARD``: Frames for which the host duplicate discard check was skipped + +HSR/LRE Standard Statistics +============================ + +When the ICSSG operates in HSR offload mode the driver exposes the IEC 62439-3 +LRE counters through the standard netlink stats interface. + +The following per-port (port A and port B) LRE counters are reported: + + - ``lreCntTx``: Number of HSR/PRP tagged frames sent + - ``lreCntRx``: Number of HSR/PRP tagged frames received + - ``lreCntUnique``: Number of frames received with no duplicate detected + - ``lreCntDuplicate``: Number of frames received for which exactly one duplicate was detected + - ``lreCntMultiple``: Number of frames received for which more than one duplicate was detected + - ``lreCntOwnRx``: Number of HSR/PRP tagged frames received whose source MAC matches the node's own address + - ``lreCntErrWrongLan``: Number of frames received with a wrong LAN identifier (PRP only) diff --git a/drivers/net/ethernet/ti/icssg/icssg_common.c b/drivers/net/ethernet/ti/icssg/icssg_common.c index a28a608f9bf4b..1fcb031949535 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_common.c +++ b/drivers/net/ethernet/ti/icssg/icssg_common.c @@ -1643,7 +1643,12 @@ void icssg_ndo_get_stats64(struct net_device *ndev, emac_get_stat_by_name(emac, "FW_INF_DROP_TAGGED") + emac_get_stat_by_name(emac, "FW_INF_DROP_PRIOTAGGED") + emac_get_stat_by_name(emac, "FW_INF_DROP_NOTAG") + - emac_get_stat_by_name(emac, "FW_INF_DROP_NOTMEMBER"); + emac_get_stat_by_name(emac, + "FW_INF_DROP_NOTMEMBER") + + emac_get_stat_by_name(emac, + "FW_HSR_FWD_CHECK_FAIL_DROP") + + emac_get_stat_by_name(emac, + "FW_HSR_HE_CHECK_FAIL_DROP"); stats->tx_errors = ndev->stats.tx_errors; stats->tx_dropped = ndev->stats.tx_dropped + emac_get_stat_by_name(emac, "FW_RTU_PKT_DROP") + diff --git a/drivers/net/ethernet/ti/icssg/icssg_ethtool.c b/drivers/net/ethernet/ti/icssg/icssg_ethtool.c index b715af21d23ac..7a99c99aab1e8 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_ethtool.c +++ b/drivers/net/ethernet/ti/icssg/icssg_ethtool.c @@ -74,7 +74,9 @@ static int emac_get_sset_count(struct net_device *ndev, int stringset) if (emac->prueth->pa_stats) return ICSSG_NUM_ETHTOOL_STATS; else - return ICSSG_NUM_ETHTOOL_STATS - ICSSG_NUM_PA_STATS; + return ICSSG_NUM_ETHTOOL_STATS - + (ICSSG_NUM_PA_STATS - + ICSSG_NUM_PA_STANDARD_STATS); default: return -EOPNOTSUPP; } @@ -93,7 +95,8 @@ static void emac_get_strings(struct net_device *ndev, u32 stringset, u8 *data) ethtool_puts(&p, icssg_all_miig_stats[i].name); if (emac->prueth->pa_stats) for (i = 0; i < ARRAY_SIZE(icssg_all_pa_stats); i++) - ethtool_puts(&p, icssg_all_pa_stats[i].name); + if (!icssg_all_pa_stats[i].standard_stats) + ethtool_puts(&p, icssg_all_pa_stats[i].name); break; default: break; @@ -114,7 +117,8 @@ static void emac_get_ethtool_stats(struct net_device *ndev, if (emac->prueth->pa_stats) for (i = 0; i < ARRAY_SIZE(icssg_all_pa_stats); i++) - *(data++) = emac->pa_stats[i]; + if (!icssg_all_pa_stats[i].standard_stats) + *(data++) = emac->pa_stats[i]; } static int emac_get_ts_info(struct net_device *ndev, diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.c b/drivers/net/ethernet/ti/icssg/icssg_prueth.c index 591be5c8056b4..bd390ccf7e450 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.c +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -1633,6 +1634,94 @@ int prueth_xsk_wakeup(struct net_device *ndev, u32 qid, u32 flags) return 0; } +/** + * prueth_ndo_get_offload_stats - Fill standard LRE counters from ICSSG. + * @attr_id: Stats attribute ID; only IFLA_STATS_LINK_XSTATS is handled. + * @dev: Slave net_device (port A) whose offload stats are requested. + * @sp: Output pointer; cast to struct hsr_lre_stats *. + * + * Called by the HSR stack via ndo_get_offload_stats on the slave A device. + * Fetches the per-port PA stat register snapshots for port A and port B, + * and fills the IEC-62439-3 per-port LRE counters. Port C (interlink) + * counters are not available in ICSSG hardware and remain at ~0ULL. + * + * Return: 0 on success, -EOPNOTSUPP if the device does not support + * HSR offload statistics for the requested attribute. + */ +static int prueth_ndo_get_offload_stats(int attr_id, + const struct net_device *dev, + void *sp) +{ + struct hsr_lre_stats *stats = sp; + struct prueth_emac *emac0; + struct prueth_emac *emac1; + struct prueth_emac *emac = netdev_priv(dev); + struct prueth *prueth = emac->prueth; + + if (attr_id != IFLA_STATS_LINK_XSTATS) + return -EOPNOTSUPP; + + if (!prueth->is_hsr_offload_mode) + return -EOPNOTSUPP; + + emac0 = prueth->emac[PRUETH_MAC0]; + emac1 = prueth->emac[PRUETH_MAC1]; + + if (!prueth->pa_stats) + return -EOPNOTSUPP; + + /* Initialise all fields to ~0ULL ("unsupported"); only port A and B + * counters are filled — port C and aggregate counters are not + * available in ICSSG hardware. + */ + memset(stats, 0xff, sizeof(*stats)); + + emac_update_hardware_stats(emac0); + stats->cnt_tx_a = + emac_get_stat_by_name(emac0, "FW_LRE_CNT_TX"); + stats->cnt_rx_a = + emac_get_stat_by_name(emac0, "FW_LRE_CNT_RX"); + stats->cnt_unique_a = + emac_get_stat_by_name(emac0, "FW_LRE_CNT_UNIQUE_RX"); + stats->cnt_duplicate_a = + emac_get_stat_by_name(emac0, "FW_LRE_CNT_DUPLICATE_RX"); + stats->cnt_multi_a = + emac_get_stat_by_name(emac0, "FW_LRE_CNT_MULTIPLE_RX"); + stats->cnt_own_rx_a = + emac_get_stat_by_name(emac0, "FW_LRE_CNT_OWN_RX"); + /* lreCntErrWrongLan is PRP only */ + stats->cnt_err_wrong_lan_a = + emac_get_stat_by_name(emac0, "FW_LRE_CNT_ERRWRONGLAN"); + + emac_update_hardware_stats(emac1); + stats->cnt_tx_b = + emac_get_stat_by_name(emac1, "FW_LRE_CNT_TX"); + stats->cnt_rx_b = + emac_get_stat_by_name(emac1, "FW_LRE_CNT_RX"); + stats->cnt_unique_b = + emac_get_stat_by_name(emac1, "FW_LRE_CNT_UNIQUE_RX"); + stats->cnt_duplicate_b = + emac_get_stat_by_name(emac1, "FW_LRE_CNT_DUPLICATE_RX"); + stats->cnt_multi_b = + emac_get_stat_by_name(emac1, "FW_LRE_CNT_MULTIPLE_RX"); + stats->cnt_own_rx_b = + emac_get_stat_by_name(emac1, "FW_LRE_CNT_OWN_RX"); + stats->cnt_err_wrong_lan_b = + emac_get_stat_by_name(emac1, "FW_LRE_CNT_ERRWRONGLAN"); + + return 0; +} + +static bool prueth_ndo_has_offload_stats(const struct net_device *dev, + int attr_id) +{ + struct prueth_emac *emac = netdev_priv(dev); + struct prueth *prueth = emac->prueth; + + return attr_id == IFLA_STATS_LINK_XSTATS && + prueth->is_hsr_offload_mode && prueth->pa_stats; +} + static const struct net_device_ops emac_netdev_ops = { .ndo_open = emac_ndo_open, .ndo_stop = emac_ndo_stop, @@ -1652,6 +1741,8 @@ static const struct net_device_ops emac_netdev_ops = { .ndo_hwtstamp_get = icssg_ndo_get_ts_config, .ndo_hwtstamp_set = icssg_ndo_set_ts_config, .ndo_xsk_wakeup = prueth_xsk_wakeup, + .ndo_has_offload_stats = prueth_ndo_has_offload_stats, + .ndo_get_offload_stats = prueth_ndo_get_offload_stats, }; static int prueth_netdev_init(struct prueth *prueth, diff --git a/drivers/net/ethernet/ti/icssg/icssg_prueth.h b/drivers/net/ethernet/ti/icssg/icssg_prueth.h index df93d15c5b786..d6c221e897924 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_prueth.h +++ b/drivers/net/ethernet/ti/icssg/icssg_prueth.h @@ -57,12 +57,14 @@ #define ICSSG_MAX_RFLOWS 8 /* per slice */ -#define ICSSG_NUM_PA_STATS 32 +#define ICSSG_NUM_PA_STATS 42 #define ICSSG_NUM_MIIG_STATS 60 /* Number of ICSSG related stats */ #define ICSSG_NUM_STATS (ICSSG_NUM_MIIG_STATS + ICSSG_NUM_PA_STATS) -#define ICSSG_NUM_STANDARD_STATS 31 -#define ICSSG_NUM_ETHTOOL_STATS (ICSSG_NUM_STATS - ICSSG_NUM_STANDARD_STATS) +#define ICSSG_NUM_STANDARD_STATS 31 +#define ICSSG_NUM_PA_STANDARD_STATS 7 +#define ICSSG_NUM_ETHTOOL_STATS (ICSSG_NUM_STATS - ICSSG_NUM_STANDARD_STATS - \ + ICSSG_NUM_PA_STANDARD_STATS) #define IEP_DEFAULT_CYCLE_TIME_NS 1000000 /* 1 ms */ @@ -458,7 +460,7 @@ int emac_fdb_flow_id_updated(struct prueth_emac *emac); void icssg_stats_work_handler(struct work_struct *work); void emac_update_hardware_stats(struct prueth_emac *emac); -int emac_get_stat_by_name(struct prueth_emac *emac, char *stat_name); +u64 emac_get_stat_by_name(struct prueth_emac *emac, char *stat_name); /* Common functions */ void prueth_cleanup_rx_chns(struct prueth_emac *emac, diff --git a/drivers/net/ethernet/ti/icssg/icssg_stats.c b/drivers/net/ethernet/ti/icssg/icssg_stats.c index 7159baa0155cf..9950d0ba899fa 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_stats.c +++ b/drivers/net/ethernet/ti/icssg/icssg_stats.c @@ -62,6 +62,7 @@ void emac_update_hardware_stats(struct prueth_emac *emac) spin_unlock(&prueth->stats_lock); } +EXPORT_SYMBOL_GPL(emac_update_hardware_stats); void icssg_stats_work_handler(struct work_struct *work) { @@ -74,7 +75,7 @@ void icssg_stats_work_handler(struct work_struct *work) } EXPORT_SYMBOL_GPL(icssg_stats_work_handler); -int emac_get_stat_by_name(struct prueth_emac *emac, char *stat_name) +u64 emac_get_stat_by_name(struct prueth_emac *emac, char *stat_name) { int i; @@ -91,5 +92,6 @@ int emac_get_stat_by_name(struct prueth_emac *emac, char *stat_name) } netdev_err(emac->ndev, "Invalid stats %s\n", stat_name); - return -EINVAL; + return ~0ULL; } +EXPORT_SYMBOL_GPL(emac_get_stat_by_name); diff --git a/drivers/net/ethernet/ti/icssg/icssg_stats.h b/drivers/net/ethernet/ti/icssg/icssg_stats.h index 6f4400d8a0f61..373debfb815cc 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_stats.h +++ b/drivers/net/ethernet/ti/icssg/icssg_stats.h @@ -157,50 +157,63 @@ static const struct icssg_miig_stats icssg_all_miig_stats[] = { static_assert(ARRAY_SIZE(icssg_all_miig_stats) == ICSSG_NUM_MIIG_STATS); -#define ICSSG_PA_STATS(field) \ -{ \ - #field, \ - field, \ +#define ICSSG_PA_STATS(field, stats_type) \ +{ \ + #field, \ + field, \ + stats_type \ } struct icssg_pa_stats { char name[ETH_GSTRING_LEN]; u32 offset; + bool standard_stats; }; static const struct icssg_pa_stats icssg_all_pa_stats[] = { - ICSSG_PA_STATS(FW_RTU_PKT_DROP), - ICSSG_PA_STATS(FW_Q0_OVERFLOW), - ICSSG_PA_STATS(FW_Q1_OVERFLOW), - ICSSG_PA_STATS(FW_Q2_OVERFLOW), - ICSSG_PA_STATS(FW_Q3_OVERFLOW), - ICSSG_PA_STATS(FW_Q4_OVERFLOW), - ICSSG_PA_STATS(FW_Q5_OVERFLOW), - ICSSG_PA_STATS(FW_Q6_OVERFLOW), - ICSSG_PA_STATS(FW_Q7_OVERFLOW), - ICSSG_PA_STATS(FW_DROPPED_PKT), - ICSSG_PA_STATS(FW_RX_ERROR), - ICSSG_PA_STATS(FW_RX_DS_INVALID), - ICSSG_PA_STATS(FW_TX_DROPPED_PACKET), - ICSSG_PA_STATS(FW_TX_TS_DROPPED_PACKET), - ICSSG_PA_STATS(FW_INF_PORT_DISABLED), - ICSSG_PA_STATS(FW_INF_SAV), - ICSSG_PA_STATS(FW_INF_SA_DL), - ICSSG_PA_STATS(FW_INF_PORT_BLOCKED), - ICSSG_PA_STATS(FW_INF_DROP_TAGGED), - ICSSG_PA_STATS(FW_INF_DROP_PRIOTAGGED), - ICSSG_PA_STATS(FW_INF_DROP_NOTAG), - ICSSG_PA_STATS(FW_INF_DROP_NOTMEMBER), - ICSSG_PA_STATS(FW_RX_EOF_SHORT_FRMERR), - ICSSG_PA_STATS(FW_RX_B0_DROP_EARLY_EOF), - ICSSG_PA_STATS(FW_TX_JUMBO_FRM_CUTOFF), - ICSSG_PA_STATS(FW_RX_EXP_FRAG_Q_DROP), - ICSSG_PA_STATS(FW_RX_FIFO_OVERRUN), - ICSSG_PA_STATS(FW_CUT_THR_PKT), - ICSSG_PA_STATS(FW_HOST_RX_PKT_CNT), - ICSSG_PA_STATS(FW_HOST_TX_PKT_CNT), - ICSSG_PA_STATS(FW_HOST_EGRESS_Q_PRE_OVERFLOW), - ICSSG_PA_STATS(FW_HOST_EGRESS_Q_EXP_OVERFLOW), + /* Firmware-specific stats: exposed via ethtool -S only */ + ICSSG_PA_STATS(FW_RTU_PKT_DROP, false), + ICSSG_PA_STATS(FW_Q0_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q1_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q2_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q3_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q4_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q5_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q6_OVERFLOW, false), + ICSSG_PA_STATS(FW_Q7_OVERFLOW, false), + ICSSG_PA_STATS(FW_DROPPED_PKT, false), + ICSSG_PA_STATS(FW_RX_ERROR, false), + ICSSG_PA_STATS(FW_RX_DS_INVALID, false), + ICSSG_PA_STATS(FW_TX_DROPPED_PACKET, false), + ICSSG_PA_STATS(FW_TX_TS_DROPPED_PACKET, false), + ICSSG_PA_STATS(FW_INF_PORT_DISABLED, false), + ICSSG_PA_STATS(FW_INF_SAV, false), + ICSSG_PA_STATS(FW_INF_SA_DL, false), + ICSSG_PA_STATS(FW_INF_PORT_BLOCKED, false), + ICSSG_PA_STATS(FW_INF_DROP_TAGGED, false), + ICSSG_PA_STATS(FW_INF_DROP_PRIOTAGGED, false), + ICSSG_PA_STATS(FW_INF_DROP_NOTAG, false), + ICSSG_PA_STATS(FW_INF_DROP_NOTMEMBER, false), + ICSSG_PA_STATS(FW_RX_EOF_SHORT_FRMERR, false), + ICSSG_PA_STATS(FW_RX_B0_DROP_EARLY_EOF, false), + ICSSG_PA_STATS(FW_TX_JUMBO_FRM_CUTOFF, false), + ICSSG_PA_STATS(FW_RX_EXP_FRAG_Q_DROP, false), + ICSSG_PA_STATS(FW_RX_FIFO_OVERRUN, false), + ICSSG_PA_STATS(FW_CUT_THR_PKT, false), + ICSSG_PA_STATS(FW_HOST_RX_PKT_CNT, false), + ICSSG_PA_STATS(FW_HOST_TX_PKT_CNT, false), + ICSSG_PA_STATS(FW_HOST_EGRESS_Q_PRE_OVERFLOW, false), + ICSSG_PA_STATS(FW_HOST_EGRESS_Q_EXP_OVERFLOW, false), + ICSSG_PA_STATS(FW_HSR_FWD_CHECK_FAIL_DROP, false), + ICSSG_PA_STATS(FW_HSR_HE_CHECK_FAIL_DROP, false), + ICSSG_PA_STATS(FW_HSR_SKIP_HOST_DUP_DISCARD, false), + ICSSG_PA_STATS(FW_LRE_CNT_UNIQUE_RX, true), + ICSSG_PA_STATS(FW_LRE_CNT_DUPLICATE_RX, true), + ICSSG_PA_STATS(FW_LRE_CNT_MULTIPLE_RX, true), + ICSSG_PA_STATS(FW_LRE_CNT_RX, true), + ICSSG_PA_STATS(FW_LRE_CNT_TX, true), + ICSSG_PA_STATS(FW_LRE_CNT_OWN_RX, true), + ICSSG_PA_STATS(FW_LRE_CNT_ERRWRONGLAN, true), }; static_assert(ARRAY_SIZE(icssg_all_pa_stats) == ICSSG_NUM_PA_STATS); diff --git a/drivers/net/ethernet/ti/icssg/icssg_switch_map.h b/drivers/net/ethernet/ti/icssg/icssg_switch_map.h index 7e053b8af3ece..556facb33e0ce 100644 --- a/drivers/net/ethernet/ti/icssg/icssg_switch_map.h +++ b/drivers/net/ethernet/ti/icssg/icssg_switch_map.h @@ -266,5 +266,15 @@ #define FW_HOST_TX_PKT_CNT 0x0250 #define FW_HOST_EGRESS_Q_PRE_OVERFLOW 0x0258 #define FW_HOST_EGRESS_Q_EXP_OVERFLOW 0x0260 +#define FW_HSR_FWD_CHECK_FAIL_DROP 0x0500 +#define FW_HSR_HE_CHECK_FAIL_DROP 0x0508 +#define FW_HSR_SKIP_HOST_DUP_DISCARD 0x0510 +#define FW_LRE_CNT_UNIQUE_RX 0x0518 +#define FW_LRE_CNT_DUPLICATE_RX 0x0520 +#define FW_LRE_CNT_MULTIPLE_RX 0x0528 +#define FW_LRE_CNT_RX 0x0530 +#define FW_LRE_CNT_TX 0x0538 +#define FW_LRE_CNT_OWN_RX 0x0540 +#define FW_LRE_CNT_ERRWRONGLAN 0x0548 #endif /* __NET_TI_ICSSG_SWITCH_MAP_H */ -- 2.34.1