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

Commit c32fe4ad authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

can: flexcan: mark TX mailbox as TX_INACTIVE 



This patch fixes the initialization of the TX mailbox. It is now correctly
initialized as TX_INACTIVE not RX_EMPTY.

Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 4be0015c

drivers/net/can/flexcan.c

+13 −2
Original line number Diff line number Diff line
@@ -136,6 +136,17 @@ 


/* FLEXCAN message buffers */

#define FLEXCAN_MB_CNT_CODE(x)		(((x) & 0xf) << 24)

#define FLEXCAN_MB_CODE_RX_INACTIVE	(0x0 << 24)

#define FLEXCAN_MB_CODE_RX_EMPTY	(0x4 << 24)

#define FLEXCAN_MB_CODE_RX_FULL		(0x2 << 24)

#define FLEXCAN_MB_CODE_RX_OVERRRUN	(0x6 << 24)

#define FLEXCAN_MB_CODE_RX_RANSWER	(0xa << 24)



#define FLEXCAN_MB_CODE_TX_INACTIVE	(0x8 << 24)

#define FLEXCAN_MB_CODE_TX_ABORT	(0x9 << 24)

#define FLEXCAN_MB_CODE_TX_DATA		(0xc << 24)

#define FLEXCAN_MB_CODE_TX_TANSWER	(0xe << 24)



#define FLEXCAN_MB_CNT_SRR		BIT(22)

#define FLEXCAN_MB_CNT_IDE		BIT(21)

#define FLEXCAN_MB_CNT_RTR		BIT(20)
@@ -867,8 +878,8 @@ static int flexcan_chip_start(struct net_device *dev) 
	netdev_dbg(dev, "%s: writing ctrl=0x%08x", __func__, reg_ctrl);

	flexcan_write(reg_ctrl, &regs->ctrl);



	/* Abort any pending TX, mark Mailbox as INACTIVE */

	flexcan_write(FLEXCAN_MB_CNT_CODE(0x4),

	/* mark TX mailbox as INACTIVE */

	flexcan_write(FLEXCAN_MB_CODE_TX_INACTIVE,

		      &regs->cantxfg[FLEXCAN_TX_BUF_ID].can_ctrl);



	/* acceptance mask/acceptance code (accept everything) */