Commit 5947b7f7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-6.1-20220915' of... 

Merge tag 'linux-can-next-for-6.1-20220915' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next



Marc Kleine-Budde says:

====================
Sept. 15, 2022, 8:19 a.m. UTC
Hello Jakub, hello David,

this is a pull request of 23 patches for net-next/master.

the first 2 patches are by me and fix a typo in the rx-offload helper
and the flexcan driver.

Christophe JAILLET's patch cleans up the error handling in
rcar_canfd driver's probe function.

Kenneth Lee's patch converts the kvaser_usb driver from kcalloc() to
kzalloc().

Biju Das contributes 2 patches to the sja1000 driver which update the
DT bindings and support for the RZ/N1 SJA1000 CAN controller.

Jinpeng Cui provides 2 patches that remove redundant variables from
the sja1000 and kvaser_pciefd driver.

2 patches by John Whittington and me add hardware timestamp support to
the gs_usb driver.

Gustavo A. R. Silva's patch converts the etas_es58x driver to make use
of DECLARE_FLEX_ARRAY().

Krzysztof Kozlowski's patch cleans up the sja1000 DT bindings.

Dario Binacchi fixes his invalid email in the flexcan driver
documentation.

Ziyang Xuan contributes 2 patches that clean up the CAN RAW protocol.

Yang Yingliang's patch switches the flexcan driver to dev_err_probe().

The last 7 patches are by Oliver Hartkopp and add support for the next
generation of the CAN protocol: CAN with eXtended data Length (CAN XL).
====================

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

Documentation/devicetree/bindings/net/can/nxp,sja1000.yaml

+5 −1
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ properties: 
  clocks:

    maxItems: 1



  power-domains:

    maxItems: 1



  reg-io-width:

    $ref: /schemas/types.yaml#/definitions/uint32

    description: I/O register width (in bytes) implemented by this device

    default: 1

    enum: [ 1, 2, 4 ]
@@ -105,6 +107,7 @@ allOf: 
    then:

      required:

        - clocks

        - power-domains



unevaluatedProperties: false
@@ -129,4 +132,5 @@ examples: 
        reg-io-width = <4>;

        interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&sysctrl R9A06G032_HCLK_CAN0>;

        power-domains = <&sysctrl>;

    };

Documentation/networking/device_drivers/can/freescale/flexcan.rst

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Flexcan CAN Controller driver 
=============================



Authors: Marc Kleine-Budde <mkl@pengutronix.de>,

Dario Binacchi <dario.binacchi@amarula.solutions.com>

Dario Binacchi <dario.binacchi@amarulasolutions.com>



On/off RTR frames reception

===========================

drivers/net/can/ctucanfd/ctucanfd_base.c

+0 −1
Original line number Diff line number Diff line
@@ -657,7 +657,6 @@ static void ctucan_read_rx_frame(struct ctucan_priv *priv, struct canfd_frame *c 
		cf->can_id = (idw >> 18) & CAN_SFF_MASK;



	/* BRS, ESI, RTR Flags */

	cf->flags = 0;

	if (FIELD_GET(REG_FRAME_FORMAT_W_FDF, ffw)) {

		if (FIELD_GET(REG_FRAME_FORMAT_W_BRS, ffw))

			cf->flags |= CANFD_BRS;

drivers/net/can/dev/rx-offload.c

+2 −2
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ unsigned int can_rx_offload_get_echo_skb(struct can_rx_offload *offload, 
	struct net_device *dev = offload->dev;

	struct net_device_stats *stats = &dev->stats;

	struct sk_buff *skb;

	u8 len;

	unsigned int len;

	int err;



	skb = __can_get_echo_skb(dev, idx, &len, frame_len_ptr);
@@ -329,7 +329,7 @@ static int can_rx_offload_init_queue(struct net_device *dev, 
{

	offload->dev = dev;



	/* Limit queue len to 4x the weight (rounted to next power of two) */

	/* Limit queue len to 4x the weight (rounded to next power of two) */

	offload->skb_queue_len_max = 2 << fls(weight);

	offload->skb_queue_len_max *= 4;

	skb_queue_head_init(&offload->skb_queue);

drivers/net/can/dev/skb.c

+79 −34
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ int 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,

		   unsigned int *frame_len_ptr)

__can_get_echo_skb(struct net_device *dev, unsigned int idx,

		   unsigned int *len_ptr, unsigned int *frame_len_ptr)

{

	struct can_priv *priv = netdev_priv(dev);
@@ -108,16 +108,12 @@ __can_get_echo_skb(struct net_device *dev, unsigned int idx, u8 *len_ptr, 
		 */

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

		struct can_skb_priv *can_skb_priv = can_skb_prv(skb);

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



		if (skb_shinfo(skb)->tx_flags & SKBTX_IN_PROGRESS)

			skb_tstamp_tx(skb, skb_hwtstamps(skb));



		/* get the real payload length for netdev statistics */

		if (cf->can_id & CAN_RTR_FLAG)

			*len_ptr = 0;

		else

			*len_ptr = cf->len;

		*len_ptr = can_skb_get_data_len(skb);



		if (frame_len_ptr)

			*frame_len_ptr = can_skb_priv->frame_len;
@@ -147,7 +143,7 @@ unsigned int can_get_echo_skb(struct net_device *dev, unsigned int idx, 
			      unsigned int *frame_len_ptr)

{

	struct sk_buff *skb;

	u8 len;

	unsigned int len;



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

	if (!skb)
@@ -191,6 +187,20 @@ void can_free_echo_skb(struct net_device *dev, unsigned int idx, 
}

EXPORT_SYMBOL_GPL(can_free_echo_skb);



/* fill common values for CAN sk_buffs */

static void init_can_skb_reserve(struct sk_buff *skb)

{

	skb->pkt_type = PACKET_BROADCAST;

	skb->ip_summed = CHECKSUM_UNNECESSARY;



	skb_reset_mac_header(skb);

	skb_reset_network_header(skb);

	skb_reset_transport_header(skb);



	can_skb_reserve(skb);

	can_skb_prv(skb)->skbcnt = 0;

}



struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf)

{

	struct sk_buff *skb;
@@ -204,16 +214,8 @@ struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf) 
	}



	skb->protocol = htons(ETH_P_CAN);

	skb->pkt_type = PACKET_BROADCAST;

	skb->ip_summed = CHECKSUM_UNNECESSARY;



	skb_reset_mac_header(skb);

	skb_reset_network_header(skb);

	skb_reset_transport_header(skb);



	can_skb_reserve(skb);

	init_can_skb_reserve(skb);

	can_skb_prv(skb)->ifindex = dev->ifindex;

	can_skb_prv(skb)->skbcnt = 0;



	*cf = skb_put_zero(skb, sizeof(struct can_frame));
@@ -235,23 +237,51 @@ struct sk_buff *alloc_canfd_skb(struct net_device *dev, 
	}



	skb->protocol = htons(ETH_P_CANFD);

	skb->pkt_type = PACKET_BROADCAST;

	skb->ip_summed = CHECKSUM_UNNECESSARY;



	skb_reset_mac_header(skb);

	skb_reset_network_header(skb);

	skb_reset_transport_header(skb);



	can_skb_reserve(skb);

	init_can_skb_reserve(skb);

	can_skb_prv(skb)->ifindex = dev->ifindex;

	can_skb_prv(skb)->skbcnt = 0;



	*cfd = skb_put_zero(skb, sizeof(struct canfd_frame));



	/* set CAN FD flag by default */

	(*cfd)->flags = CANFD_FDF;



	return skb;

}

EXPORT_SYMBOL_GPL(alloc_canfd_skb);



struct sk_buff *alloc_canxl_skb(struct net_device *dev,

				struct canxl_frame **cxl,

				unsigned int data_len)

{

	struct sk_buff *skb;



	if (data_len < CANXL_MIN_DLEN || data_len > CANXL_MAX_DLEN)

		goto out_error;



	skb = netdev_alloc_skb(dev, sizeof(struct can_skb_priv) +

			       CANXL_HDR_SIZE + data_len);

	if (unlikely(!skb))

		goto out_error;



	skb->protocol = htons(ETH_P_CANXL);

	init_can_skb_reserve(skb);

	can_skb_prv(skb)->ifindex = dev->ifindex;



	*cxl = skb_put_zero(skb, CANXL_HDR_SIZE + data_len);



	/* set CAN XL flag and length information by default */

	(*cxl)->flags = CANXL_XLF;

	(*cxl)->len = data_len;



	return skb;



out_error:

	*cxl = NULL;



	return NULL;

}

EXPORT_SYMBOL_GPL(alloc_canxl_skb);



struct sk_buff *alloc_can_err_skb(struct net_device *dev, struct can_frame **cf)

{

	struct sk_buff *skb;
@@ -291,6 +321,14 @@ static bool can_skb_headroom_valid(struct net_device *dev, struct sk_buff *skb) 
		skb_reset_mac_header(skb);

		skb_reset_network_header(skb);

		skb_reset_transport_header(skb);



		/* set CANFD_FDF flag for CAN FD frames */

		if (can_is_canfd_skb(skb)) {

			struct canfd_frame *cfd;



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

			cfd->flags |= CANFD_FDF;

		}

	}



	return true;
@@ -299,18 +337,25 @@ static bool can_skb_headroom_valid(struct net_device *dev, struct sk_buff *skb) 
/* Drop a given socketbuffer if it does not contain a valid CAN frame. */

bool can_dropped_invalid_skb(struct net_device *dev, struct sk_buff *skb)

{

	const struct canfd_frame *cfd = (struct canfd_frame *)skb->data;

	struct can_priv *priv = netdev_priv(dev);



	if (skb->protocol == htons(ETH_P_CAN)) {

		if (unlikely(skb->len != CAN_MTU ||

			     cfd->len > CAN_MAX_DLEN))

	switch (ntohs(skb->protocol)) {

	case ETH_P_CAN:

		if (!can_is_can_skb(skb))

			goto inval_skb;

	} else if (skb->protocol == htons(ETH_P_CANFD)) {

		if (unlikely(skb->len != CANFD_MTU ||

			     cfd->len > CANFD_MAX_DLEN))

		break;



	case ETH_P_CANFD:

		if (!can_is_canfd_skb(skb))

			goto inval_skb;

	} else {

		break;



	case ETH_P_CANXL:

		if (!can_is_canxl_skb(skb))

			goto inval_skb;

		break;



	default:

		goto inval_skb;

	}