From: Torin Cooper-Bennun <torin@maxiluxsystems.com>
To: linux-can@vger.kernel.org
Cc: Torin Cooper-Bennun <torin@maxiluxsystems.com>
Subject: [PATCH RFC can-next 2/3] can: m_can: m_can_isr(): handle device-specific interrupts
Date: Fri, 14 May 2021 13:19:45 +0100 [thread overview]
Message-ID: <20210514121946.2344901-3-torin@maxiluxsystems.com> (raw)
In-Reply-To: <20210514121946.2344901-1-torin@maxiluxsystems.com>
Device-specific interrupts are handled, if applicable (and if no M_CAN
interrupts were handled in this ISR call).
Signed-off-by: Torin Cooper-Bennun <torin@maxiluxsystems.com>
---
drivers/net/can/m_can/m_can.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index 34073cd077e4..af63dd4b8cd5 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -1033,20 +1033,31 @@ static irqreturn_t m_can_isr(int irq, void *dev_id)
struct net_device *dev = (struct net_device *)dev_id;
struct m_can_classdev *cdev = netdev_priv(dev);
u32 ir;
+ irqreturn_t ret = IRQ_NONE;
if (pm_runtime_suspended(cdev->dev))
return IRQ_NONE;
+
ir = m_can_read(cdev, M_CAN_IR);
if (!ir)
- return IRQ_NONE;
+ ret = IRQ_NONE;
/* ACK all irqs */
if (ir & IR_ALL_INT)
m_can_write(cdev, M_CAN_IR, ir);
+ /* If we have no M_CAN interrupts to handle, we can assume
+ * device-specific interrupt(s) need handling.
+ */
+ if (!ir && cdev->ops->handle_dev_interrupts)
+ ret = cdev->ops->handle_dev_interrupts(cdev);
+
if (cdev->ops->clear_interrupts)
cdev->ops->clear_interrupts(cdev);
+ if (!ir)
+ return ret;
+
/* schedule NAPI in case of
* - rx IRQ
* - state change IRQ
--
2.30.2
next prev parent reply other threads:[~2021-05-14 12:19 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-14 12:19 [PATCH RFC can-next 0/3] m_can: support device-specific interrupt handling Torin Cooper-Bennun
2021-05-14 12:19 ` [PATCH RFC can-next 1/3] can: m_can: add handle_dev_interrupts callback to m_can_ops Torin Cooper-Bennun
2021-05-14 12:26 ` Marc Kleine-Budde
2021-05-14 13:21 ` Torin Cooper-Bennun
2021-05-14 14:16 ` Marc Kleine-Budde
2021-05-14 12:19 ` Torin Cooper-Bennun [this message]
2021-05-14 12:19 ` [PATCH RFC can-next 3/3] can: tcan4x5x: add handle_dev_interrupts callback to ops Torin Cooper-Bennun
2021-05-14 14:10 ` Marc Kleine-Budde
2021-05-14 14:51 ` Torin Cooper-Bennun
2021-05-14 15:15 ` Marc Kleine-Budde
2021-05-14 16:27 ` Torin Cooper-Bennun
2021-05-14 12:34 ` [PATCH RFC can-next 0/3] m_can: support device-specific interrupt handling Marc Kleine-Budde
2021-05-14 13:10 ` Torin Cooper-Bennun
2021-05-14 14:12 ` Marc Kleine-Budde
2021-05-14 14:44 ` Torin Cooper-Bennun
2021-05-14 14:55 ` Marc Kleine-Budde
2021-05-14 16:46 ` Torin Cooper-Bennun
2021-05-14 14:54 ` Torin Cooper-Bennun
2021-05-14 15:21 ` Marc Kleine-Budde
2021-05-14 16:44 ` Torin Cooper-Bennun
2021-05-14 17:13 ` Marc Kleine-Budde
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210514121946.2344901-3-torin@maxiluxsystems.com \
--to=torin@maxiluxsystems.com \
--cc=linux-can@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox