[06/20] can: flexcan: Ack wakeup interrupt separately

Message ID	20200923085418.2685858-7-mkl@pengutronix.de
State	Accepted
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Marc Kleine-Budde <mkl@pengutronix.de> To: netdev@vger.kernel.org Cc: davem@davemloft.net, linux-can@vger.kernel.org, kernel@pengutronix.de, michael@walle.cc, qiangqing.zhang@nxp.com, Marc Kleine-Budde <mkl@pengutronix.de> Subject: [PATCH 06/20] can: flexcan: Ack wakeup interrupt separately Date: Wed, 23 Sep 2020 10:54:04 +0200 Message-Id: <20200923085418.2685858-7-mkl@pengutronix.de> In-Reply-To: <20200923085418.2685858-1-mkl@pengutronix.de> References: <20200923085418.2685858-1-mkl@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	pull-request: can-next 2020-09-23 \| expand pull-request: can-next 2020-09-23 [02/20] can: flexcan: flexcan_exit_stop_mode(): remove stray empty line [03/20] can: flexcan: more register names [04/20] can: flexcan: struct flexcan_regs: document registers not affected by soft reset [05/20] can: flexcan: quirks: get rid of long lines [06/20] can: flexcan: Ack wakeup interrupt separately [07/20] can: flexcan: flexcan_probe(): make regulator xceiver optional [08/20] can: flexcan: Add check for transceiver maximum bitrate limitation [09/20] can: flexcan: add correctable errors correction when HW supports ECC [10/20] can: flexcan: flexcan_chip_stop(): add error handling and propagate error value [11/20] can: flexcan: disable clocks during stop mode [12/20] can: flexcan: add LPSR mode support [13/20] can: flexcan: flexcan_set_bittiming(): move setup of CAN-2.0 bitiming into separate function [14/20] can: flexcan: use struct canfd_frame for CAN classic frame [15/20] can: flexcan: add CAN-FD mode support [16/20] can: flexcan: add ISO CAN FD feature support [17/20] can: flexcan: add CAN FD BRS support [18/20] can: flexcan: add Transceiver Delay Compensation support [19/20] can: flexcan: add imx8qm support [20/20] can: flexcan: add lx2160ar1 support

Message ID

20200923085418.2685858-7-mkl@pengutronix.de

State

Accepted

Delegated to:

David Miller

Headers

From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, linux-can@vger.kernel.org,
        kernel@pengutronix.de, michael@walle.cc, qiangqing.zhang@nxp.com,
        Marc Kleine-Budde <mkl@pengutronix.de>
Subject: [PATCH 06/20] can: flexcan: Ack wakeup interrupt separately
Date: Wed, 23 Sep 2020 10:54:04 +0200
Message-Id: <20200923085418.2685858-7-mkl@pengutronix.de>
In-Reply-To: <20200923085418.2685858-1-mkl@pengutronix.de>
References: <20200923085418.2685858-1-mkl@pengutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

pull-request: can-next 2020-09-23 | expand

Commit Message

Marc Kleine-Budde Sept. 23, 2020, 8:54 a.m. UTC

From: Joakim Zhang <qiangqing.zhang@nxp.com>

As FLEXCAN_ESR_ALL_INT is for all bus errors and state change IRQ
sources, strictly speaking FLEXCAN_ESR_WAK_INT does not belong to these.
So add wakeup interrupt ack separately to existing ack of the
interrupts.

Suggested-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Link: https://lore.kernel.org/r/20191204113249.3381-3-qiangqing.zhang@nxp.com
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/flexcan.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index b180dd1ba763..06cddc468739 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -134,8 +134,7 @@ 
 	(FLEXCAN_ESR_ERR_BUS | FLEXCAN_ESR_ERR_STATE)
 #define FLEXCAN_ESR_ALL_INT \
 	(FLEXCAN_ESR_TWRN_INT | FLEXCAN_ESR_RWRN_INT | \
-	 FLEXCAN_ESR_BOFF_INT | FLEXCAN_ESR_ERR_INT | \
-	 FLEXCAN_ESR_WAK_INT)
+	 FLEXCAN_ESR_BOFF_INT | FLEXCAN_ESR_ERR_INT)
 
 /* FLEXCAN interrupt flag register (IFLAG) bits */
 /* Errata ERR005829 step7: Reserve first valid MB */
@@ -979,10 +978,10 @@  static irqreturn_t flexcan_irq(int irq, void *dev_id)
 
 	reg_esr = priv->read(&regs->esr);
 
-	/* ACK all bus error and state change IRQ sources */
-	if (reg_esr & FLEXCAN_ESR_ALL_INT) {
+	/* ACK all bus error, state change and wake IRQ sources */
+	if (reg_esr & (FLEXCAN_ESR_ALL_INT | FLEXCAN_ESR_WAK_INT)) {
 		handled = IRQ_HANDLED;
-		priv->write(reg_esr & FLEXCAN_ESR_ALL_INT, &regs->esr);
+		priv->write(reg_esr & (FLEXCAN_ESR_ALL_INT | FLEXCAN_ESR_WAK_INT), &regs->esr);
 	}
 
 	/* state change interrupt or broken error state quirk fix is enabled */

[06/20] can: flexcan: Ack wakeup interrupt separately

Commit Message

Patch