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

Commit 62f42a11 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-fixes-for-5.2-20190607' of... 

Merge tag 'linux-can-fixes-for-5.2-20190607' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can



Marc Kleine-Budde says:

====================
pull-request: can 2019-06-07

this is a pull reqeust of 9 patches for net/master.

The first patch is by Alexander Dahl and removes a duplicate menu entry from
the Kconfig. The next patch by Joakim Zhang fixes the timeout in the flexcan
driver when setting small bit rates. Anssi Hannula's patch for the xilinx_can
driver fixes the bittiming_const for CAN FD core. The two patches by Sean
Nyekjaer bring mcp25625 to the existing mcp251x driver. The patch by Eugen
Hristev implements an errata for the m_can driver. YueHaibing's patch fixes the
error handling ing can_init(). The patch by Fabio Estevam for the flexcan
driver removes an unneeded registration message during flexcan_probe(). And the
last patch is by Willem de Bruijn and adds the missing purging the  socket
error queue on sock destruct.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2f3f7d1f fd704bd5

Documentation/devicetree/bindings/net/can/microchip,mcp251x.txt

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
 - compatible: Should be one of the following:

   - "microchip,mcp2510" for MCP2510.

   - "microchip,mcp2515" for MCP2515.

   - "microchip,mcp25625" for MCP25625.

 - reg: SPI chip select.

 - clocks: The clock feeding the CAN controller.

 - interrupts: Should contain IRQ line for the CAN controller.

drivers/net/can/flexcan.c

+1 −4
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ 
#define FLEXCAN_MB_CNT_LENGTH(x)	(((x) & 0xf) << 16)

#define FLEXCAN_MB_CNT_TIMESTAMP(x)	((x) & 0xffff)



#define FLEXCAN_TIMEOUT_US		(50)

#define FLEXCAN_TIMEOUT_US		(250)



/* FLEXCAN hardware feature flags

 *
@@ -1583,9 +1583,6 @@ static int flexcan_probe(struct platform_device *pdev) 
			dev_dbg(&pdev->dev, "failed to setup stop-mode\n");

	}



	dev_info(&pdev->dev, "device registered (reg_base=%p, irq=%d)\n",

		 priv->regs, dev->irq);



	return 0;



 failed_register:

drivers/net/can/m_can/m_can.c

+21 −0
Original line number Diff line number Diff line
@@ -822,6 +822,27 @@ static int m_can_poll(struct napi_struct *napi, int quota) 
	if (!irqstatus)

		goto end;



	/* Errata workaround for issue "Needless activation of MRAF irq"

	 * During frame reception while the MCAN is in Error Passive state

	 * and the Receive Error Counter has the value MCAN_ECR.REC = 127,

	 * it may happen that MCAN_IR.MRAF is set although there was no

	 * Message RAM access failure.

	 * If MCAN_IR.MRAF is enabled, an interrupt to the Host CPU is generated

	 * The Message RAM Access Failure interrupt routine needs to check

	 * whether MCAN_ECR.RP = ’1’ and MCAN_ECR.REC = 127.

	 * In this case, reset MCAN_IR.MRAF. No further action is required.

	 */

	if ((priv->version <= 31) && (irqstatus & IR_MRAF) &&

	    (m_can_read(priv, M_CAN_ECR) & ECR_RP)) {

		struct can_berr_counter bec;



		__m_can_get_berr_counter(dev, &bec);

		if (bec.rxerr == 127) {

			m_can_write(priv, M_CAN_IR, IR_MRAF);

			irqstatus &= ~IR_MRAF;

		}

	}



	psr = m_can_read(priv, M_CAN_PSR);

	if (irqstatus & IR_ERR_STATE)

		work_done += m_can_handle_state_errors(dev, psr);

drivers/net/can/spi/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -9,9 +9,10 @@ config CAN_HI311X 
	  Driver for the Holt HI311x SPI CAN controllers.



config CAN_MCP251X

	tristate "Microchip MCP251x SPI CAN controllers"

	tristate "Microchip MCP251x and MCP25625 SPI CAN controllers"

	depends on HAS_DMA

	---help---

	  Driver for the Microchip MCP251x SPI CAN controllers.

	  Driver for the Microchip MCP251x and MCP25625 SPI CAN

	  controllers.



endmenu

drivers/net/can/spi/mcp251x.c

+16 −9
Original line number Diff line number Diff line 
/*

 * CAN bus driver for Microchip 251x CAN Controller with SPI Interface

 * CAN bus driver for Microchip 251x/25625 CAN Controller with SPI Interface

 *

 * MCP2510 support and bug fixes by Christian Pellegrin

 * <chripell@evolware.org>
@@ -41,7 +41,7 @@ 
 * static struct spi_board_info spi_board_info[] = {

 *         {

 *                 .modalias = "mcp2510",

 *			// or "mcp2515" depending on your controller

 *			// "mcp2515" or "mcp25625" depending on your controller

 *                 .platform_data = &mcp251x_info,

 *                 .irq = IRQ_EINT13,

 *                 .max_speed_hz = 2*1000*1000,
@@ -238,6 +238,7 @@ static const struct can_bittiming_const mcp251x_bittiming_const = { 
enum mcp251x_model {

	CAN_MCP251X_MCP2510	= 0x2510,

	CAN_MCP251X_MCP2515	= 0x2515,

	CAN_MCP251X_MCP25625	= 0x25625,

};



struct mcp251x_priv {
@@ -280,7 +281,6 @@ static inline int mcp251x_is_##_model(struct spi_device *spi) \ 
}



MCP251X_IS(2510);

MCP251X_IS(2515);



static void mcp251x_clean(struct net_device *net)

{
@@ -820,9 +820,8 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id) 
		/* receive buffer 0 */

		if (intf & CANINTF_RX0IF) {

			mcp251x_hw_rx(spi, 0);

			/*

			 * Free one buffer ASAP

			 * (The MCP2515 does this automatically.)

			/* Free one buffer ASAP

			 * (The MCP2515/25625 does this automatically.)

			 */

			if (mcp251x_is_2510(spi))

				mcp251x_write_bits(spi, CANINTF, CANINTF_RX0IF, 0x00);
@@ -831,7 +830,7 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id) 
		/* receive buffer 1 */

		if (intf & CANINTF_RX1IF) {

			mcp251x_hw_rx(spi, 1);

			/* the MCP2515 does this automatically */

			/* The MCP2515/25625 does this automatically. */

			if (mcp251x_is_2510(spi))

				clear_intf |= CANINTF_RX1IF;

		}
@@ -1006,6 +1005,10 @@ static const struct of_device_id mcp251x_of_match[] = { 
		.compatible	= "microchip,mcp2515",

		.data		= (void *)CAN_MCP251X_MCP2515,

	},

	{

		.compatible	= "microchip,mcp25625",

		.data		= (void *)CAN_MCP251X_MCP25625,

	},

	{ }

};

MODULE_DEVICE_TABLE(of, mcp251x_of_match);
@@ -1019,6 +1022,10 @@ static const struct spi_device_id mcp251x_id_table[] = { 
		.name		= "mcp2515",

		.driver_data	= (kernel_ulong_t)CAN_MCP251X_MCP2515,

	},

	{

		.name		= "mcp25625",

		.driver_data	= (kernel_ulong_t)CAN_MCP251X_MCP25625,

	},

	{ }

};

MODULE_DEVICE_TABLE(spi, mcp251x_id_table);
@@ -1259,5 +1266,5 @@ module_spi_driver(mcp251x_can_driver); 


MODULE_AUTHOR("Chris Elston <celston@katalix.com>, "

	      "Christian Pellegrin <chripell@evolware.org>");

MODULE_DESCRIPTION("Microchip 251x CAN driver");

MODULE_DESCRIPTION("Microchip 251x/25625 CAN driver");

MODULE_LICENSE("GPL v2");