Commit 11123ab9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-fixes-for-4.20-20181109' of... 

Merge tag 'linux-can-fixes-for-4.20-20181109' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can



Marc Kleine-Budde says:

====================
pull-request: can 2018-11-09

this is a pull request of 20 patches for net/master.

First we have a patch by Oliver Hartkopp which changes the raw socket's
raw_sendmsg() to return an error value if the user tries to send a CANFD
frame to a CAN-2.0 device.

The next two patches are by Jimmy Assarsson and fix potential problems
in the kvaser_usb driver.

YueHaibing's patches for the ucan driver fix a compile time warning and
remove a duplicate include.

Eugeniu Rosca patch adds more binding documentation to the rcar_can
driver bindings. The next two patches are by Fabrizio Castro for the
rcar_can driver and fixes a problem in the driver's probe function and
document the r8a774a1 binding.

Lukas Wunner's patch fixes a recpetion problem in hi311x driver by
switching from edge to level triggered interruts.

The next three patches all target the flexcan driver. Pankaj Bansal's
patch unconditionally unlocks the last mailbox used for RX. Alexander
Stein provides a better workaround for a hardware limitation when
sending RTR frames, by using the last mailbox for TX, resulting in fewer
lost frames. The patch by me simplyfies the driver, by making a runtime
value a compile time constant.

The following 4 patches are by me and provide the groundwork for the
next patches by Oleksij Rempel. To avoid code duplication common code in
the common CAN driver infrastructure is factured out and error handling
is cleaned up.

The next 4 patches are by Oleksij Rempel and fix the problem in the
flexcan driver that other processes see TX frames arrive out of order
with ragards to a RX'ed frame (which are send by a different system on
the CAN bus as the result of our TX frame).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 77e461d1 d788905f

Documentation/devicetree/bindings/net/can/holt_hi311x.txt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Example: 
		reg = <1>;

		clocks = <&clk32m>;

		interrupt-parent = <&gpio4>;

		interrupts = <13 IRQ_TYPE_EDGE_RISING>;

		interrupts = <13 IRQ_TYPE_LEVEL_HIGH>;

		vdd-supply = <&reg5v0>;

		xceiver-supply = <&reg5v0>;

	};

Documentation/devicetree/bindings/net/can/rcar_can.txt

+18 −10
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ Required properties: 
- compatible: "renesas,can-r8a7743" if CAN controller is a part of R8A7743 SoC.

	      "renesas,can-r8a7744" if CAN controller is a part of R8A7744 SoC.

	      "renesas,can-r8a7745" if CAN controller is a part of R8A7745 SoC.

	      "renesas,can-r8a774a1" if CAN controller is a part of R8A774A1 SoC.

	      "renesas,can-r8a7778" if CAN controller is a part of R8A7778 SoC.

	      "renesas,can-r8a7779" if CAN controller is a part of R8A7779 SoC.

	      "renesas,can-r8a7790" if CAN controller is a part of R8A7790 SoC.
@@ -14,26 +15,32 @@ Required properties: 
	      "renesas,can-r8a7794" if CAN controller is a part of R8A7794 SoC.

	      "renesas,can-r8a7795" if CAN controller is a part of R8A7795 SoC.

	      "renesas,can-r8a7796" if CAN controller is a part of R8A7796 SoC.

	      "renesas,can-r8a77965" if CAN controller is a part of R8A77965 SoC.

	      "renesas,rcar-gen1-can" for a generic R-Car Gen1 compatible device.

	      "renesas,rcar-gen2-can" for a generic R-Car Gen2 or RZ/G1

	      compatible device.

	      "renesas,rcar-gen3-can" for a generic R-Car Gen3 compatible device.

	      "renesas,rcar-gen3-can" for a generic R-Car Gen3 or RZ/G2

	      compatible device.

	      When compatible with the generic version, nodes must list the

	      SoC-specific version corresponding to the platform first

	      followed by the generic version.



- reg: physical base address and size of the R-Car CAN register map.

- interrupts: interrupt specifier for the sole interrupt.

- clocks: phandles and clock specifiers for 3 CAN clock inputs.

- clock-names: 3 clock input name strings: "clkp1", "clkp2", "can_clk".

- clocks: phandles and clock specifiers for 2 CAN clock inputs for RZ/G2

	  devices.

	  phandles and clock specifiers for 3 CAN clock inputs for every other

	  SoC.

- clock-names: 2 clock input name strings for RZ/G2: "clkp1", "can_clk".

	       3 clock input name strings for every other SoC: "clkp1", "clkp2",

	       "can_clk".

- pinctrl-0: pin control group to be used for this controller.

- pinctrl-names: must be "default".



Required properties for "renesas,can-r8a7795" and "renesas,can-r8a7796"

compatible:

In R8A7795 and R8A7796 SoCs, "clkp2" can be CANFD clock. This is a div6 clock

and can be used by both CAN and CAN FD controller at the same time. It needs to

be scaled to maximum frequency if any of these controllers use it. This is done

Required properties for R8A7795, R8A7796 and R8A77965:

For the denoted SoCs, "clkp2" can be CANFD clock. This is a div6 clock and can

be used by both CAN and CAN FD controller at the same time. It needs to be

scaled to maximum frequency if any of these controllers use it. This is done

using the below properties:



- assigned-clocks: phandle of clkp2(CANFD) clock.
@@ -42,8 +49,9 @@ using the below properties: 
Optional properties:

- renesas,can-clock-select: R-Car CAN Clock Source Select. Valid values are:

			    <0x0> (default) : Peripheral clock (clkp1)

			    <0x1> : Peripheral clock (clkp2)

			    <0x3> : Externally input clock

			    <0x1> : Peripheral clock (clkp2) (not supported by

				    RZ/G2 devices)

			    <0x3> : External input clock



Example

-------

drivers/net/can/dev.c

+35 −13
Original line number Diff line number Diff line
@@ -477,6 +477,34 @@ void can_put_echo_skb(struct sk_buff *skb, struct net_device *dev, 
}

EXPORT_SYMBOL_GPL(can_put_echo_skb);



struct sk_buff *__can_get_echo_skb(struct net_device *dev, unsigned int idx, u8 *len_ptr)

{

	struct can_priv *priv = netdev_priv(dev);

	struct sk_buff *skb = priv->echo_skb[idx];

	struct canfd_frame *cf;



	if (idx >= priv->echo_skb_max) {

		netdev_err(dev, "%s: BUG! Trying to access can_priv::echo_skb out of bounds (%u/max %u)\n",

			   __func__, idx, priv->echo_skb_max);

		return NULL;

	}



	if (!skb) {

		netdev_err(dev, "%s: BUG! Trying to echo non existing skb: can_priv::echo_skb[%u]\n",

			   __func__, idx);

		return NULL;

	}



	/* Using "struct canfd_frame::len" for the frame

	 * length is supported on both CAN and CANFD frames.

	 */

	cf = (struct canfd_frame *)skb->data;

	*len_ptr = cf->len;

	priv->echo_skb[idx] = NULL;



	return skb;

}



/*

 * Get the skb from the stack and loop it back locally

 *
@@ -486,22 +514,16 @@ EXPORT_SYMBOL_GPL(can_put_echo_skb); 
 */

unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx)

{

	struct can_priv *priv = netdev_priv(dev);



	BUG_ON(idx >= priv->echo_skb_max);



	if (priv->echo_skb[idx]) {

		struct sk_buff *skb = priv->echo_skb[idx];

		struct can_frame *cf = (struct can_frame *)skb->data;

		u8 dlc = cf->can_dlc;

	struct sk_buff *skb;

	u8 len;



		netif_rx(priv->echo_skb[idx]);

		priv->echo_skb[idx] = NULL;

	skb = __can_get_echo_skb(dev, idx, &len);

	if (!skb)

		return 0;



		return dlc;

	}

	netif_rx(skb);



	return 0;

	return len;

}

EXPORT_SYMBOL_GPL(can_get_echo_skb);

drivers/net/can/flexcan.c

+60 −48
Original line number Diff line number Diff line
@@ -136,12 +136,11 @@ 
/* FLEXCAN interrupt flag register (IFLAG) bits */

/* Errata ERR005829 step7: Reserve first valid MB */

#define FLEXCAN_TX_MB_RESERVED_OFF_FIFO		8

#define FLEXCAN_TX_MB_OFF_FIFO		9

#define FLEXCAN_TX_MB_RESERVED_OFF_TIMESTAMP	0

#define FLEXCAN_TX_MB_OFF_TIMESTAMP		1

#define FLEXCAN_RX_MB_OFF_TIMESTAMP_FIRST	(FLEXCAN_TX_MB_OFF_TIMESTAMP + 1)

#define FLEXCAN_RX_MB_OFF_TIMESTAMP_LAST	63

#define FLEXCAN_IFLAG_MB(x)		BIT(x)

#define FLEXCAN_TX_MB				63

#define FLEXCAN_RX_MB_OFF_TIMESTAMP_FIRST	(FLEXCAN_TX_MB_RESERVED_OFF_TIMESTAMP + 1)

#define FLEXCAN_RX_MB_OFF_TIMESTAMP_LAST	(FLEXCAN_TX_MB - 1)

#define FLEXCAN_IFLAG_MB(x)		BIT(x & 0x1f)

#define FLEXCAN_IFLAG_RX_FIFO_OVERFLOW	BIT(7)

#define FLEXCAN_IFLAG_RX_FIFO_WARN	BIT(6)

#define FLEXCAN_IFLAG_RX_FIFO_AVAILABLE	BIT(5)
@@ -259,9 +258,7 @@ struct flexcan_priv { 
	struct can_rx_offload offload;



	struct flexcan_regs __iomem *regs;

	struct flexcan_mb __iomem *tx_mb;

	struct flexcan_mb __iomem *tx_mb_reserved;

	u8 tx_mb_idx;

	u32 reg_ctrl_default;

	u32 reg_imask1_default;

	u32 reg_imask2_default;
@@ -515,6 +512,7 @@ static int flexcan_get_berr_counter(const struct net_device *dev, 
static netdev_tx_t flexcan_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	const struct flexcan_priv *priv = netdev_priv(dev);

	struct flexcan_regs __iomem *regs = priv->regs;

	struct can_frame *cf = (struct can_frame *)skb->data;

	u32 can_id;

	u32 data;
@@ -537,17 +535,17 @@ static netdev_tx_t flexcan_start_xmit(struct sk_buff *skb, struct net_device *de 


	if (cf->can_dlc > 0) {

		data = be32_to_cpup((__be32 *)&cf->data[0]);

		priv->write(data, &priv->tx_mb->data[0]);

		priv->write(data, &regs->mb[FLEXCAN_TX_MB].data[0]);

	}

	if (cf->can_dlc > 4) {

		data = be32_to_cpup((__be32 *)&cf->data[4]);

		priv->write(data, &priv->tx_mb->data[1]);

		priv->write(data, &regs->mb[FLEXCAN_TX_MB].data[1]);

	}



	can_put_echo_skb(skb, dev, 0);



	priv->write(can_id, &priv->tx_mb->can_id);

	priv->write(ctrl, &priv->tx_mb->can_ctrl);

	priv->write(can_id, &regs->mb[FLEXCAN_TX_MB].can_id);

	priv->write(ctrl, &regs->mb[FLEXCAN_TX_MB].can_ctrl);



	/* Errata ERR005829 step8:

	 * Write twice INACTIVE(0x8) code to first MB.
@@ -563,9 +561,13 @@ static netdev_tx_t flexcan_start_xmit(struct sk_buff *skb, struct net_device *de 
static void flexcan_irq_bus_err(struct net_device *dev, u32 reg_esr)

{

	struct flexcan_priv *priv = netdev_priv(dev);

	struct flexcan_regs __iomem *regs = priv->regs;

	struct sk_buff *skb;

	struct can_frame *cf;

	bool rx_errors = false, tx_errors = false;

	u32 timestamp;



	timestamp = priv->read(&regs->timer) << 16;



	skb = alloc_can_err_skb(dev, &cf);

	if (unlikely(!skb))
@@ -612,17 +614,21 @@ static void flexcan_irq_bus_err(struct net_device *dev, u32 reg_esr) 
	if (tx_errors)

		dev->stats.tx_errors++;



	can_rx_offload_irq_queue_err_skb(&priv->offload, skb);

	can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);

}



static void flexcan_irq_state(struct net_device *dev, u32 reg_esr)

{

	struct flexcan_priv *priv = netdev_priv(dev);

	struct flexcan_regs __iomem *regs = priv->regs;

	struct sk_buff *skb;

	struct can_frame *cf;

	enum can_state new_state, rx_state, tx_state;

	int flt;

	struct can_berr_counter bec;

	u32 timestamp;



	timestamp = priv->read(&regs->timer) << 16;



	flt = reg_esr & FLEXCAN_ESR_FLT_CONF_MASK;

	if (likely(flt == FLEXCAN_ESR_FLT_CONF_ACTIVE)) {
@@ -652,7 +658,7 @@ static void flexcan_irq_state(struct net_device *dev, u32 reg_esr) 
	if (unlikely(new_state == CAN_STATE_BUS_OFF))

		can_bus_off(dev);



	can_rx_offload_irq_queue_err_skb(&priv->offload, skb);

	can_rx_offload_queue_sorted(&priv->offload, skb, timestamp);

}



static inline struct flexcan_priv *rx_offload_to_priv(struct can_rx_offload *offload)
@@ -720,9 +726,14 @@ static unsigned int flexcan_mailbox_read(struct can_rx_offload *offload, 
			priv->write(BIT(n - 32), &regs->iflag2);

	} else {

		priv->write(FLEXCAN_IFLAG_RX_FIFO_AVAILABLE, &regs->iflag1);

		priv->read(&regs->timer);

	}



	/* Read the Free Running Timer. It is optional but recommended

	 * to unlock Mailbox as soon as possible and make it available

	 * for reception.

	 */

	priv->read(&regs->timer);



	return 1;

}
@@ -732,9 +743,9 @@ static inline u64 flexcan_read_reg_iflag_rx(struct flexcan_priv *priv) 
	struct flexcan_regs __iomem *regs = priv->regs;

	u32 iflag1, iflag2;



	iflag2 = priv->read(&regs->iflag2) & priv->reg_imask2_default;

	iflag1 = priv->read(&regs->iflag1) & priv->reg_imask1_default &

		~FLEXCAN_IFLAG_MB(priv->tx_mb_idx);

	iflag2 = priv->read(&regs->iflag2) & priv->reg_imask2_default &

		~FLEXCAN_IFLAG_MB(FLEXCAN_TX_MB);

	iflag1 = priv->read(&regs->iflag1) & priv->reg_imask1_default;



	return (u64)iflag2 << 32 | iflag1;

}
@@ -746,11 +757,9 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id) 
	struct flexcan_priv *priv = netdev_priv(dev);

	struct flexcan_regs __iomem *regs = priv->regs;

	irqreturn_t handled = IRQ_NONE;

	u32 reg_iflag1, reg_esr;

	u32 reg_iflag2, reg_esr;

	enum can_state last_state = priv->can.state;



	reg_iflag1 = priv->read(&regs->iflag1);



	/* reception interrupt */

	if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {

		u64 reg_iflag;
@@ -764,6 +773,9 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id) 
				break;

		}

	} else {

		u32 reg_iflag1;



		reg_iflag1 = priv->read(&regs->iflag1);

		if (reg_iflag1 & FLEXCAN_IFLAG_RX_FIFO_AVAILABLE) {

			handled = IRQ_HANDLED;

			can_rx_offload_irq_offload_fifo(&priv->offload);
@@ -779,17 +791,22 @@ static irqreturn_t flexcan_irq(int irq, void *dev_id) 
		}

	}



	reg_iflag2 = priv->read(&regs->iflag2);



	/* transmission complete interrupt */

	if (reg_iflag1 & FLEXCAN_IFLAG_MB(priv->tx_mb_idx)) {

	if (reg_iflag2 & FLEXCAN_IFLAG_MB(FLEXCAN_TX_MB)) {

		u32 reg_ctrl = priv->read(&regs->mb[FLEXCAN_TX_MB].can_ctrl);



		handled = IRQ_HANDLED;

		stats->tx_bytes += can_get_echo_skb(dev, 0);

		stats->tx_bytes += can_rx_offload_get_echo_skb(&priv->offload,

							       0, reg_ctrl << 16);

		stats->tx_packets++;

		can_led_event(dev, CAN_LED_EVENT_TX);



		/* after sending a RTR frame MB is in RX mode */

		priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,

			    &priv->tx_mb->can_ctrl);

		priv->write(FLEXCAN_IFLAG_MB(priv->tx_mb_idx), &regs->iflag1);

			    &regs->mb[FLEXCAN_TX_MB].can_ctrl);

		priv->write(FLEXCAN_IFLAG_MB(FLEXCAN_TX_MB), &regs->iflag2);

		netif_wake_queue(dev);

	}
@@ -931,15 +948,13 @@ static int flexcan_chip_start(struct net_device *dev) 
	reg_mcr &= ~FLEXCAN_MCR_MAXMB(0xff);

	reg_mcr |= FLEXCAN_MCR_FRZ | FLEXCAN_MCR_HALT | FLEXCAN_MCR_SUPV |

		FLEXCAN_MCR_WRN_EN | FLEXCAN_MCR_SRX_DIS | FLEXCAN_MCR_IRMQ |

		FLEXCAN_MCR_IDAM_C;

		FLEXCAN_MCR_IDAM_C | FLEXCAN_MCR_MAXMB(FLEXCAN_TX_MB);



	if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {

	if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP)

		reg_mcr &= ~FLEXCAN_MCR_FEN;

		reg_mcr |= FLEXCAN_MCR_MAXMB(priv->offload.mb_last);

	} else {

		reg_mcr |= FLEXCAN_MCR_FEN |

			FLEXCAN_MCR_MAXMB(priv->tx_mb_idx);

	}

	else

		reg_mcr |= FLEXCAN_MCR_FEN;



	netdev_dbg(dev, "%s: writing mcr=0x%08x", __func__, reg_mcr);

	priv->write(reg_mcr, &regs->mcr);
@@ -982,17 +997,18 @@ static int flexcan_chip_start(struct net_device *dev) 
		priv->write(reg_ctrl2, &regs->ctrl2);

	}



	/* clear and invalidate all mailboxes first */

	for (i = priv->tx_mb_idx; i < ARRAY_SIZE(regs->mb); i++) {

		priv->write(FLEXCAN_MB_CODE_RX_INACTIVE,

			    &regs->mb[i].can_ctrl);

	}



	if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {

		for (i = priv->offload.mb_first; i <= priv->offload.mb_last; i++)

		for (i = priv->offload.mb_first; i <= priv->offload.mb_last; i++) {

			priv->write(FLEXCAN_MB_CODE_RX_EMPTY,

				    &regs->mb[i].can_ctrl);

		}

	} else {

		/* clear and invalidate unused mailboxes first */

		for (i = FLEXCAN_TX_MB_RESERVED_OFF_FIFO; i <= ARRAY_SIZE(regs->mb); i++) {

			priv->write(FLEXCAN_MB_CODE_RX_INACTIVE,

				    &regs->mb[i].can_ctrl);

		}

	}



	/* Errata ERR005829: mark first TX mailbox as INACTIVE */

	priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,
@@ -1000,7 +1016,7 @@ static int flexcan_chip_start(struct net_device *dev) 


	/* mark TX mailbox as INACTIVE */

	priv->write(FLEXCAN_MB_CODE_TX_INACTIVE,

		    &priv->tx_mb->can_ctrl);

		    &regs->mb[FLEXCAN_TX_MB].can_ctrl);



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

	priv->write(0x0, &regs->rxgmask);
@@ -1355,17 +1371,13 @@ static int flexcan_probe(struct platform_device *pdev) 
	priv->devtype_data = devtype_data;

	priv->reg_xceiver = reg_xceiver;



	if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {

		priv->tx_mb_idx = FLEXCAN_TX_MB_OFF_TIMESTAMP;

	if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP)

		priv->tx_mb_reserved = &regs->mb[FLEXCAN_TX_MB_RESERVED_OFF_TIMESTAMP];

	} else {

		priv->tx_mb_idx = FLEXCAN_TX_MB_OFF_FIFO;

	else

		priv->tx_mb_reserved = &regs->mb[FLEXCAN_TX_MB_RESERVED_OFF_FIFO];

	}

	priv->tx_mb = &regs->mb[priv->tx_mb_idx];



	priv->reg_imask1_default = FLEXCAN_IFLAG_MB(priv->tx_mb_idx);

	priv->reg_imask2_default = 0;

	priv->reg_imask1_default = 0;

	priv->reg_imask2_default = FLEXCAN_IFLAG_MB(FLEXCAN_TX_MB);



	priv->offload.mailbox_read = flexcan_mailbox_read;

drivers/net/can/rcar/rcar_can.c

+4 −1
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ 


#define RCAR_CAN_DRV_NAME	"rcar_can"



#define RCAR_SUPPORTED_CLOCKS	(BIT(CLKR_CLKP1) | BIT(CLKR_CLKP2) | \

				 BIT(CLKR_CLKEXT))



/* Mailbox configuration:

 * mailbox 60 - 63 - Rx FIFO mailboxes

 * mailbox 56 - 59 - Tx FIFO mailboxes
@@ -789,7 +792,7 @@ static int rcar_can_probe(struct platform_device *pdev) 
		goto fail_clk;

	}



	if (clock_select >= ARRAY_SIZE(clock_names)) {

	if (!(BIT(clock_select) & RCAR_SUPPORTED_CLOCKS)) {

		err = -EINVAL;

		dev_err(&pdev->dev, "invalid CAN clock selected\n");

		goto fail_clk;

CRA Git | Maintained and supported by SUSTech CRA and CCSE