From patchwork Tue May 23 02:37:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judith Mendez X-Patchwork-Id: 97701 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1851682vqo; Mon, 22 May 2023 19:45:10 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4s+09gHPDEczfqlrzYgEqap/jTlGUT4fWTLHO0b8n1Aa6g5McQrqyanmGIZ5R+ta1MlC2+ X-Received: by 2002:a17:902:da8b:b0:1af:a3d4:26e2 with SMTP id j11-20020a170902da8b00b001afa3d426e2mr8755238plx.54.1684809910032; Mon, 22 May 2023 19:45:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684809910; cv=none; d=google.com; s=arc-20160816; b=uKVYjLy1j9zQzLPrg7nplgF88X6jxbN6CgjRjnXQKRZkB1ht/m5lxapRluLpSM6FeX mNIeGGcmRzdmDQWXTKL3lwS7BEjE1MN4ChpGnao/9WgOhDPA59ttVMuRM00UTi62PxB/ +Q3DB7vrkGoYTimj0dAugQL/pckI4fK8z/Xe4+gESgAlP7LwJci2zd4U4otZh4rZP48h 4dwRJLqFVdxcTiiWvzbd4PRKgRF88mQSNGFp5KFAcguHETAp7ct93o7S9YVTZP6TECRu fx3pXTLr3XiZctjyxbn0k56Q7C9almlUH8O19YDBc8E5C7eLE5Ig9ybn4yfP7eIfVyHF G2tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=JBfvNxVE/qLOsGVroHH8hujUwwjvB38Vr4pscuPer/w=; b=U+a1vhClJrm+9GuhPGUegl5OotyLGL7fR87LKd/+NcBGxyuT+idZWiaoI9ux94Ihm4 R1lKMSRpF9b8SXDxHhXPYTir3HTwHA6oG+osQpFB+u0Fkgn0Opqo+TWZvbAT/kPlZIPD vq9UiiSr3g7CBJcwWBk78kXp/b4++2vdOl4WNRx3Ufu1dDsL8sL9iKpydXoYfEZLOOox F9ADHveK4ZLVIbNct/yiZzP3U+BTNDC+Vpf9O0KgXZ7GcTBpmwhO7MJcnyp8oFDi/L1L roYnYQgpQ5zWD9jK3KVlcNCRDWzp5aC+NvYttUp2xwDdczjQMpzaa4OpdzQHlo03MWF/ 3k4g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=UlgxJ4uK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z5-20020a170902834500b001a64fa4eb27si5564442pln.230.2023.05.22.19.44.55; Mon, 22 May 2023 19:45:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=UlgxJ4uK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234752AbjEWCiY (ORCPT + 99 others); Mon, 22 May 2023 22:38:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49888 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234721AbjEWCiU (ORCPT ); Mon, 22 May 2023 22:38:20 -0400 Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CE39CA; Mon, 22 May 2023 19:38:19 -0700 (PDT) Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34N2bpRA096282; Mon, 22 May 2023 21:37:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684809471; bh=JBfvNxVE/qLOsGVroHH8hujUwwjvB38Vr4pscuPer/w=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=UlgxJ4uKQvMbVMQIh3SJ7PFtesixKtB69F1O7CED/FPkreOyS+h43Htv+pqmTHxpY 7wfWDTBHVBqRJ/L+LLIzM95Y97rAU1UTFIhwbPSt9h7yqsmVguQmrbdaJsg7tqB89s 9bwgYxt0wW6RQKqjVn55iI9kaq10OvZSgVFP8MsA= Received: from DFLE102.ent.ti.com (dfle102.ent.ti.com [10.64.6.23]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34N2bo5O074799 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 22 May 2023 21:37:50 -0500 Received: from DFLE106.ent.ti.com (10.64.6.27) by DFLE102.ent.ti.com (10.64.6.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 22 May 2023 21:37:50 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Mon, 22 May 2023 21:37:50 -0500 Received: from a0498204.dal.design.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34N2bnsX031957; Mon, 22 May 2023 21:37:50 -0500 From: Judith Mendez To: Chandrasekar Ramakrishnan , CC: Wolfgang Grandegger , Marc Kleine-Budde , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , , , Schuyler Patton , Tero Kristo , Rob Herring , Krzysztof Kozlowski , Conor Dooley , , Oliver Hartkopp , Tony Lindgren Subject: [PATCH v7 1/2] dt-bindings: net: can: Remove interrupt properties for MCAN Date: Mon, 22 May 2023 21:37:48 -0500 Message-ID: <20230523023749.4526-2-jm@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230523023749.4526-1-jm@ti.com> References: <20230523023749.4526-1-jm@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766651236045438653?= X-GMAIL-MSGID: =?utf-8?q?1766651236045438653?= On AM62x SoC, MCANs on MCU domain do not have hardware interrupt routed to A53 Linux, instead they will use software interrupt by timer polling. To enable timer polling method, interrupts should be optional so remove interrupts property from required section and add an example for MCAN node with timer polling enabled. Signed-off-by: Judith Mendez Reviewed-by: Conor Dooley --- Changelog: v7: 1. No changes v6: 1. No changes v5: 1. Remove poll-interval 2. Remove oneOf that selects interrupts/interrupt-names or poll-interval v3: 1. Update binding poll-interval description 2. Add oneOf to select interrupts/interrupt-names or poll-interval v2: 1. Add poll-interval property to enable timer polling method 2. Add example using poll-interval property --- .../bindings/net/can/bosch,m_can.yaml | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/net/can/bosch,m_can.yaml b/Documentation/devicetree/bindings/net/can/bosch,m_can.yaml index 67879aab623b..bb518c831f7b 100644 --- a/Documentation/devicetree/bindings/net/can/bosch,m_can.yaml +++ b/Documentation/devicetree/bindings/net/can/bosch,m_can.yaml @@ -122,8 +122,6 @@ required: - compatible - reg - reg-names - - interrupts - - interrupt-names - clocks - clock-names - bosch,mram-cfg @@ -132,6 +130,7 @@ additionalProperties: false examples: - | + // Example with interrupts #include can@20e8000 { compatible = "bosch,m_can"; @@ -149,4 +148,21 @@ examples: }; }; + - | + // Example with timer polling + #include + can@20e8000 { + compatible = "bosch,m_can"; + reg = <0x020e8000 0x4000>, <0x02298000 0x4000>; + reg-names = "m_can", "message_ram"; + clocks = <&clks IMX6SX_CLK_CANFD>, + <&clks IMX6SX_CLK_CANFD>; + clock-names = "hclk", "cclk"; + bosch,mram-cfg = <0x0 0 0 32 0 0 0 1>; + + can-transceiver { + max-bitrate = <5000000>; + }; + }; + ... From patchwork Tue May 23 02:37:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judith Mendez X-Patchwork-Id: 97709 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1856239vqo; Mon, 22 May 2023 20:00:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4AJvrJsZr9gQQqzIMrIHWf+jLG9ICwjTEhGD8gFRlEeZHGtEPQVZ9Si3pbJnP/XqIOhukP X-Received: by 2002:a17:903:1212:b0:1ae:2013:4bc8 with SMTP id l18-20020a170903121200b001ae20134bc8mr17950288plh.18.1684810805651; Mon, 22 May 2023 20:00:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684810805; cv=none; d=google.com; s=arc-20160816; b=ZpUfnIZjCYLHnLe57TD28QrPtCxxSzCCD/9U6zZafhfZleJ83BiomJp/ytFcNBKdwr 9jwC1wp2Qx8BG4a723b+1M7Yb6hO2tMNuy4Z9YjBdS9zUsdf7pmhrXQzzS5cFQXkncio YB/u4zOFTxjkwCbFGlPTRxFXw9TWEfxAVa4vfUc/m8lYa0W2nLHadLNvP431joeQXmR/ xUqTw1yX75I780QsJ4qtwy5Ua8qW5i0CIohMZTghPFsuX5yU7zvUIbQmIv2eORxt0F4s kB9AWD+bo4YSLbCqnxcWsUmugNXcvdXp3iA9nYDzrOs7rNb55oOxu6lVVNj4H5LC39Ee D+nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=7l7cQhrcqsgAZL1hoc0yJDiHaFynHHWNyFJyaX2v5AY=; b=Dh1qHnJrnSye2Rnu71dM1fKG+ARQXQWrm2eHHPZHRWS90mILnZa1AGMqXtg/VJKZpR ZBiXwDo/q4OtW14vDSY6Nl1NPuvJ+hYNe/rRbBKNGpiBZvUBJ8xnI5WBBV0rP/hnJ9px K09dhaMh16znaKFba+J9KdflU9GwTfPjPwM9oJczi+dAEi+M3CQGU1fghiGSCLSzAwFj HSOW4oRGUCiEqYSTy7DlT0slqpNKWFYKpvd2mFYted7/Cg0zcMbyE7AsgZW/aVenN0on cPO5nynw7IL/EjT1fDRUtjFQsD95yeWn4aqsa4frVJKwRpMgOB5kajPVZUM28Y2VRbLe qtUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="y42NXt/y"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y13-20020a17090ad70d00b0024e39c638d1si5568494pju.77.2023.05.22.19.59.54; Mon, 22 May 2023 20:00:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="y42NXt/y"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234718AbjEWCiX (ORCPT + 99 others); Mon, 22 May 2023 22:38:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49878 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232298AbjEWCiS (ORCPT ); Mon, 22 May 2023 22:38:18 -0400 Received: from lelv0143.ext.ti.com (lelv0143.ext.ti.com [198.47.23.248]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15071CD; Mon, 22 May 2023 19:38:16 -0700 (PDT) Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 34N2bptl096314; Mon, 22 May 2023 21:37:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1684809471; bh=7l7cQhrcqsgAZL1hoc0yJDiHaFynHHWNyFJyaX2v5AY=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=y42NXt/yPed4Uu+iTH2fK6KzJWmnfSIqPJQUOotS2nBRqL3Mc+YQMl8DMY1HkDNin qWBMapsbs+incyMl4pveb+s/+oeoeEM89VhUHJ4fJoiqoH3YCK9jMBwSfCmkG2GX0b vAlhuOntdPxCBgOwXYBEJyYY+9ZAj3sKWc1dajok= Received: from DFLE106.ent.ti.com (dfle106.ent.ti.com [10.64.6.27]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 34N2bpcZ011805 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 22 May 2023 21:37:51 -0500 Received: from DFLE115.ent.ti.com (10.64.6.36) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Mon, 22 May 2023 21:37:50 -0500 Received: from lelv0326.itg.ti.com (10.180.67.84) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Mon, 22 May 2023 21:37:50 -0500 Received: from a0498204.dal.design.ti.com (ileaxei01-snat2.itg.ti.com [10.180.69.6]) by lelv0326.itg.ti.com (8.15.2/8.15.2) with ESMTP id 34N2bnsY031957; Mon, 22 May 2023 21:37:50 -0500 From: Judith Mendez To: Chandrasekar Ramakrishnan , CC: Wolfgang Grandegger , Marc Kleine-Budde , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , , , Schuyler Patton , Tero Kristo , Rob Herring , Krzysztof Kozlowski , Conor Dooley , , Oliver Hartkopp , Tony Lindgren Subject: [PATCH v7 2/2] can: m_can: Add hrtimer to generate software interrupt Date: Mon, 22 May 2023 21:37:49 -0500 Message-ID: <20230523023749.4526-3-jm@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230523023749.4526-1-jm@ti.com> References: <20230523023749.4526-1-jm@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766652175291015754?= X-GMAIL-MSGID: =?utf-8?q?1766652175291015754?= Add an hrtimer to MCAN class device. Each MCAN will have its own hrtimer instantiated if there is no hardware interrupt found in device tree M_CAN node. The hrtimer will generate a software interrupt every 1 ms. In hrtimer callback, we check if there is a transaction pending by reading a register, then process by calling the isr if there is. Signed-off-by: Judith Mendez --- Changelog: v7: - Clean up m_can_platform.c if/else section after removing poll-interval - Remove poll-interval from patch description v6: - Move hrtimer stop/start function calls to m_can_open and m_can_close to support power suspend/resume v5: - Change dev_dbg to dev_info if hardware interrupt exists and polling is enabled v4: - No changes v3: - Create a define for 1 ms polling interval - Change plarform_get_irq to optional to not print error msg v2: - Add functionality to check for 'poll-interval' property in MCAN node - Add 'polling' flag in driver to check if device is using polling method - Check for timer polling and hardware interrupt cases, default to hardware interrupt method - Change ns_to_ktime() to ms_to_ktime() --- drivers/net/can/m_can/m_can.c | 33 ++++++++++++++++++++++++-- drivers/net/can/m_can/m_can.h | 4 ++++ drivers/net/can/m_can/m_can_platform.c | 25 ++++++++++++++++--- 3 files changed, 57 insertions(+), 5 deletions(-) diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c index a5003435802b..f273d989bdff 100644 --- a/drivers/net/can/m_can/m_can.c +++ b/drivers/net/can/m_can/m_can.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include @@ -308,6 +309,9 @@ enum m_can_reg { #define TX_EVENT_MM_MASK GENMASK(31, 24) #define TX_EVENT_TXTS_MASK GENMASK(15, 0) +/* Hrtimer polling interval */ +#define HRTIMER_POLL_INTERVAL 1 + /* The ID and DLC registers are adjacent in M_CAN FIFO memory, * and we can save a (potentially slow) bus round trip by combining * reads and writes to them. @@ -895,7 +899,7 @@ static int m_can_handle_bus_errors(struct net_device *dev, u32 irqstatus, netdev_dbg(dev, "Arbitration phase error detected\n"); work_done += m_can_handle_lec_err(dev, lec); } - + if (is_lec_err(dlec)) { netdev_dbg(dev, "Data phase error detected\n"); work_done += m_can_handle_lec_err(dev, dlec); @@ -1414,6 +1418,12 @@ static int m_can_start(struct net_device *dev) m_can_enable_all_interrupts(cdev); + if (cdev->polling) { + dev_dbg(cdev->dev, "Start hrtimer\n"); + hrtimer_start(&cdev->hrtimer, ms_to_ktime(HRTIMER_POLL_INTERVAL), + HRTIMER_MODE_REL_PINNED); + } + return 0; } @@ -1571,6 +1581,11 @@ static void m_can_stop(struct net_device *dev) /* disable all interrupts */ m_can_disable_all_interrupts(cdev); + if (cdev->polling) { + dev_dbg(cdev->dev, "Disabling the hrtimer\n"); + hrtimer_cancel(&cdev->hrtimer); + } + /* Set init mode to disengage from the network */ m_can_config_endisable(cdev, true); @@ -1793,6 +1808,18 @@ static netdev_tx_t m_can_start_xmit(struct sk_buff *skb, return NETDEV_TX_OK; } +static enum hrtimer_restart hrtimer_callback(struct hrtimer *timer) +{ + struct m_can_classdev *cdev = container_of(timer, struct + m_can_classdev, hrtimer); + + m_can_isr(0, cdev->net); + + hrtimer_forward_now(timer, ms_to_ktime(HRTIMER_POLL_INTERVAL)); + + return HRTIMER_RESTART; +} + static int m_can_open(struct net_device *dev) { struct m_can_classdev *cdev = netdev_priv(dev); @@ -1831,9 +1858,11 @@ static int m_can_open(struct net_device *dev) err = request_threaded_irq(dev->irq, NULL, m_can_isr, IRQF_ONESHOT, dev->name, dev); - } else { + } else if (!cdev->polling) { err = request_irq(dev->irq, m_can_isr, IRQF_SHARED, dev->name, dev); + } else { + cdev->hrtimer.function = &hrtimer_callback; } if (err < 0) { diff --git a/drivers/net/can/m_can/m_can.h b/drivers/net/can/m_can/m_can.h index a839dc71dc9b..e9db5cce4e68 100644 --- a/drivers/net/can/m_can/m_can.h +++ b/drivers/net/can/m_can/m_can.h @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -93,6 +94,9 @@ struct m_can_classdev { int is_peripheral; struct mram_cfg mcfg[MRAM_CFG_NUM]; + + struct hrtimer hrtimer; + bool polling; }; struct m_can_classdev *m_can_class_allocate_dev(struct device *dev, int sizeof_priv); diff --git a/drivers/net/can/m_can/m_can_platform.c b/drivers/net/can/m_can/m_can_platform.c index 94dc82644113..b639c9e645d3 100644 --- a/drivers/net/can/m_can/m_can_platform.c +++ b/drivers/net/can/m_can/m_can_platform.c @@ -5,6 +5,7 @@ // // Copyright (C) 2018-19 Texas Instruments Incorporated - http://www.ti.com/ +#include #include #include @@ -96,12 +97,30 @@ static int m_can_plat_probe(struct platform_device *pdev) goto probe_fail; addr = devm_platform_ioremap_resource_byname(pdev, "m_can"); - irq = platform_get_irq_byname(pdev, "int0"); - if (IS_ERR(addr) || irq < 0) { - ret = -EINVAL; + if (IS_ERR(addr)) { + ret = PTR_ERR(addr); goto probe_fail; } + if (device_property_present(mcan_class->dev, "interrupts") || + device_property_present(mcan_class->dev, "interrupt-names")) { + irq = platform_get_irq_byname(pdev, "int0"); + mcan_class->polling = false; + if (irq == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; + goto probe_fail; + } + if (irq < 0) { + ret = -ENXIO; + goto probe_fail; + } + } else { + mcan_class->polling = true; + dev_dbg(mcan_class->dev, "Polling enabled, initialize hrtimer"); + hrtimer_init(&mcan_class->hrtimer, CLOCK_MONOTONIC, + HRTIMER_MODE_REL_PINNED); + } + /* message ram could be shared */ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "message_ram"); if (!res) {