Commit 8c652cf0 authored by Ciprian Marian Costea's avatar Ciprian Marian Costea Committed by Marc Kleine-Budde
Browse files

can: flexcan: Add quirk to handle separate interrupt lines for mailboxes 



Introduce 'FLEXCAN_QUIRK_SECONDARY_MB_IRQ' quirk to handle a FlexCAN
hardware module integration particularity where two ranges of mailboxes
are controlled by separate hardware interrupt lines.
The same 'flexcan_irq' handler is used for both separate mailbox interrupt
lines, with no other changes.

Signed-off-by: default avatarCiprian Marian Costea <ciprianmarian.costea@oss.nxp.com>
Reviewed-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://patch.msgid.link/20250113120704.522307-3-ciprianmarian.costea@oss.nxp.com


[mkl: flexcan_open(): change order and free irq_secondary_mb first]
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 51723790

drivers/net/can/flexcan/flexcan-core.c

+23 −1
Original line number Diff line number Diff line
@@ -1762,13 +1762,24 @@ static int flexcan_open(struct net_device *dev) 
			goto out_free_irq_boff;

	}



	if (priv->devtype_data.quirks & FLEXCAN_QUIRK_SECONDARY_MB_IRQ) {

		err = request_irq(priv->irq_secondary_mb,

				  flexcan_irq, IRQF_SHARED, dev->name, dev);

		if (err)

			goto out_free_irq_err;

	}



	flexcan_chip_interrupts_enable(dev);



	netif_start_queue(dev);



	return 0;



 out_free_irq_err:

	if (priv->devtype_data.quirks & 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)

		free_irq(priv->irq_boff, dev);

 out_free_irq:

	free_irq(dev->irq, dev);
@@ -1794,6 +1805,9 @@ static int flexcan_close(struct net_device *dev) 
	netif_stop_queue(dev);

	flexcan_chip_interrupts_disable(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) {

		free_irq(priv->irq_err, dev);

		free_irq(priv->irq_boff, dev);
@@ -2187,6 +2201,14 @@ static int flexcan_probe(struct platform_device *pdev) 
		}

	}



	if (priv->devtype_data.quirks & FLEXCAN_QUIRK_SECONDARY_MB_IRQ) {

		priv->irq_secondary_mb = platform_get_irq_byname(pdev, "mb-1");

		if (priv->irq_secondary_mb < 0) {

			err = priv->irq_secondary_mb;

			goto failed_platform_get_irq;

		}

	}



	if (priv->devtype_data.quirks & FLEXCAN_QUIRK_SUPPORT_FD) {

		priv->can.ctrlmode_supported |= CAN_CTRLMODE_FD |

			CAN_CTRLMODE_FD_NON_ISO;

drivers/net/can/flexcan/flexcan.h

+5 −0
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ 
#define FLEXCAN_QUIRK_SUPPORT_RX_FIFO BIT(16)

/* Setup stop mode with ATF SCMI protocol to support wakeup */

#define FLEXCAN_QUIRK_SETUP_STOP_MODE_SCMI BIT(17)

/* Device has two separate interrupt lines for two mailbox ranges, which

 * both need to have an interrupt handler registered.

 */

#define FLEXCAN_QUIRK_SECONDARY_MB_IRQ	BIT(18)



struct flexcan_devtype_data {

	u32 quirks;		/* quirks needed for different IP cores */
@@ -107,6 +111,7 @@ struct flexcan_priv { 


	int irq_boff;

	int irq_err;

	int irq_secondary_mb;



	/* IPC handle when setup stop mode by System Controller firmware(scfw) */

	struct imx_sc_ipc *sc_ipc_handle;