From nobody Wed Dec 17 09:16:21 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2041.outbound.protection.outlook.com [40.107.220.41]) (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 6FDD76A022; Fri, 12 Jan 2024 11:40:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="1+wPo49+" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OjPqlGYd2/tat9iuWgMuDKvB4wZy2uQOtWpt5nKqascJ/hQsNHRQoJ4bfRq7FHPNehuDtaEf6O74Y1W/BlDy/ttWdOeDqML+DFHriGnIUMHt26Xirf8y63ZfQoxVLdPWagyewzxjaLxMa9C36zAQ4ylXKhG09mVJtIOh5y88EETUg0Mbjy7nvgaxYOmOTJj3eCPJOu1lCpFxaPJEK/YjBntbG3RuKQz3B+nTH3i8+unaSejNvgS86KvHaMr2GGdpAR6jsxrs0GTSXBNgtnmvKNvt4j94DWP8a4oY+E0du86T7MjbarT/wKP7ThU9vLy4IQ3JpLwVtXHqtBq0XnebVA== 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=rUw8NmZhAE6as0nSqZrE/GQBfjijsH7Y/gh1N9abdZA=; b=Jgev2XHrAeW36kGGx3ENwxTUiSYROITv8jii5Bws1bwAAwWoh6OBP2JS3njCom603AAoy7GQvuannroRlrl6zBF7Hw7nQcYecwhcnjSlj3M8Vq50dgqQvTok5WyGOOTPcWMXyB7ErhBvfLvwjjQ1GZCoIEdxq6O2cYiuvrWPOD+x5Pn4THe0j1BS5eAKHiyCiCw+yQOaT60C+CSUxaFV37WpYdt545vNCF7Ji1VD+ZQ94KryW+qUmatSb4nVXe8ibDEHOhk8TlXyeqBoJXsf6bo0LW6kvoCsooP5byDOcFDG+2hmsuWHW6FeAakWnfvOBf4vOF72avLzTQ0UutMSaA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=grandegger.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rUw8NmZhAE6as0nSqZrE/GQBfjijsH7Y/gh1N9abdZA=; b=1+wPo49+vmOR6OQvPI6EG+0yrD+Kd6YHH0lIADolwZOAifOIJZi3zZLjlTwN3J048NUDLnppwWIWdyjtOMDgbiB6vdlm9gU5cAI9QEPBmaww7RfPuEjFWsTx23vcqMXgQh+VFKddU4E5jx4pYUSdOEHh5pNT2Mq8XxsK29rxUvk= Received: from SN6PR2101CA0021.namprd21.prod.outlook.com (2603:10b6:805:106::31) by DS0PR12MB9397.namprd12.prod.outlook.com (2603:10b6:8:1bd::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.23; Fri, 12 Jan 2024 11:40:56 +0000 Received: from SA2PEPF0000150A.namprd04.prod.outlook.com (2603:10b6:805:106:cafe::63) by SN6PR2101CA0021.outlook.office365.com (2603:10b6:805:106::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.14 via Frontend Transport; Fri, 12 Jan 2024 11:40:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SA2PEPF0000150A.mail.protection.outlook.com (10.167.242.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7181.14 via Frontend Transport; Fri, 12 Jan 2024 11:40:55 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Fri, 12 Jan 2024 05:40:55 -0600 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Fri, 12 Jan 2024 05:40:54 -0600 Received: from xhdvnc205.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Fri, 12 Jan 2024 05:40:50 -0600 From: Srinivas Goud To: , , , , , , , , , CC: , , , , , , , Srinivas Goud Subject: [PATCH RESEND v7 1/3] dt-bindings: can: xilinx_can: Add 'xlnx,has-ecc' optional property Date: Fri, 12 Jan 2024 17:07:31 +0530 Message-ID: <1705059453-29099-2-git-send-email-srinivas.goud@amd.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1705059453-29099-1-git-send-email-srinivas.goud@amd.com> References: <1705059453-29099-1-git-send-email-srinivas.goud@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF0000150A:EE_|DS0PR12MB9397:EE_ X-MS-Office365-Filtering-Correlation-Id: 5523c5c6-f365-4abe-8233-08dc136356eb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i58WTts3x8YVFGn8+zeIG0HI7qsByNAR8k0/n8WhuT7upfmQDWGTS5pv0rNjuTwcioAmoD1DWddSyyspFFGgXHAk9LVAeTxzR8kJk+mpS7bB4tbDQ0DvnGMLK/RwmW2AIeDKmvClrfzQSvoMm2LL+EsadvkOB73+IqY5ejG+ZPak2Lk1GqDSVVWBytOiE+EC65as6cu7vL/Rj4+pUgVidQQVb4v47krTayK2TLdMYRQ+8Dk9eedzSYGPvKjFAxu+/YupqsrzNyXB8VAyczCX2ZD5bIajOXthwZG5QMFfQ+wk8r6UOB5HPnTXojgiB8YhHtKDyMYtjZ53GTIrWJfaj/SRJZNoZtKFTaFceWfDH4rLDZSdeDLa4C2zc3Q7zv8T83XDqG4hrto8xlpypf+j/Xowk62B0H8jrJdC0UAQ5TkBQ15QiTg9XHvKW/imXFzoCMwiMhhLGwUyk5sTlJtE20RZVmlA07EyIPRn712q5jeMgAb3u19+cb42B6FsNBo31CaUrgRCiQv6W+im+3MxPJxCNutmhX+COgQbXav0CmEhft36ugfTgCP1cj/ebsXd5E3HKMcnzJg/clcw4rj4m6nDTKm8uyLeFhO0AZCMKc4PFS1a1pSaZsKnb/3IA3BOgxXDtyrX/H446B+KQHMtWYUO2mLugKWCKYnKdd9tDdMmW3jQZ27DtRtK3komUfqDVbrvQJB7mvjRCDq6LDEnIPlqMwqbc9lZNWHBGe3yu9N+sw72F8R5NdoH6KPA5REqhjSRqdWjh+bKXnSiQHpUYoPh4zirLBEGoSp1KN2IV6N87r7hJpQDkS/gbOofkDXhatkNrGdGjoviLunZ24I5oQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(39860400002)(346002)(376002)(396003)(136003)(230922051799003)(230273577357003)(230173577357003)(64100799003)(82310400011)(186009)(1800799012)(451199024)(46966006)(40470700004)(36840700001)(40480700001)(2906002)(40460700003)(8936002)(54906003)(5660300002)(7416002)(44832011)(70206006)(8676002)(41300700001)(47076005)(110136005)(921011)(316002)(70586007)(4326008)(356005)(478600001)(81166007)(36756003)(86362001)(6666004)(26005)(2616005)(36860700001)(82740400003)(336012)(83380400001)(426003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2024 11:40:55.9951 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5523c5c6-f365-4abe-8233-08dc136356eb X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF0000150A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9397 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ECC feature added to CAN TX_OL, TX_TL and RX FIFOs of Xilinx AXI CAN Controller. ECC is an IP configuration option where counter registers are added in IP for 1bit/2bit ECC errors. 'xlnx,has-ecc' is an optional property and added to Xilinx AXI CAN Controll= er node if ECC block enabled in the HW Signed-off-by: Srinivas Goud Acked-by: Conor Dooley --- Changes in v7: None Changes in v6: Update commit description Add Acked-by tag Changes in v5: Update property description Changes in v4: Fix binding check warning Update property description Changes in v3: Update commit description Changes in v2: None Documentation/devicetree/bindings/net/can/xilinx,can.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/net/can/xilinx,can.yaml b/Do= cumentation/devicetree/bindings/net/can/xilinx,can.yaml index 64d57c3..8d4e5af 100644 --- a/Documentation/devicetree/bindings/net/can/xilinx,can.yaml +++ b/Documentation/devicetree/bindings/net/can/xilinx,can.yaml @@ -49,6 +49,10 @@ properties: resets: maxItems: 1 =20 + xlnx,has-ecc: + $ref: /schemas/types.yaml#/definitions/flag + description: CAN TX_OL, TX_TL and RX FIFOs have ECC support(AXI CAN) + required: - compatible - reg @@ -137,6 +141,7 @@ examples: interrupts =3D ; tx-fifo-depth =3D <0x40>; rx-fifo-depth =3D <0x40>; + xlnx,has-ecc; }; =20 - | --=20 2.1.1 From nobody Wed Dec 17 09:16:21 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2052.outbound.protection.outlook.com [40.107.220.52]) (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 B145E6A327; Fri, 12 Jan 2024 11:41:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="bHd6QZY4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y6Qpj+Yoh5qIvCbr8nmcW3ZDlo5vVEvsmky9xsgx73dU6I/ggfSNMQJYGB8WHNMBN1Sg4Wbk7kwB2xFoMO1t8fJ3Rjjks5b/wYTYSyfXDTiOfO6LEgHdmkrsPxTaC9/hOKOQTEO4nq2gdOQBKFVmbz6nPLoqjG+aL9faOhwVm0s0sMZAoMOm3lYPIJ4VSCw66EV3EAnnt9bTrCP7zV2J6Ndt94QOr6SxUyMJYUfg7280IvFKpzUO501bcQVsJOw9kcB9QKwpzs+ViQCtmGQv379Vgdtkq5EQP9I7bdEO11e5iXxCvmAu882WzNRh/P6mATkXF/M7m3+tZnVnDBmI3Q== 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=adrn8x4Xb9ucyvP9lmiGhChyGVZHEshSZWsFtIJ7jaE=; b=T5CdgMYxOnOZP8QFMdCbGtCTgrLT2QZYnHjG5kEIlLpWOfGOr8ZhAxIImlQqP/cqqxdX+Xn1HfGyTkJ3OqxMRuPkFLzBtomghdwBkJKkaBTL73Sk8Sqhz6UIRz8ASsJcqdLBxXpDPL/p2oOcZQ8yLUr7kXS4IdGR/SZoD7il92nd00X6qQmj8xG57GKkYtsGm6xTPRM9PHcOZoacwpD7DcvohwL0kh/58wmepmnmSJfgYNQuGcpnM/l3Y70qdoXAobRsz6NSPHQhFlDyxsS9mA73Fd4mbsZZnljSzX26XT6681d/loka5j4v84q0AaQh1A+xo8X8wyU/kx/AOVyXgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=grandegger.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=adrn8x4Xb9ucyvP9lmiGhChyGVZHEshSZWsFtIJ7jaE=; b=bHd6QZY4mFQ+HaiyIC/njYLsWKRbPJsVAVkeUGYj7PXZ3oByWyFy0HIOTzbg3M8euO/X4ENwwsxQXzt5F58nEjcik5AEXK4JU053PBjY+wgcrH1jGROrBKDoLs3YsJzRid+eBzKWbGYlqZVkz1hnwq8bYexSTTVRVhfIyq5G/o0= Received: from SA1P222CA0134.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:3c2::7) by PH8PR12MB7112.namprd12.prod.outlook.com (2603:10b6:510:22c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.23; Fri, 12 Jan 2024 11:41:01 +0000 Received: from SA2PEPF00001504.namprd04.prod.outlook.com (2603:10b6:806:3c2::4) by SA1P222CA0134.outlook.office365.com (2603:10b6:806:3c2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.23 via Frontend Transport; Fri, 12 Jan 2024 11:41:01 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SA2PEPF00001504.mail.protection.outlook.com (10.167.242.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7181.14 via Frontend Transport; Fri, 12 Jan 2024 11:41:00 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Fri, 12 Jan 2024 05:41:00 -0600 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Fri, 12 Jan 2024 05:40:59 -0600 Received: from xhdvnc205.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Fri, 12 Jan 2024 05:40:55 -0600 From: Srinivas Goud To: , , , , , , , , , CC: , , , , , , , Srinivas Goud Subject: [PATCH RESEND v7 2/3] can: xilinx_can: Add ECC support Date: Fri, 12 Jan 2024 17:07:32 +0530 Message-ID: <1705059453-29099-3-git-send-email-srinivas.goud@amd.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1705059453-29099-1-git-send-email-srinivas.goud@amd.com> References: <1705059453-29099-1-git-send-email-srinivas.goud@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00001504:EE_|PH8PR12MB7112:EE_ X-MS-Office365-Filtering-Correlation-Id: 518bd8f8-4aab-450b-9a4e-08dc136359b5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eLWB9kJywG9xqlNdMdi+hbEo15WFWQ4XJfC6JmePEpXzFVdmcF5NTYCY31rGxhWs8u8Bqb8dsnAL6+nxG6lLLFiQuZCPLxyr1vUk7N3wYNSfqNwYhXSjeBkYeTBG1XiHEzGwvTd4LtxkjXzA58VSZx3X41DupnKeCJ5rVj+xkogYMQY6eBpJo5Fx0dsPdevrUOEvdAMDmG1PgcYLgElYHkZsCwFZkLBmSqDCeOwHkqleSGRwfrtA55a/giqC9mu8/q0JmW3ApWWxzfmbeJPMnsGyDMnIzFG3B2wVWOKCuFiO86M3mniP3yV/KOXTr3oeER8JHZfriBeTzCpFG1lFITgZ8O/nQaquBdliJIfHLAedhiLB3XqokOZh6FCJcI7uBIFQS6RRXYAccNk7CYnHlOU/r97F+wJDd7SHltyiQk7EBdVH8Z8eP6LM7/UaHYFRMY1KMOc+IkcWQc0connp5kmwn5U8Xzt9gX9cIQVdNwboMjrhhfZjTFK+kWqOX/MbyLuh7GBOl8vXA2UtZmRi079DIUUQiGyeENOJXp8Bh7j8LsLRbvDTEkupWEN77LRjU7nyj3zZG7t4lsBLTzvAeZb6slPFVjpEWdx/Epbfkfp/L3PiqT95JBO7OKWneN1wLW1bydImPv9OmFpyBIgyRsmlF9rljzzPjEdCvfVaWJDoqcqftK+00+/h/zFx/sjgIGSiO1PnaFLM4cUmFypGEGmqKyMZaAiSSyQJThZez7svIfiQCABdHBUJTojugG6eCwnh2mnYN6jLXtu/G8tzSsk70NhEev6QPqnUhx8Q0Vc= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(346002)(39860400002)(136003)(396003)(376002)(230922051799003)(64100799003)(186009)(451199024)(1800799012)(82310400011)(46966006)(36840700001)(40470700004)(40460700003)(40480700001)(336012)(426003)(6666004)(26005)(478600001)(2616005)(82740400003)(81166007)(36756003)(41300700001)(921011)(356005)(86362001)(2906002)(47076005)(36860700001)(110136005)(316002)(5660300002)(83380400001)(7416002)(70206006)(4326008)(44832011)(8936002)(54906003)(70586007)(8676002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2024 11:41:00.6906 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 518bd8f8-4aab-450b-9a4e-08dc136359b5 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00001504.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7112 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add ECC support for Xilinx CAN Controller, so this driver reports 1bit/2bit ECC errors for FIFO's based on ECC error interrupt. ECC feature for Xilinx CAN Controller selected through 'xlnx,has-ecc' DT property Signed-off-by: Srinivas Goud --- Changes in v7: None Changes in v6: None Changes in v5: Address review comments Change the sequence of updates the stats Use u64 stats helper function Changes in v4: None Changes in v3: None Changes in v2: Address review comments drivers/net/can/xilinx_can.c | 105 +++++++++++++++++++++++++++++++++++++++= ++-- 1 file changed, 101 insertions(+), 4 deletions(-) diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c index abe58f1..c8691a1 100644 --- a/drivers/net/can/xilinx_can.c +++ b/drivers/net/can/xilinx_can.c @@ -31,6 +31,7 @@ #include #include #include +#include =20 #define DRIVER_NAME "xilinx_can" =20 @@ -58,6 +59,13 @@ enum xcan_reg { */ XCAN_F_BTR_OFFSET =3D 0x08C, /* Data Phase Bit Timing */ XCAN_TRR_OFFSET =3D 0x0090, /* TX Buffer Ready Request */ + + /* only on AXI CAN cores */ + XCAN_ECC_CFG_OFFSET =3D 0xC8, /* ECC Configuration */ + XCAN_TXTLFIFO_ECC_OFFSET =3D 0xCC, /* TXTL FIFO ECC error counter */ + XCAN_TXOLFIFO_ECC_OFFSET =3D 0xD0, /* TXOL FIFO ECC error counter */ + XCAN_RXFIFO_ECC_OFFSET =3D 0xD4, /* RX FIFO ECC error counter */ + XCAN_AFR_EXT_OFFSET =3D 0x00E0, /* Acceptance Filter */ XCAN_FSR_OFFSET =3D 0x00E8, /* RX FIFO Status */ XCAN_TXMSG_BASE_OFFSET =3D 0x0100, /* TX Message Space */ @@ -124,6 +132,18 @@ enum xcan_reg { #define XCAN_IXR_TXFLL_MASK 0x00000004 /* Tx FIFO Full intr */ #define XCAN_IXR_TXOK_MASK 0x00000002 /* TX successful intr */ #define XCAN_IXR_ARBLST_MASK 0x00000001 /* Arbitration lost intr */ +#define XCAN_IXR_E2BERX_MASK BIT(23) /* RX FIFO two bit ECC error */ +#define XCAN_IXR_E1BERX_MASK BIT(22) /* RX FIFO one bit ECC error */ +#define XCAN_IXR_E2BETXOL_MASK BIT(21) /* TXOL FIFO two bit ECC error */ +#define XCAN_IXR_E1BETXOL_MASK BIT(20) /* TXOL FIFO One bit ECC error */ +#define XCAN_IXR_E2BETXTL_MASK BIT(19) /* TXTL FIFO Two bit ECC error */ +#define XCAN_IXR_E1BETXTL_MASK BIT(18) /* TXTL FIFO One bit ECC error */ +#define XCAN_IXR_ECC_MASK (XCAN_IXR_E2BERX_MASK | \ + XCAN_IXR_E1BERX_MASK | \ + XCAN_IXR_E2BETXOL_MASK | \ + XCAN_IXR_E1BETXOL_MASK | \ + XCAN_IXR_E2BETXTL_MASK | \ + XCAN_IXR_E1BETXTL_MASK) #define XCAN_IDR_ID1_MASK 0xFFE00000 /* Standard msg identifier */ #define XCAN_IDR_SRR_MASK 0x00100000 /* Substitute remote TXreq */ #define XCAN_IDR_IDE_MASK 0x00080000 /* Identifier extension */ @@ -137,6 +157,11 @@ enum xcan_reg { #define XCAN_2_FSR_RI_MASK 0x0000003F /* RX Read Index */ #define XCAN_DLCR_EDL_MASK 0x08000000 /* EDL Mask in DLC */ #define XCAN_DLCR_BRS_MASK 0x04000000 /* BRS Mask in DLC */ +#define XCAN_ECC_CFG_REECRX_MASK BIT(2) /* Reset RX FIFO ECC error counter= s */ +#define XCAN_ECC_CFG_REECTXOL_MASK BIT(1) /* Reset TXOL FIFO ECC error cou= nters */ +#define XCAN_ECC_CFG_REECTXTL_MASK BIT(0) /* Reset TXTL FIFO ECC error cou= nters */ +#define XCAN_ECC_1BIT_CNT_MASK GENMASK(15, 0) /* FIFO ECC 1bit count mask= */ +#define XCAN_ECC_2BIT_CNT_MASK GENMASK(31, 16) /* FIFO ECC 2bit count mas= k */ =20 /* CAN register bit shift - XCAN___SHIFT */ #define XCAN_BRPR_TDC_ENABLE BIT(16) /* Transmitter Delay Compensation (T= DC) Enable */ @@ -202,6 +227,13 @@ struct xcan_devtype_data { * @devtype: Device type specific constants * @transceiver: Optional pointer to associated CAN transceiver * @rstc: Pointer to reset control + * @ecc_enable: ECC enable flag + * @ecc_2bit_rxfifo_cnt: RXFIFO 2bit ECC count + * @ecc_1bit_rxfifo_cnt: RXFIFO 1bit ECC count + * @ecc_2bit_txolfifo_cnt: TXOLFIFO 2bit ECC count + * @ecc_1bit_txolfifo_cnt: TXOLFIFO 1bit ECC count + * @ecc_2bit_txtlfifo_cnt: TXTLFIFO 2bit ECC count + * @ecc_1bit_txtlfifo_cnt: TXTLFIFO 1bit ECC count */ struct xcan_priv { struct can_priv can; @@ -221,6 +253,13 @@ struct xcan_priv { struct xcan_devtype_data devtype; struct phy *transceiver; struct reset_control *rstc; + bool ecc_enable; + u64_stats_t ecc_2bit_rxfifo_cnt; + u64_stats_t ecc_1bit_rxfifo_cnt; + u64_stats_t ecc_2bit_txolfifo_cnt; + u64_stats_t ecc_1bit_txolfifo_cnt; + u64_stats_t ecc_2bit_txtlfifo_cnt; + u64_stats_t ecc_1bit_txtlfifo_cnt; }; =20 /* CAN Bittiming constants as per Xilinx CAN specs */ @@ -523,6 +562,9 @@ static int xcan_chip_start(struct net_device *ndev) XCAN_IXR_ERROR_MASK | XCAN_IXR_RXOFLW_MASK | XCAN_IXR_ARBLST_MASK | xcan_rx_int_mask(priv); =20 + if (priv->ecc_enable) + ier |=3D XCAN_IXR_ECC_MASK; + if (priv->devtype.flags & XCAN_FLAG_RXMNF) ier |=3D XCAN_IXR_RXMNF_MASK; =20 @@ -1127,6 +1169,50 @@ static void xcan_err_interrupt(struct net_device *nd= ev, u32 isr) priv->can.can_stats.bus_error++; } =20 + if (priv->ecc_enable && isr & XCAN_IXR_ECC_MASK) { + u32 reg_rx_ecc, reg_txol_ecc, reg_txtl_ecc; + + reg_rx_ecc =3D priv->read_reg(priv, XCAN_RXFIFO_ECC_OFFSET); + reg_txol_ecc =3D priv->read_reg(priv, XCAN_TXOLFIFO_ECC_OFFSET); + reg_txtl_ecc =3D priv->read_reg(priv, XCAN_TXTLFIFO_ECC_OFFSET); + + /* The counter reaches its maximum at 0xffff and does not overflow. + * Accept the small race window between reading and resetting ECC counte= rs. + */ + priv->write_reg(priv, XCAN_ECC_CFG_OFFSET, XCAN_ECC_CFG_REECRX_MASK | + XCAN_ECC_CFG_REECTXOL_MASK | XCAN_ECC_CFG_REECTXTL_MASK); + + if (isr & XCAN_IXR_E2BERX_MASK) { + u64_stats_add(&priv->ecc_2bit_rxfifo_cnt, + FIELD_GET(XCAN_ECC_2BIT_CNT_MASK, reg_rx_ecc)); + } + + if (isr & XCAN_IXR_E1BERX_MASK) { + u64_stats_add(&priv->ecc_1bit_rxfifo_cnt, + FIELD_GET(XCAN_ECC_1BIT_CNT_MASK, reg_rx_ecc)); + } + + if (isr & XCAN_IXR_E2BETXOL_MASK) { + u64_stats_add(&priv->ecc_2bit_txolfifo_cnt, + FIELD_GET(XCAN_ECC_2BIT_CNT_MASK, reg_txol_ecc)); + } + + if (isr & XCAN_IXR_E1BETXOL_MASK) { + u64_stats_add(&priv->ecc_1bit_txolfifo_cnt, + FIELD_GET(XCAN_ECC_1BIT_CNT_MASK, reg_txol_ecc)); + } + + if (isr & XCAN_IXR_E2BETXTL_MASK) { + u64_stats_add(&priv->ecc_2bit_txtlfifo_cnt, + FIELD_GET(XCAN_ECC_2BIT_CNT_MASK, reg_txtl_ecc)); + } + + if (isr & XCAN_IXR_E1BETXTL_MASK) { + u64_stats_add(&priv->ecc_1bit_txtlfifo_cnt, + FIELD_GET(XCAN_ECC_1BIT_CNT_MASK, reg_txtl_ecc)); + } + } + if (cf.can_id) { struct can_frame *skb_cf; struct sk_buff *skb =3D alloc_can_err_skb(ndev, &skb_cf); @@ -1355,7 +1441,7 @@ static irqreturn_t xcan_interrupt(int irq, void *dev_= id) struct net_device *ndev =3D (struct net_device *)dev_id; struct xcan_priv *priv =3D netdev_priv(ndev); u32 isr, ier; - u32 isr_errors; + u32 isr_errors, mask; u32 rx_int_mask =3D xcan_rx_int_mask(priv); =20 /* Get the interrupt status from Xilinx CAN */ @@ -1374,10 +1460,15 @@ static irqreturn_t xcan_interrupt(int irq, void *de= v_id) if (isr & XCAN_IXR_TXOK_MASK) xcan_tx_interrupt(ndev, isr); =20 + mask =3D XCAN_IXR_ERROR_MASK | XCAN_IXR_RXOFLW_MASK | + XCAN_IXR_BSOFF_MASK | XCAN_IXR_ARBLST_MASK | + XCAN_IXR_RXMNF_MASK; + + if (priv->ecc_enable) + mask |=3D XCAN_IXR_ECC_MASK; + /* Check for the type of error interrupt and Processing it */ - isr_errors =3D isr & (XCAN_IXR_ERROR_MASK | XCAN_IXR_RXOFLW_MASK | - XCAN_IXR_BSOFF_MASK | XCAN_IXR_ARBLST_MASK | - XCAN_IXR_RXMNF_MASK); + isr_errors =3D isr & mask; if (isr_errors) { priv->write_reg(priv, XCAN_ICR_OFFSET, isr_errors); xcan_err_interrupt(ndev, isr); @@ -1796,6 +1887,7 @@ static int xcan_probe(struct platform_device *pdev) return -ENOMEM; =20 priv =3D netdev_priv(ndev); + priv->ecc_enable =3D of_property_read_bool(pdev->dev.of_node, "xlnx,has-e= cc"); priv->dev =3D &pdev->dev; priv->can.bittiming_const =3D devtype->bittiming_const; priv->can.do_set_mode =3D xcan_do_set_mode; @@ -1912,6 +2004,11 @@ static int xcan_probe(struct platform_device *pdev) priv->reg_base, ndev->irq, priv->can.clock.freq, hw_tx_max, priv->tx_max); =20 + if (priv->ecc_enable) { + /* Reset FIFO ECC counters */ + priv->write_reg(priv, XCAN_ECC_CFG_OFFSET, XCAN_ECC_CFG_REECRX_MASK | + XCAN_ECC_CFG_REECTXOL_MASK | XCAN_ECC_CFG_REECTXTL_MASK); + } return 0; =20 err_disableclks: --=20 2.1.1 From nobody Wed Dec 17 09:16:21 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2053.outbound.protection.outlook.com [40.107.93.53]) (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 B79FF6A34A; Fri, 12 Jan 2024 11:41:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="Mf2grg7G" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aAvMU4DrXQlRAU8qtGmG3sjj6WMM8eGyMPpj1Xsx5kGpNcA7dHupbZf10GKRc0Un0Wg7/38o93G7Pxfr/WcLni5mssqZpN14PcwRfKu4DxwcicK9NdsylDo0s7gb4yzaIEkkR8hA5P2d4ws+pqEjEkbpaIyoIKNiKgRPFSrLL2REvtP65gW8IYhbYJ/UvxG44Ixw66WsBYydumYaZPIAVwdJvRC6PmdluQ/qeIadCduT6ClGVCasfr8SjM7eUzRZ+udNGX2ZhTb2YSC6fU16hX2hNJ7n8ZVfjyetTZ9GPPzzx6yxZwsvccnR2xUL15EA7XLEaD/wvG+dnxjSOiH1pQ== 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=/EIallbDZQqPnj4t5E2adbK7o25+8EmHC2146XW0dC8=; b=YahBcic4+ekFvfEdvXmgYazVs4qYTsfDclq5Tk/ckXRoQUaBTx3qWzBHlHoIsRFDi0xHB0F4pzqNBWC97FzPCAsrbGvdNIeopp2dW6oLop8PTPrXqulCWIqcU3j3b9X0EBB7GaQZLIKYGOiqikDn5lOedldkgb7e8TnCqG8bFl1RsyrnzmZ8WErlWAVL5aRlkwd52gd+1RV3l1gxIWCi48xBGeYRybIGw6vwpv5CMFLf2ZCwEFdVjGbM0/x7w305WELOAN4OaMKVkIV+ohIRkEHQORO75zOnwrlQqp7wPhdoAUfSdmTA/aQDpoWIUJ9nLsZGOfeHOFqRqRE9YPHEhw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=grandegger.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/EIallbDZQqPnj4t5E2adbK7o25+8EmHC2146XW0dC8=; b=Mf2grg7GX8t7UKqaXSWfy1+vw9loy6C7+lJ4KLrN7gpn48KpSZep9phXZsh3o5EL2Gs6Zn57UFclBzOBwch3+hLCCK70HFxg07Sh0q0jTjU1Jgk5fO+Tgmfe0axNKQjZWwNazsW+Uuu1kF08KPL5zDz+9j5ZBPzlpIr+H3tKBYY= Received: from DS7PR06CA0013.namprd06.prod.outlook.com (2603:10b6:8:2a::13) by DS0PR12MB6630.namprd12.prod.outlook.com (2603:10b6:8:d2::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.21; Fri, 12 Jan 2024 11:41:05 +0000 Received: from SA2PEPF00001509.namprd04.prod.outlook.com (2603:10b6:8:2a:cafe::d5) by DS7PR06CA0013.outlook.office365.com (2603:10b6:8:2a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7181.19 via Frontend Transport; Fri, 12 Jan 2024 11:41:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by SA2PEPF00001509.mail.protection.outlook.com (10.167.242.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7181.14 via Frontend Transport; Fri, 12 Jan 2024 11:41:05 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Fri, 12 Jan 2024 05:41:04 -0600 Received: from xhdvnc205.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.34 via Frontend Transport; Fri, 12 Jan 2024 05:41:00 -0600 From: Srinivas Goud To: , , , , , , , , , CC: , , , , , , , Srinivas Goud Subject: [PATCH RESEND v7 3/3] can: xilinx_can: Add ethtool stats interface for ECC errors Date: Fri, 12 Jan 2024 17:07:33 +0530 Message-ID: <1705059453-29099-4-git-send-email-srinivas.goud@amd.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1705059453-29099-1-git-send-email-srinivas.goud@amd.com> References: <1705059453-29099-1-git-send-email-srinivas.goud@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00001509:EE_|DS0PR12MB6630:EE_ X-MS-Office365-Filtering-Correlation-Id: 1fb5ce60-6c16-4143-a33b-08dc13635c59 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3GZHnkRCEQ30i4/Odm2moTvnFDDYNF4Ttwv8j6QYrusKYLniJkZ5Rlpoh6CrF9ANdkAXNVPCmE2R2o9uNYy5h/5coJLq65dXCbAfBRuMK0LDWxc6CvrP2z5RGf4tSSzfk0Of+Rz69wS3EHeN/dwtXxlSBK9Ci90Ac9K/dKZ7HKaNirtDWYZVngbe9DNleF3zPSBEn8HYFVr/YXEc1eVzURRvqm2m35BYVCqdXG3BSLSrZSre3D6x5CHx6QQHg9fwFT/HBsawckorfFLC3Y+pWyhVBIrGVQNsk3ZIjRumtMO8ODhPSz/Fy9h0rY5zpB361XdID1zoGYki/hk399IzZUYPDVmYJvWtRfpMi/FpUdBcYXfZ7rdkahvUg5MBjmvJY+rouZ96Ug2zlJbghrvg23ZAVV4u20MW06L+ZnAOo3qnhvxHYb8DlD9zqjTRNNhxqwZX1Qn/fzRBypc+b5+hujkzYYdJl8euzWOx/K2nLbfd58R9vkaLz79XtJkLfKITglxwBjTRTfq5fwHxgvcBAgIGShfzb7jmvTILSnPQdEHVwps9WDsDC5Bu1e1J5ngT5mbm+mzqywJkwP6izfUCOt19MbltALINoFMd4h6fA6qhL/ExnR/3fNOlEQTPdXnkAjj/acyNCXtN3/qtOUJm++ERjhIueUJGC2EAxHseZ+4vrwRfABMTzrZ/q3JmEfVg9DDoNey4xfHSRFdusdMLhzWTDXdUZ2gfBkicqjfS3ulgAc5JXcdxMZuGc0FP6g2mma7Mcsxz5pg0Kw3huWNsAtDF9+do9yjUnV3T4V36ijc= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(4636009)(39860400002)(346002)(136003)(376002)(396003)(230922051799003)(451199024)(1800799012)(64100799003)(82310400011)(186009)(36840700001)(46966006)(40470700004)(83380400001)(336012)(2616005)(26005)(47076005)(36860700001)(6666004)(4326008)(8676002)(5660300002)(8936002)(44832011)(41300700001)(2906002)(7416002)(426003)(478600001)(54906003)(316002)(70586007)(70206006)(921011)(110136005)(36756003)(86362001)(81166007)(82740400003)(356005)(40480700001)(40460700003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2024 11:41:05.1054 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1fb5ce60-6c16-4143-a33b-08dc13635c59 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00001509.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6630 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add ethtool stats interface for reading FIFO 1bit/2bit ECC errors informati= on. Signed-off-by: Srinivas Goud --- Changes in v7: Update with spinlock only for stats counters Changes in v6: None Changes in v5: Address review comments Add get_strings and get_sset_count stats interface Use u64 stats helper function Changes in v4: None Changes in v3: None Changes in v2: Add ethtool stats interface drivers/net/can/xilinx_can.c | 54 ++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 54 insertions(+) diff --git a/drivers/net/can/xilinx_can.c b/drivers/net/can/xilinx_can.c index c8691a1..80b0586 100644 --- a/drivers/net/can/xilinx_can.c +++ b/drivers/net/can/xilinx_can.c @@ -228,6 +228,7 @@ struct xcan_devtype_data { * @transceiver: Optional pointer to associated CAN transceiver * @rstc: Pointer to reset control * @ecc_enable: ECC enable flag + * @stats_lock: Lock for synchronizing ECC errors stats * @ecc_2bit_rxfifo_cnt: RXFIFO 2bit ECC count * @ecc_1bit_rxfifo_cnt: RXFIFO 1bit ECC count * @ecc_2bit_txolfifo_cnt: TXOLFIFO 2bit ECC count @@ -254,6 +255,7 @@ struct xcan_priv { struct phy *transceiver; struct reset_control *rstc; bool ecc_enable; + spinlock_t stats_lock; /* Lock for synchronizing ECC errors stats */ u64_stats_t ecc_2bit_rxfifo_cnt; u64_stats_t ecc_1bit_rxfifo_cnt; u64_stats_t ecc_2bit_txolfifo_cnt; @@ -347,6 +349,12 @@ static const struct can_tdc_const xcan_tdc_const_canfd= 2 =3D { .tdcf_max =3D 0, }; =20 +static const char xcan_priv_flags_strings[][ETH_GSTRING_LEN] =3D { + "err-ecc-rx-2-bit", "err-ecc-rx-1-bit", + "err-ecc-txol-2-bit", "err-ecc-txol-1-bit", + "err-ecc-txtl-2-bit", "err-ecc-txtl-1-bit", +}; + /** * xcan_write_reg_le - Write a value to the device register little endian * @priv: Driver private data structure @@ -1171,6 +1179,7 @@ static void xcan_err_interrupt(struct net_device *nde= v, u32 isr) =20 if (priv->ecc_enable && isr & XCAN_IXR_ECC_MASK) { u32 reg_rx_ecc, reg_txol_ecc, reg_txtl_ecc; + unsigned long flags; =20 reg_rx_ecc =3D priv->read_reg(priv, XCAN_RXFIFO_ECC_OFFSET); reg_txol_ecc =3D priv->read_reg(priv, XCAN_TXOLFIFO_ECC_OFFSET); @@ -1182,6 +1191,8 @@ static void xcan_err_interrupt(struct net_device *nde= v, u32 isr) priv->write_reg(priv, XCAN_ECC_CFG_OFFSET, XCAN_ECC_CFG_REECRX_MASK | XCAN_ECC_CFG_REECTXOL_MASK | XCAN_ECC_CFG_REECTXTL_MASK); =20 + spin_lock_irqsave(&priv->stats_lock, flags); + if (isr & XCAN_IXR_E2BERX_MASK) { u64_stats_add(&priv->ecc_2bit_rxfifo_cnt, FIELD_GET(XCAN_ECC_2BIT_CNT_MASK, reg_rx_ecc)); @@ -1211,6 +1222,8 @@ static void xcan_err_interrupt(struct net_device *nde= v, u32 isr) u64_stats_add(&priv->ecc_1bit_txtlfifo_cnt, FIELD_GET(XCAN_ECC_1BIT_CNT_MASK, reg_txtl_ecc)); } + + spin_unlock_irqrestore(&priv->stats_lock, flags); } =20 if (cf.can_id) { @@ -1637,6 +1650,44 @@ static int xcan_get_auto_tdcv(const struct net_devic= e *ndev, u32 *tdcv) return 0; } =20 +static void xcan_get_strings(struct net_device *ndev, u32 stringset, u8 *b= uf) +{ + switch (stringset) { + case ETH_SS_STATS: + memcpy(buf, &xcan_priv_flags_strings, + sizeof(xcan_priv_flags_strings)); + } +} + +static int xcan_get_sset_count(struct net_device *netdev, int sset) +{ + switch (sset) { + case ETH_SS_STATS: + return ARRAY_SIZE(xcan_priv_flags_strings); + default: + return -EOPNOTSUPP; + } +} + +static void xcan_get_ethtool_stats(struct net_device *ndev, + struct ethtool_stats *stats, u64 *data) +{ + struct xcan_priv *priv =3D netdev_priv(ndev); + unsigned long flags; + int i =3D 0; + + spin_lock_irqsave(&priv->stats_lock, flags); + + data[i++] =3D u64_stats_read(&priv->ecc_2bit_rxfifo_cnt); + data[i++] =3D u64_stats_read(&priv->ecc_1bit_rxfifo_cnt); + data[i++] =3D u64_stats_read(&priv->ecc_2bit_txolfifo_cnt); + data[i++] =3D u64_stats_read(&priv->ecc_1bit_txolfifo_cnt); + data[i++] =3D u64_stats_read(&priv->ecc_2bit_txtlfifo_cnt); + data[i++] =3D u64_stats_read(&priv->ecc_1bit_txtlfifo_cnt); + + spin_unlock_irqrestore(&priv->stats_lock, flags); +} + static const struct net_device_ops xcan_netdev_ops =3D { .ndo_open =3D xcan_open, .ndo_stop =3D xcan_close, @@ -1646,6 +1697,9 @@ static const struct net_device_ops xcan_netdev_ops = =3D { =20 static const struct ethtool_ops xcan_ethtool_ops =3D { .get_ts_info =3D ethtool_op_get_ts_info, + .get_strings =3D xcan_get_strings, + .get_sset_count =3D xcan_get_sset_count, + .get_ethtool_stats =3D xcan_get_ethtool_stats, }; =20 /** --=20 2.1.1