Commit Graph

946 Commits (cfe41963f3425e9adb01a70cfaddedf5e5982720)

Author SHA1 Message Date
Oliver Hartkopp cfe41963f3 include: update includes to latest Linux v6.2 upstream
Update includes to support CAN XL and latest CAN netlink features.

Upstream commits:

(1a3e3034c049) "can: canxl: introduce CAN XL data structure"
(061834624c87) "can: set CANFD_FDF flag in all CAN FD frame structures"
(94dfc73e7cf4) "treewide: uapi: Replace zero-length arrays with flexible-array members"
(383f0993fc77) "can: netlink: report the CAN controller mode supported flags"
(d99755f71a80) "can: netlink: add interface for CAN-FD Transmitter Delay Compensation (TDC)"
(63dfe0709643) "can: bittiming: allow TDC{V,O} to be zero and add can_tdc_const::tdc{v,o,f}_min"
(626332696d75) "can: raw: add CAN XL support"

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2023-02-25 14:55:00 +01:00
Ashcon Mohseninia 999c650e87 slcan: increase BTR char limit to 8 for 32bit BTR
As required by some Atmel MCU SLCAN implementations.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2023-02-23 16:36:33 +01:00
Marc Kleine-Budde 2323d506d6
Merge pull request #406 from marckleinebudde/cangen-fix-usage
cangen: print_usage(): add missing newlines
2023-02-07 19:59:04 +01:00
Marc Kleine-Budde cdc617545f cangen: print_usage(): add missing newlines
Fixes: f55ea38d14 ("cangen: add option for absolute timeouts")
Fixes: c6f2cf7c2f ("cangen: add support for SO_TXTIME")
2023-02-07 19:57:08 +01:00
majkk1 e409aa4c8c cangen: new generation mode - partially randomized payload (-D)
Part of the fixed data payload can be randomized using the 'x' character.
Nibbles marked with 'x' will be randomized.

For example $ vcan0 -D 11xx3344DEADBEEF -L 8:
 -> second byte of the payload will be randomized.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2023-01-28 19:00:57 +01:00
Oliver Hartkopp 3b2248b48e Makefile: add missing defines for CLOCK_TAI, SO_TXTIME and SCM_TXTIME
The commit c6f2cf7c2f ("cangen: add support for SO_TXTIME") relies
on several toolchain features ("CLOCK_TAI", "SO_TXTIME", "SCM_TXTIME")
which are not present in old toolchain.

Add defines to fix compilation on older toolchains.

Reported-by: https://github.com/b-thomson
Link: https://github.com/linux-can/can-utils/issues/398
Fixes: c6f2cf7c2f ("cangen: add support for SO_TXTIME")

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
2023-01-28 13:37:49 +01:00
Marc Kleine-Budde fe3717948b
Merge pull request #399 from marckleinebudde/fix-old-toolchains
buildsystem: add missing defines for CLOCK_TAI, SO_TXTIME and SCM_TXTIME
2023-01-24 11:54:14 +01:00
Marc Kleine-Budde e898c8a854 buildsystem: add missing defines for CLOCK_TAI, SO_TXTIME and SCM_TXTIME
The commit c6f2cf7c2f ("cangen: add support for SO_TXTIME") relies
on several toolchain features ("CLOCK_TAI", "SO_TXTIME", "SCM_TXTIME")
which are not present in old toolchain.

Add defines to fix compilation on older toolchains.

Reported-by: https://github.com/b-thomson
Link: https://github.com/linux-can/can-utils/issues/398
Fixes: c6f2cf7c2f ("cangen: add support for SO_TXTIME")
2023-01-24 10:04:06 +01:00
Marc Kleine-Budde 77ec9b3c2d Revert "cangen: use if_nametoindex() to avoid overflows"
This reverts commit 1f96d674c0.

Link: https://github.com/linux-can/can-utils/pull/396
Link: 1f96d674c0 (commitcomment-97455025)
2023-01-20 09:58:44 +01:00
Marc Kleine-Budde 5aa72c5e9e
Merge pull request #395 from marckleinebudde/mcp251xfd-dump
mcp251xfd dump: add support for dumps created with Linux kernel >= v5.18
2023-01-03 20:45:26 +01:00
Marc Kleine-Budde f3b35e8e80 mcp251xfd-dump: add support for dumps created with Linux kernel >= v5.18 2023-01-03 20:31:54 +01:00
Marc Kleine-Budde b4042d0205 mcp251xfd-dump: add test data 2023-01-03 20:31:54 +01:00
Marc Kleine-Budde 0847fb34b4 mcp251xfd-gen-testdata: add script to generate mcp251xfd-dump data 2023-01-03 20:18:47 +01:00
Marc Kleine-Budde ceb9761544 mcp251xfd-dump: regmap: skip lines that cannot be read 2023-01-03 15:46:07 +01:00
Marc Kleine-Budde 088176e4e0 mcp251xfd-dump: fail if no registers can be read from regmap file 2023-01-03 15:46:07 +01:00
Marc Kleine-Budde aadf98b49b
Merge pull request #394 from marckleinebudde/candump-cleanups
candump cleanups
2023-01-03 10:49:40 +01:00
Marc Kleine-Budde 92ae2b0e3d candump: sort getopt() by order of option in usage 2023-01-03 10:37:15 +01:00
Marc Kleine-Budde 306254b950 candump: checkpatch: fix space and newline usage
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2023-01-03 10:37:15 +01:00
Marc Kleine-Budde 34bd45861b
Merge pull request #392 from marckleinebudde/cleanups
cleanups
2022-12-19 15:42:42 +01:00
Juergen Borleis 578f42aac8 Buildsystem: provide missing network/CAN related definitions on demand only
Without the corresponding include file, these macros get always defined
locally and thus, shadows the ones from the system. This change ensures,
if the macros are found already defined in the system, then they are used.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
2022-12-19 15:31:23 +01:00
Juergen Borleis 3c88cfc1ec Buildsystem: don't define _GNU_SOURCE unconditionally
The "AC_USE_SYSTEM_EXTENSIONS" macros tests it for us.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
2022-12-19 15:31:23 +01:00
Juergen Borleis 40819fd038 lib.h: add forgotten declaration
The compiler misses the structure in some source files.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
2022-12-19 15:31:23 +01:00
Marc Kleine-Budde 12f1d94856
Merge pull request #391 from marckleinebudde/cansequence
cansequence: do_receive(): improve output in case of packet miss-match
2022-12-19 15:30:42 +01:00
Marc Kleine-Budde 7d375df741 cansequence: do_receive(): improve output in case of packet miss-match 2022-12-19 15:26:28 +01:00
Marc Kleine-Budde 1969f943a2
Merge pull request #390 from marckleinebudde/can-tc-init-etf
can-tc-init-etf: document required kernel config options
2022-12-13 22:39:08 +01:00
Marc Kleine-Budde 1322afa6e4 can-tc-init-etf: document required kernel config options 2022-12-13 22:13:37 +01:00
Marc Kleine-Budde f662b32082
Merge pull request #389 from marckleinebudde/cangen-so_txtime
cangen: add support for SO_TXTIME
2022-12-12 15:08:12 +01:00
Marc Kleine-Budde 5b5f1523c4 can-tc-init-etf: add example script to setup queuing for etf 2022-12-12 13:25:09 +01:00
Marc Kleine-Budde c6f2cf7c2f cangen: add support for SO_TXTIME
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-09 19:47:21 +01:00
Marc Kleine-Budde 9dff4b6393 cangen: do_send_one(): use sendmsg() instead of write()
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-08 10:55:19 +01:00
Marc Kleine-Budde 759524f02c cangen: move write() into separate function
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-08 10:55:18 +01:00
Marc Kleine-Budde f55ea38d14 cangen: add option for absolute timeouts
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-08 10:49:21 +01:00
Marc Kleine-Budde df232c845a cangen: import timespec helper functions
Imported from:

0b5b9845eb

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 16:45:21 +01:00
Marc Kleine-Budde 1ec8eb9ca1 cangen: move sleep directly in font of send()
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 16:45:21 +01:00
Marc Kleine-Budde 96309409c2
Merge pull request #388 from marckleinebudde/fix-warnings
fix warnings
2022-12-07 16:40:08 +01:00
Marc Kleine-Budde 7e8cfac0de j1939cat: j1939cat_send(): fix uninitialized variable 2022-12-07 16:35:44 +01:00
Marc Kleine-Budde 0b84a782c2 mcp251xfd-dump: fix comparison of integer expressions of different signedness warning
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 16:32:41 +01:00
Marc Kleine-Budde abbd47bd09
Merge pull request #386 from marckleinebudde/cangen-cleanups
cangen cleanups
2022-12-07 15:38:01 +01:00
Marc Kleine-Budde b6a65b8105 cangen: sort getopt() by order of option in usage
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 15:28:18 +01:00
Marc Kleine-Budde 99686af630 cangen: print_usage() don't hardcode default burst size
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 15:28:18 +01:00
Marc Kleine-Budde 4b6f8d62dd cangen: move scope of variable ret
... so that it can be used in other parts of the main() functions, too.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 15:28:18 +01:00
Marc Kleine-Budde 8fb0e954b3 cangen: remove unneeded masking
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 15:28:18 +01:00
Marc Kleine-Budde 29b05de39d cangen: mark setsockopt() options as const
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 15:28:18 +01:00
Marc Kleine-Budde 1f96d674c0 cangen: use if_nametoindex() to avoid overflows
This patch replaces strcpy() + ioctl() by if_nametoindex() to avoid
overflows caused by long user input.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 15:28:18 +01:00
Marc Kleine-Budde 0f7c1aa23a cangen: use consistent indention scheme of 1 space
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 15:28:18 +01:00
Marc Kleine-Budde a130ab5e8d cangen: mark functions as static
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 15:28:18 +01:00
Marc Kleine-Budde 11a0f19244 cangen: properly initialize struct sockaddr_can addr
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 15:28:18 +01:00
Marc Kleine-Budde 8d493edbbe cangen: checkpatch: put braces on all arms of if statement
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 15:28:18 +01:00
Marc Kleine-Budde 59c87f149b cangen: checkpatch: don't assign in if statement
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 15:28:18 +01:00
Marc Kleine-Budde ad638db75d cangen: checkpatch: remove break after return
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2022-12-07 15:28:18 +01:00