Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 496c798d authored by Marek Vasut's avatar Marek Vasut Committed by Marc Kleine-Budde
Browse files

can: ifi: Start NAPI poll on bus warning too 



Start the NAPI polling in case the bus warning interrupt happens,
since it is the poll function which checks and reports the warning.

Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Cc: Marc Kleine-Budde <mkl@pengutronix.de>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 2fe6c943

drivers/net/can/ifi_canfd/ifi_canfd.c

+3 −2
Original line number Diff line number Diff line
@@ -497,7 +497,8 @@ static irqreturn_t ifi_canfd_isr(int irq, void *dev_id) 
	struct ifi_canfd_priv *priv = netdev_priv(ndev);

	struct net_device_stats *stats = &ndev->stats;

	const u32 rx_irq_mask = IFI_CANFD_INTERRUPT_RXFIFO_NEMPTY |

				IFI_CANFD_INTERRUPT_RXFIFO_NEMPTY_PER;

				IFI_CANFD_INTERRUPT_RXFIFO_NEMPTY_PER |

				IFI_CANFD_INTERRUPT_ERROR_WARNING;

	const u32 tx_irq_mask = IFI_CANFD_INTERRUPT_TXFIFO_EMPTY |

				IFI_CANFD_INTERRUPT_TXFIFO_REMOVE;

	const u32 clr_irq_mask = ~(IFI_CANFD_INTERRUPT_SET_IRQ |
@@ -513,7 +514,7 @@ static irqreturn_t ifi_canfd_isr(int irq, void *dev_id) 
	/* Clear all pending interrupts but ErrWarn */

	writel(clr_irq_mask, priv->base + IFI_CANFD_INTERRUPT);



	/* RX IRQ, start NAPI */

	/* RX IRQ or bus warning, start NAPI */

	if (isr & rx_irq_mask) {

		ifi_canfd_irq_enable(ndev, 0);

		napi_schedule(&priv->napi);