From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 848FEF8924D for ; Tue, 21 Apr 2026 10:26:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version: Content-Transfer-Encoding:Content-Type:References:In-Reply-To:Message-ID:Date :Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=5uss7/Ijtj0jsVvVvdMGWuu3tCDw6dMlREoi5kZ5o+Q=; b=UEOA4bvGsuIHxC5uOEHnb2v9XO QwW1pmle836u8EuPaQecP9zow8hpe1A3r+m1dbWEVYyIgQudAWE52zhXHb6x+JvYb9p6BjuT33Mdx qrw7IezPRHx6G7n35wAn1B0fE0K4JIdFQGydBPSWf2anXjiNwbuYNyl4nMZQkHw0yvlI8LcbmWHiL pFK1KqR2I2YUUyQ4Mt+MPsQ0j4OBMQ7HxQ03LUNWkWYd11dLMaGuerEcc8i3d/0aDazAiBs9Aiyxe UtQ+7PqFpIPIH9N64e/KTABbp55E3GDO5HNWG/G2b9agKYmdYF2aNTh+cBX1i3U2h3e8TKG3ar8gH elwxBY+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wF8JH-00000008QKI-2cCj; Tue, 21 Apr 2026 10:26:27 +0000 Received: from mail-francesouthazon11011061.outbound.protection.outlook.com ([40.107.130.61] helo=MRWPR03CU001.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wF8JD-00000008QBl-0IAs for linux-arm-kernel@lists.infradead.org; Tue, 21 Apr 2026 10:26:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aLTwOPuVcF1jI6GVm0Ux9Sm3pu14Khg0LgNyoZL0y57zRuDBhyVQhqwZIHmE3uW8VyOw3aFWOF5iaU52L2UiuEUIAgz6Lx5eSQ4JSHuQF2fwuNBg9Iz0wOhP6ilatBJ4nluMhfSVKNhfxIbplv5k6CQ1DqY6YDYkEzNLKUfI6wQCnxu4xGllu89WDKv0xFHsNf5+YzEJjtJ1EEj4KIVVr+J5zGg/7rAz2Jx5jXFUs2PtMtXIfINZDPj4oVa/iDvr2XeJ9di0CUQx0tYCbxpg53fmxT4HmhpgAAV8L9asvf6hirsZKIi11RVQxM96TjINQEy327+U82MSd9Lpx9URJQ== 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=5uss7/Ijtj0jsVvVvdMGWuu3tCDw6dMlREoi5kZ5o+Q=; b=oDRtSOzjoaPalt+duVoUr+i4zmVZuNzbM9qLj7dw/0VjGmSHhlrFMpMqSMi5WI7gRDzpr4ngXS0LU59LiNUgRXDID+TBjtbTo1jghsQm4hHrnyS3/W3YLTblnPXTIQdNlEUhtDLCRNrE+J8utouAW2phN9zK0yfzC4Zp77IWqFTWeKBsPIRzlFElM2Aa3taDYO7JYEV5S4UmLDGfcPGr40MGOC9ICAs8uAPg7YCECWfenIMf3CHL2Q3vqJjPwdVwDzpolYkkiIjcAJ9mAoPlGNb4T/gskHh/+ese+6nUVo8NyebAAqqa1eNXG546M8IKf7eftiZx7nLElpT8aXHLeA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector1-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5uss7/Ijtj0jsVvVvdMGWuu3tCDw6dMlREoi5kZ5o+Q=; b=m0gyD5p5dKB9uTP9NCc40SyHCr9fe5fMWpSJm8BSgVFwUdZxrrKpoeGoUPVbEacFmoI/0qIxfmplM8lx2xw7qldThLJEcr2KrbBjkSTUyu/mIZC82goPeDFakoDv0fofLCj15eTrNi9j2gdSOze35h5MGrS869dpHB8IScjzywJFFf0b2VEXrj8vq1njM5dZVP9IBtfPa0WjpQEnZrfYktBlNfzMC113Mw2NsKU2lPzUlZ/iWdLO0zsC7JNWf919e5M2UMB7UH+Hp9j6xfwoRjHu4V/x28bgdaZ1zm5ou2GpMTX+XzHje6jPGR9fJTwTINkpyhZuqrEt1GXfoRyjdQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9251.eurprd04.prod.outlook.com (2603:10a6:10:352::15) by GVXPR04MB10111.eurprd04.prod.outlook.com (2603:10a6:150:1b1::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.16; Tue, 21 Apr 2026 10:26:13 +0000 Received: from DU0PR04MB9251.eurprd04.prod.outlook.com ([fe80::5c3a:1a67:2e02:20d0]) by DU0PR04MB9251.eurprd04.prod.outlook.com ([fe80::5c3a:1a67:2e02:20d0%5]) with mapi id 15.20.9846.016; Tue, 21 Apr 2026 10:26:13 +0000 From: Ciprian Costea To: Marc Kleine-Budde , Vincent Mailhol , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Frank Li , Sascha Hauer , Fabio Estevam Cc: Pengutronix Kernel Team , linux-can@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, NXP S32 Linux Team , Christophe Lizzi , Alberto Ruiz , Enric Balletbo , Eric Chanudet , Ciprian Marian Costea , Larisa Grigore Subject: [PATCH RESEND v4 5/8] can: flexcan: add FLEXCAN_QUIRK_IRQ_BERR quirk Date: Tue, 21 Apr 2026 12:26:00 +0200 Message-ID: <20260421102603.4122332-6-ciprianmarian.costea@oss.nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260421102603.4122332-1-ciprianmarian.costea@oss.nxp.com> References: <20260421102603.4122332-1-ciprianmarian.costea@oss.nxp.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: AS4P190CA0044.EURP190.PROD.OUTLOOK.COM (2603:10a6:20b:5d1::8) To DU0PR04MB9251.eurprd04.prod.outlook.com (2603:10a6:10:352::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DU0PR04MB9251:EE_|GVXPR04MB10111:EE_ X-MS-Office365-Filtering-Correlation-Id: 876e4e0a-67a0-4774-308d-08de9f9069ab X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|19092799006|366016|1800799024|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: Qd448C1XZzSQrLNa1sd7XaOa2Me51Tov09NCQ6RswGm3xYI1HbmX5Tx9gxHhr3UWeMzjBvGhIru30kfRdTwXqqR9yBtw3xRp6UGgpqpZt29g8TCv1qndvx5DbjrfK4N6RmV2fYc+32zd2lkmItQKokCczrzCnrI4YhuCmvf1ORnZbqOFM5uC7bx+JNmax26K/qtGBt0cvj+8E3xdh98qL/C7vO26ksWquVC5hKCdGsygTmz7okGe1aQthZwDgGgESD+Yt2OVufyuMtMu4rJp9LLEiOut0e//oeJ3fodQGVP1jH5f19f+RL1pRoJkpmAvzOYXW7YYQJkTEsnGEzDaMwHdZ/167fpcW//IT/fGBVyDfyNLb5wFDe2yMhcFlPt8YlQbSvigaObzS5dq5APdQs2qCulJA0QHCBYr3+cwWVBgxHtyb7eZD7yQDUB64Msc0Qgbbj1efP+Nfref1kTbGUkgdzgEbdh92/h/6bgotXetwy0Pb6OFMUau81REdJbPMWonPEdRWOyDAt2aN0KrwKx9srQeecjIlojeOvBWdoSqdzyONfzM6LAtPuh3VQs9hV4v/YkdApUi/RL9PNijlkCkYtmAquTVS24eGJSVtf3SlpT+ktLGrDIHAjKk5x4p9eW61pxqiZYOVOvMGu+HFrG5TcFNuROG/4ndd3urmunhpCZA+ZOPLWhukO+8+n+SCkrqr2SIcsAuAZcvq/oWTAHm5wuRZev+Z6B/8fRL3ic= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DU0PR04MB9251.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(7416014)(19092799006)(366016)(1800799024)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Z25wNzhlME9IQjZOVFphQW9oM2ZTUHBobTc5WlI3Q2VnLzZHNHdoaFlWZFYw?= =?utf-8?B?ejJ6Rm9mbXVNdGU3Vnhqc0trWUtjZUNldk91L2xtRUVMZ1JSclczY1lsVkZu?= =?utf-8?B?bzBYSjBRSUs1ZVdMSFk3NWEwb1ArZ3ArWWxnbXp6UHgzdEEweE93MVVSKzFl?= =?utf-8?B?REl1bmdESWRrbmY1dENwT3VmWHp4VXdJNVZwNDQ0VDB2K0diUk9GNVNqaDU0?= =?utf-8?B?Q1BNMURoRm54aldKSzBLNVUxMUR6WmJoSGRrNTVtckRmcWd1NjFnUkY3SE5z?= =?utf-8?B?dnBuUU1Kc0R1Q1NTNDF5MjZ3QzEranU5bDNjdGxZUC9WSDdnNUxyaFNtMTJs?= =?utf-8?B?bW80YXljSXpLdjlLamxTTG50aGYvT1VjbG1sZTExNFRiNW5IRmxJTUV1Y0tt?= =?utf-8?B?QWFXUWp6aFYzQkl6UFYvdStnWmdVUHJTWTY4M2JxdGhuS0FYMWJqakZJRFR6?= =?utf-8?B?UDJkNkxRcFpxYVBwOUFMNTRQU0JqdnVpeHFVYmpUbWRFM3RSNU1LeWpSZ2M4?= =?utf-8?B?Q1ZGY3NDbEozb3ZMKzVxSFRpeWNVNFl1QWFGRTVRb3o2d016Z0dVdUlwK3Fz?= =?utf-8?B?TEl1RjBJSUptNDVFaDBzdFVQTXFhSWR6UDdjUWxhUmFoU2xwWnJKelJUQUxn?= =?utf-8?B?N3Y1MHJabUZaMytUdHUrL0xKelFoZWM0UGFhaFM3TUc3cTZOc2ZSZ2RaWUZp?= =?utf-8?B?THY2Qytyc0tTYXFiSUxDdUh0Qzg2RlhMNElrYVp0MUVOR3pXOHBTbTk5UUx0?= =?utf-8?B?TUVQM21VNlU1RTVRcVRxeFk0UndoblV3YkFRYkwyV2QwYVp4dE9kMXNqV1k0?= =?utf-8?B?Q244VlZYYTZqMHI3Y1k2T213OWVxU0JSeFhYWGtGVytrRm1iVUR4Wmd5UW91?= =?utf-8?B?WW5EdFdPOE15bG1yVnM0MEsyWVdkZ0VCY1JsVXV5aXBtdEFFcGd2NldpRkVB?= =?utf-8?B?b21uR3NjRWZLVXVvbHFtWXdITllHU3QvRWlYclY3MjR3RzNicWJLbGw1NWpx?= =?utf-8?B?ajVYUkhSaGpEbmVjUncyY0Fsb3ExWEZiRldxdFEvZzlkWWh0UTZYM2dqWFJR?= =?utf-8?B?ZHlpWXZVU3pTOFdneG9sRG80OXhZb1p5U3A0WDBpQVFPbitKU09lWHQzSVRy?= =?utf-8?B?SXJSTWhnSWxEQ3lOQ2FPdi82UnNtenR2WXBkang0WUlTVGZxaEE2NFFIS01D?= =?utf-8?B?SzRFWjI5UWN3WHFyYUVtMjdWcVg5VFZZMDFYcjRJclc0blc5WHBhTzIyb1Vz?= =?utf-8?B?UGVucHZJTFJYN3Bkc21NcGFHZzZnSCs5UzRxNHkwRlNHZGdkb1VZOGRXTEsv?= =?utf-8?B?eUxMV0E5VzNyL2dxNXMwQ2FrUnFHMEJKeGovM21DRXlOUUVPYXliVXVsY2pV?= =?utf-8?B?elFldmlHdXdhLzd3Sm5pdFFpVGRWTHZMaEVIb2ZJdW9BT1hydTZxZHExWSts?= =?utf-8?B?SFFkV0NNV0ExWVRaZklLNE0rbERpSU1qbEJObGVrTG9ES2N0Yy9DdGI1RzhC?= =?utf-8?B?RHNQRHRCY2ZPYVJyQ2tiUGJYSHF3dm5BQ2NFaGpGbWo3dzY2WE5ncVhFRWRH?= =?utf-8?B?b2ZGaFJUUXg1Y1huZ250a0JLQ1kzOUUvdlhyb3RNYm5EN0xuS3o1UnVwRTQ1?= =?utf-8?B?VksxV0VDWTVlLzVSTWhHMTN0TFBqUXBCRlhVRmMwOTFmYk95TDZzcHNLOElu?= =?utf-8?B?UlVlcDFVNGxoM0RaMTdEaDY4VE5lRnNkTnI5SndLNy9BSDNuUWxMbEhDT2h2?= =?utf-8?B?SE5GdUt1ODZ1RFJKV0hYRnZiaEJPVDJGU0dqVkpOOXJuUnVHZTU0VkVPdWpT?= =?utf-8?B?QWVyK3BXenJ1cHV1bUFDcWhjRWUvdDdNMm1xcGdTemNSaXBDNEpDZUpRZUVp?= =?utf-8?B?RHhvcWV0a3JtOGorYVpTRzhDWHIxc1ZvVlFLZWN1bkFreXBXcFZETEMzb1Q5?= =?utf-8?B?UG1NMnhEM1ZqL2hEZzVkdVMrMEdmVStpb2xoTmRkTnMvODlnVjNmZHg2cjRU?= =?utf-8?B?MzNEenBEemRCRU5EUS9scng1VUV0VUNsYlZ1OEp6M2h3V0lOQUdEMUhxNnNT?= =?utf-8?B?a2NYa3hnZjh2a3hhSlkxZE9UcnhrUFB5dVc5cjJGTmttQkVVMHZDWFBKQTc2?= =?utf-8?B?bFRyZWNpNnhmVXZaVXBvWlhLUmpCSmhBU3R6bHNCYmhhL1oxMmpjeWNZeFAz?= =?utf-8?B?YkdlZG83bXdaMFJVNWxtc3FZenBka3RncXFPUjhIUUt3NWFmV3VBMHNnZno2?= =?utf-8?B?U1dkeXp0NlJLWjkzVjE1Q3plZFZQVTZJdWVnQzkxejJXZzVrZHJ3T1BRWm5t?= =?utf-8?B?VElSMUVHd2xmd0ZmSmpFQWsrbjZIdHFhb2V1TUNHSjVaQmdJVU1oRGQ0eC9y?= =?utf-8?Q?CLWH670ZXNAjIOQg=3D?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 876e4e0a-67a0-4774-308d-08de9f9069ab X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9251.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Apr 2026 10:26:13.1383 (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: CSj+gDL/GiVuyHZz1piI3VacEDj64cmCozvkcLBm5YGvXBocVrogA9ws8uKgFAASKfOb2B8zEDJOnHoJPTRbkPlSLp6ujEL6C5LgQ08WVDw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GVXPR04MB10111 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260421_032623_169720_E5A9C67A X-CRM114-Status: GOOD ( 18.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ciprian Marian Costea Introduce FLEXCAN_QUIRK_IRQ_BERR quirk to handle hardware integration where the FlexCAN module has a dedicated interrupt line for signaling bus errors and device state changes. This adds the flexcan_irq_esr() handler which composes flexcan_do_state() and flexcan_do_berr() to handle platforms where these events share a single IRQ line. Also extend flexcan_chip_interrupts_enable() to disable/enable the new IRQ line during IMASK register writes. This is required for NXP S32N79 SoC support. Co-developed-by: Larisa Grigore Signed-off-by: Larisa Grigore Signed-off-by: Ciprian Marian Costea --- drivers/net/can/flexcan/flexcan-core.c | 54 +++++++++++++++++++++----- drivers/net/can/flexcan/flexcan.h | 2 + 2 files changed, 47 insertions(+), 9 deletions(-) diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexcan/flexcan-core.c index 32e4d4da00a1..23ddf7910641 100644 --- a/drivers/net/can/flexcan/flexcan-core.c +++ b/drivers/net/can/flexcan/flexcan-core.c @@ -1293,6 +1293,22 @@ static irqreturn_t flexcan_irq_boff(int irq, void *dev_id) return handled; } +/* Combined bus error and state change IRQ handler */ +static irqreturn_t flexcan_irq_esr(int irq, void *dev_id) +{ + struct net_device *dev = dev_id; + struct flexcan_priv *priv = netdev_priv(dev); + irqreturn_t handled; + + handled = flexcan_do_state(dev); + handled |= flexcan_do_berr(dev); + + if (handled) + can_rx_offload_irq_finish(&priv->offload); + + return handled; +} + static void flexcan_set_bittiming_ctrl(const struct net_device *dev) { const struct flexcan_priv *priv = netdev_priv(dev); @@ -1549,10 +1565,10 @@ static void flexcan_chip_interrupts_enable(const struct net_device *dev) u64 reg_imask; disable_irq(dev->irq); - if (quirks & FLEXCAN_QUIRK_NR_IRQ_3) { + if (quirks & FLEXCAN_QUIRK_NR_IRQ_3) disable_irq(priv->irq_boff); + if (quirks & (FLEXCAN_QUIRK_NR_IRQ_3 | FLEXCAN_QUIRK_IRQ_BERR)) disable_irq(priv->irq_err); - } if (quirks & FLEXCAN_QUIRK_SECONDARY_MB_IRQ) disable_irq(priv->irq_secondary_mb); @@ -1564,10 +1580,10 @@ static void flexcan_chip_interrupts_enable(const struct net_device *dev) enable_irq(dev->irq); if (quirks & FLEXCAN_QUIRK_SECONDARY_MB_IRQ) enable_irq(priv->irq_secondary_mb); - if (quirks & FLEXCAN_QUIRK_NR_IRQ_3) { - enable_irq(priv->irq_boff); + if (quirks & (FLEXCAN_QUIRK_NR_IRQ_3 | FLEXCAN_QUIRK_IRQ_BERR)) enable_irq(priv->irq_err); - } + if (quirks & FLEXCAN_QUIRK_NR_IRQ_3) + enable_irq(priv->irq_boff); } static void flexcan_chip_interrupts_disable(const struct net_device *dev) @@ -1891,7 +1907,8 @@ static int flexcan_open(struct net_device *dev) can_rx_offload_enable(&priv->offload); - if (priv->devtype_data.quirks & FLEXCAN_QUIRK_NR_IRQ_3) + if (priv->devtype_data.quirks & + (FLEXCAN_QUIRK_NR_IRQ_3 | FLEXCAN_QUIRK_IRQ_BERR)) err = request_irq(dev->irq, flexcan_irq_mb, IRQF_SHARED, dev->name, dev); else @@ -1912,6 +1929,13 @@ static int flexcan_open(struct net_device *dev) goto out_free_irq_boff; } + if (priv->devtype_data.quirks & FLEXCAN_QUIRK_IRQ_BERR) { + err = request_irq(priv->irq_err, + flexcan_irq_esr, IRQF_SHARED, dev->name, dev); + if (err) + goto out_free_irq_boff; + } + if (priv->devtype_data.quirks & FLEXCAN_QUIRK_SECONDARY_MB_IRQ) { err = request_irq(priv->irq_secondary_mb, flexcan_irq_mb, IRQF_SHARED, dev->name, dev); @@ -1926,7 +1950,8 @@ static int flexcan_open(struct net_device *dev) return 0; out_free_irq_err: - if (priv->devtype_data.quirks & FLEXCAN_QUIRK_NR_IRQ_3) + if (priv->devtype_data.quirks & + (FLEXCAN_QUIRK_IRQ_BERR | FLEXCAN_QUIRK_NR_IRQ_3)) free_irq(priv->irq_err, dev); out_free_irq_boff: if (priv->devtype_data.quirks & FLEXCAN_QUIRK_NR_IRQ_3) @@ -1958,10 +1983,12 @@ static int flexcan_close(struct net_device *dev) if (priv->devtype_data.quirks & FLEXCAN_QUIRK_SECONDARY_MB_IRQ) free_irq(priv->irq_secondary_mb, dev); - if (priv->devtype_data.quirks & FLEXCAN_QUIRK_NR_IRQ_3) { + if (priv->devtype_data.quirks & + (FLEXCAN_QUIRK_IRQ_BERR | FLEXCAN_QUIRK_NR_IRQ_3)) free_irq(priv->irq_err, dev); + + if (priv->devtype_data.quirks & FLEXCAN_QUIRK_NR_IRQ_3) free_irq(priv->irq_boff, dev); - } free_irq(dev->irq, dev); can_rx_offload_disable(&priv->offload); @@ -2348,12 +2375,21 @@ static int flexcan_probe(struct platform_device *pdev) if (transceiver) priv->can.bitrate_max = transceiver->attrs.max_link_rate; + if (priv->devtype_data.quirks & FLEXCAN_QUIRK_IRQ_BERR) { + priv->irq_err = platform_get_irq_byname(pdev, "berr"); + if (priv->irq_err < 0) { + err = priv->irq_err; + goto failed_platform_get_irq; + } + } + if (priv->devtype_data.quirks & FLEXCAN_QUIRK_NR_IRQ_3) { priv->irq_boff = platform_get_irq(pdev, 1); if (priv->irq_boff < 0) { err = priv->irq_boff; goto failed_platform_get_irq; } + priv->irq_err = platform_get_irq(pdev, 2); if (priv->irq_err < 0) { err = priv->irq_err; diff --git a/drivers/net/can/flexcan/flexcan.h b/drivers/net/can/flexcan/flexcan.h index 22aa097ec3c0..43d4e0da3779 100644 --- a/drivers/net/can/flexcan/flexcan.h +++ b/drivers/net/can/flexcan/flexcan.h @@ -74,6 +74,8 @@ * both need to have an interrupt handler registered. */ #define FLEXCAN_QUIRK_SECONDARY_MB_IRQ BIT(18) +/* Setup dedicated bus error and state change IRQ */ +#define FLEXCAN_QUIRK_IRQ_BERR BIT(19) #define FLEXCAN_NR_MB_IRQS 2 -- 2.43.0