Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport all CAN-related changes from upstream NuttX #186

Draft
wants to merge 43 commits into
base: px4_firmware_nuttx-10.1.0+
Choose a base branch
from
Draft

Backport all CAN-related changes from upstream NuttX #186

wants to merge 43 commits into from

Commits on Jul 28, 2022

  1. [BACKPORT] arch/stm32h7: Add FDCAN SocketCAN driver 

    Adds an FDCAN driver for STM32H7 MCUs using the SocketCAN interface
    @JacobCrabill
    JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    eaab3a2 View commit details
    Browse the repository at this point in the history

  2. [BACKPORT] boards/stm32h7: Add socketcan config to nucleo-h743zi2

    @JacobCrabill
    JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    c29b742 View commit details
    Browse the repository at this point in the history

  3. [BACKPORT] net/netdev: Add CONFIG_NETDEV_CAN_FILTER_IOCTL

    @JacobCrabill
    JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    b4b9542 View commit details
    Browse the repository at this point in the history

  4. [BACKPORT] net/can: Fix CONFIG errors in can_recvmsg

    @JacobCrabill
    JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    101663f View commit details
    Browse the repository at this point in the history

  5. [BACKPORT] stm32h7: Add FDCAN3_BASE to memorymap.h 

    Note that pinmap.h, irq.h, fdcan.h still need to be updated with proper
register definitions for the FDCAN3 peripheral present in
STM32H7[2|3][3|5] MCUs
    @JacobCrabill
    JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    6d7fea1 View commit details
    Browse the repository at this point in the history

  6. [BACKPORT] net: Fix typos, update comments in Kconfigs

    @JacobCrabill
    JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    7406377 View commit details
    Browse the repository at this point in the history

  7. nucleo-h743zi2: Fix socketcan backport (CONFIG renames)

    @JacobCrabill
    JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    c7d4b23 View commit details
    Browse the repository at this point in the history

  8. [BACKPORT] include: can: move error.h to apps/canutils 

    This file is used by the libcanutils and can be isolated in apps

Signed-off-by: Alin Jerpelea <alin.jerpelea@sony.com>
    @jerpelea @JacobCrabill
    jerpelea authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    de18616 View commit details
    Browse the repository at this point in the history

  9. [BACKPORT] arch/arm/src/imxrt/imxrt_flexcan.c: use SW control to chec… 

    …k free MBs

CAN_ESR2 register was having problems of havng the correct values when
the bus was busy (with 3 and more nods). The register bit fields were
incorrectly indicating that there is no free MB and would not updated
itself from this state which was causing the applications to freeze on
write. This change relies only on a software control which should avoid
the problems described above.

Signed-off-by: Michal Lenc <michallenc@seznam.cz>
    @michallenc @JacobCrabill
    michallenc authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    c4ceffb View commit details
    Browse the repository at this point in the history

  10. [BACKPORT] boards/arm/imxrt/teensy-4.x: add option to have CAN3 as can0 

    This commit adds option for Teensy 4.x board to initialize CAN3 as can0.
The reason of this is the CAN FD capability of CAN3. This commit also
disables tickless mode support for pikron-bb configuration as this option
started causing hard faults which are yet to be solved.

Signed-off-by: Michal Lenc <michallenc@seznam.cz>
    @michallenc @JacobCrabill
    michallenc authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    9e0c61b View commit details
    Browse the repository at this point in the history

  11. [BACKPORT] Fixed imxrt flexcan driver compilation error due to incorr… 

    …ect scope of variable
    @pbrier @JacobCrabill
    pbrier authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    6cd67d6 View commit details
    Browse the repository at this point in the history

  12. [BACKPORT] net/can,icmp,icmpv6,tcp,tcp_timer,udp: device should poll … 

    …only those connections that are bound to the device.

tcp_timer: eliminated false decrements of conn->timer in case of multiple network adapters.
The false timer decrements sometimes provoked TCP spurious retransmissions due to premature timeouts.
    @a-lunev @JacobCrabill
    a-lunev authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    d3f889f View commit details
    Browse the repository at this point in the history

  13. [BACKPORT] can: WIP: Cleanup usage of soft fifo semaphore

    @MTres19 @JacobCrabill
    MTres19 authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    323cc48 View commit details
    Browse the repository at this point in the history

  14. [BACKPORT] include/nuttx/can.h: include nuttx/config.h

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    42f912f View commit details
    Browse the repository at this point in the history

  15. [BACKPORT] net/devif/devif_cansend.c: fix assertion for max data len

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    334e7ca View commit details
    Browse the repository at this point in the history

  16. [BACKPORT] include/nuttx/can/can.h: fix typo

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    248efed View commit details
    Browse the repository at this point in the history

  17. [BACKPORT] SocketCAN: add CAN error definitions

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    6ef0905 View commit details
    Browse the repository at this point in the history

  18. [BACKPORT] stm32: add CAN error support

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    3dea2bd View commit details
    Browse the repository at this point in the history

  19. [BACKPORT] stm32: add SocketCAN support, based on stm32_can.c

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    c0b5f3e View commit details
    Browse the repository at this point in the history

  20. [BACKPORT] boards/stm32: register CAN character device if configured

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    5950e63 View commit details
    Browse the repository at this point in the history

  21. [BACKPORT] boards/nucleo-f302r8: add CAN and SocketCAN examples

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    5e41aff View commit details
    Browse the repository at this point in the history

  22. [BACKPORT] boards/nucleo-f446re: add SocketCAN example

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    3086179 View commit details
    Browse the repository at this point in the history

  23. [BACKPORT] stm32: add FDCAN support 

    based on PR #2987
    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    3a8a220 View commit details
    Browse the repository at this point in the history

  24. [BACKPORT] arch/stm32: fdcan cosmetics

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    a406270 View commit details
    Browse the repository at this point in the history

  25. [BACKPORT] boards/b-g431b-esc1: add CAN example

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    f1b5c76 View commit details
    Browse the repository at this point in the history

  26. [BACKPORT] boards/nucleo-g431rb: add CAN example

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    39f09f1 View commit details
    Browse the repository at this point in the history

  27. [BACKPORT] include/nuttx/can.h: make SocketCAN error definitions alwa… 

    …ys available
    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    de03f43 View commit details
    Browse the repository at this point in the history

  28. [BACKPORT] include/nuttx/can.h: rename CAN_ERR_CTRL to CAN_ERR_CRTL f… 

    …or compatibility with libcanutils
    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    e263e0e View commit details
    Browse the repository at this point in the history

  29. [BACKPORT] arch/stm32: add FDCAN SocketCAN support

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    fb88aa8 View commit details
    Browse the repository at this point in the history

  30. [BACKPORT] boards/arm/stm32g4: normalize CAN configs

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    0889493 View commit details
    Browse the repository at this point in the history

  31. [BACKPORT] net/can: add an option to control CAN EXTID support

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    57b627f View commit details
    Browse the repository at this point in the history

  32. [BACKPORT] boards/b-g431b-esc1: add SocketCAN example

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    c625824 View commit details
    Browse the repository at this point in the history

  33. [BACKPORT] boards/nucleo-g431rb: add SocketCAN example

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    1aa879c View commit details
    Browse the repository at this point in the history

  34. [BACKPORT] net/can: remove psock reference from can connect 

    remove the psock back reference since timestamp
has been migrated to can_conn_s

Signed-off-by: chao.an <anchao@xiaomi.com>
    @anchao @JacobCrabill
    anchao authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    0e12b3c View commit details
    Browse the repository at this point in the history

  35. [BACKPORT] net/can/can_setsockopt.c: fix assertion, value can be NULL

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    1bf174d View commit details
    Browse the repository at this point in the history

  36. [BACKPORT] stm32/fdcan: use array indexes when accessing RX/TX FIFO

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    e21e4f9 View commit details
    Browse the repository at this point in the history

  37. [BACKPORT] stm32/fdcan: add CAN FD frames support

    @raiden00pl @JacobCrabill
    raiden00pl authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    79a623a View commit details
    Browse the repository at this point in the history

  38. [BACKPORT] arch/arm/src/stm32f7/stm32_can.c: fix CAN3 receiving 

    by fixing filter initialization.

STM32F7 CAN3 works in single peripheral configuration and there is only 14 filter banks: 0-13. Previously not available 14 indexed filter (CAN_NFILTERS/2) was wrongly used for for receiving to FIFO. Now zero indexed filter is correctly used instead.
    @lukegluke @JacobCrabill
    lukegluke authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    a0c05c2 View commit details
    Browse the repository at this point in the history

  39. [BACKPORT] drivers/can: optimize can driver reader side 

    Signed-off-by: Petro Karashchenko <petro.karashchenko@gmail.com>
    @pkarashchenko @JacobCrabill
    pkarashchenko authored and JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    e596450 View commit details
    Browse the repository at this point in the history

  40. Revert "[BACKPORT] net/can: remove psock reference from can connect" 

    This reverts commit 9ce3fab.

PR reference: apache/nuttx#5467

In order for this commit to be valid, the following other PRs must also
be back-ported first:
- apache/nuttx#5434

Additional PRs that fix related bugs:
- apache/nuttx#5462
- apache/nuttx#5466
    @JacobCrabill
    JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    74f1170 View commit details
    Browse the repository at this point in the history

  41. stm32: Add definition of 'arm_netinitialize()' for SocketCAN

    @JacobCrabill
    JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    98a3962 View commit details
    Browse the repository at this point in the history

  42. stm32: Fix unused variable in can_netdev_ioctl

    @JacobCrabill
    JacobCrabill committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    67ad6ab View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2022

  1. SocketCAN: add non-blocking write 

    Co-authored-by: Peter van der Perk <peter.vanderperk@nxp.com>
    @jarivanewijk @PetervdPerk-NXP @JacobCrabill
    2 people authored and JacobCrabill committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    601722d View commit details
    Browse the repository at this point in the history