Commit f7b88d9a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-next-for-5.19-20220516' of... 

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

Marc Kleine-Budde says:

====================
pull-request: can-next 2022-05-16

the first 2 patches are by me and target the CAN raw protocol. The 1st
removes an unneeded assignment, the other one adds support for
SO_TXTIME/SCM_TXTIME.

Oliver Hartkopp contributes 2 patches for the ISOTP protocol. The 1st
adds support for transmission without flow control, the other let's
bind() return an error on incorrect CAN ID formatting.

Geert Uytterhoeven contributes a patch to clean up ctucanfd's Kconfig
file.

Vincent Mailhol's patch for the slcan driver uses the proper function
to check for invalid CAN frames in the xmit callback.

The next patch is by Geert Uytterhoeven and makes the interrupt-names
of the renesas,rcar-canfd dt bindings mandatory.

A patch by my update the ctucanfd dt bindings to include the common
CAN controller bindings.

The last patch is by Akira Yokosawa and fixes a breakage the
ctucanfd's documentation.

* tag 'linux-can-next-for-5.19-20220516' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next:
  docs: ctucanfd: Use 'kernel-figure' directive instead of 'figure'
  dt-bindings: can: ctucanfd: include common CAN controller bindings
  dt-bindings: can: renesas,rcar-canfd: Make interrupt-names required
  can: slcan: slc_xmit(): use can_dropped_invalid_skb() instead of manual check
  can: ctucanfd: Let users select instead of depend on CAN_CTUCANFD
  can: isotp: isotp_bind(): return -EINVAL on incorrect CAN ID formatting
  can: isotp: add support for transmission without flow control
  can: raw: add support for SO_TXTIME/SCM_TXTIME
  can: raw: raw_sendmsg(): remove not needed setting of skb->sk
====================

Link: https://lore.kernel.org/r/20220516202625.1129281-1-mkl@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 7fb18c0a ba3e2eae

Documentation/devicetree/bindings/net/can/ctu,ctucanfd.yaml

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ maintainers: 
  - Ondrej Ille <ondrej.ille@gmail.com>

  - Martin Jerabek <martin.jerabek01@gmail.com>



allOf:

  - $ref: can-controller.yaml#



properties:

  compatible:

    oneOf:

Documentation/devicetree/bindings/net/can/renesas,rcar-canfd.yaml

+2 −1
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ required: 
  - compatible

  - reg

  - interrupts

  - interrupt-names

  - clocks

  - clock-names

  - power-domains
@@ -136,7 +137,6 @@ then: 
        - const: rstc_n



  required:

    - interrupt-names

    - reset-names

else:

  properties:
@@ -167,6 +167,7 @@ examples: 
            reg = <0xe66c0000 0x8000>;

            interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;

            interrupt-names = "ch_int", "g_int";

            clocks = <&cpg CPG_MOD 914>,

                     <&cpg CPG_CORE R8A7795_CLK_CANFD>,

                     <&can_clk>;

Documentation/networking/device_drivers/can/ctu/ctucanfd-driver.rst

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ it is reachable (on which bus it resides) and its configuration – 
registers address, interrupts and so on. An example of such a device

tree is given in .



.. code:: raw

::



           / {

               /* ... */
@@ -451,7 +451,7 @@ the FIFO is maintained, together with priority rotation, is depicted in 


|



.. figure:: fsm_txt_buffer_user.svg

.. kernel-figure:: fsm_txt_buffer_user.svg



   TX Buffer states with possible transitions

drivers/net/can/ctucanfd/Kconfig

+3 −3
Original line number Diff line number Diff line 
config CAN_CTUCANFD

	tristate "CTU CAN-FD IP core"

	tristate "CTU CAN-FD IP core" if COMPILE_TEST

	help

	  This driver adds support for the CTU CAN FD open-source IP core.

	  More documentation and core sources at project page
@@ -13,8 +13,8 @@ config CAN_CTUCANFD 


config CAN_CTUCANFD_PCI

	tristate "CTU CAN-FD IP core PCI/PCIe driver"

	depends on CAN_CTUCANFD

	depends on PCI

	select CAN_CTUCANFD

	help

	  This driver adds PCI/PCIe support for CTU CAN-FD IP core.

	  The project providing FPGA design for Intel EP4CGX15 based DB4CGX15
@@ -23,8 +23,8 @@ config CAN_CTUCANFD_PCI 


config CAN_CTUCANFD_PLATFORM

	tristate "CTU CAN-FD IP core platform (FPGA, SoC) driver"

	depends on CAN_CTUCANFD

	depends on OF || COMPILE_TEST

	select CAN_CTUCANFD

	help

	  The core has been tested together with OpenCores SJA1000

	  modified to be CAN FD frames tolerant on MicroZed Zynq based

drivers/net/can/slcan.c

+2 −2
Original line number Diff line number Diff line
@@ -359,8 +359,8 @@ static netdev_tx_t slc_xmit(struct sk_buff *skb, struct net_device *dev) 
{

	struct slcan *sl = netdev_priv(dev);



	if (skb->len != CAN_MTU)

		goto out;

	if (can_dropped_invalid_skb(dev, skb))

		return NETDEV_TX_OK;



	spin_lock(&sl->lock);

	if (!netif_running(dev))  {