Marc Kleine-Budde says: ==================== pull-request: can-next 2025-11-26 this is a pull request of 27 patches for net-next/main. The first 17 patches are by Vincent Mailhol and Oliver Hartkopp and add CAN XL support to the CAN netlink interface. Geert Uytterhoeven and Biju Das provide 7 patches for the rcar_canfd driver to add suspend/resume support. The next 2 patches are by Markus Schneider-Pargmann and add them as the m_can maintainer. Conor Dooley's patch updates the mpfs-can DT bindungs. linux-can-next-for-6.19-20251126 * tag 'linux-can-next-for-6.19-20251126' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next: (27 commits) dt-bindings: can: mpfs: document resets MAINTAINERS: Simplify m_can section MAINTAINERS: Add myself as m_can maintainer can: rcar_canfd: Add suspend/resume support can: rcar_canfd: Convert to DEFINE_SIMPLE_DEV_PM_OPS() can: rcar_canfd: Invert CAN clock and close_candev() order can: rcar_canfd: Extract rcar_canfd_global_{,de}init() can: rcar_canfd: Use devm_clk_get_optional() for RAM clk can: rcar_canfd: Invert global vs. channel teardown can: rcar_canfd: Invert reset assert order can: dev: print bitrate error with two decimal digits can: raw: instantly reject unsupported CAN frames can: add dummy_can driver can: calc_bittiming: add can_calc_sample_point_pwm() can: calc_bittiming: add can_calc_sample_point_nrz() can: calc_bittiming: replace misleading "nominal" by "reference" can: netlink: add PWM netlink interface can: calc_bittiming: add PWM calculation can: bittiming: add PWM validation can: bittiming: add PWM parameters ... ====================
Showing the changes to include/uapi (1 of 14 files). Show all
Unified · Split
| @@ -5,6 +5,7 @@ · 4 unmodified lines | ||
| 5 | 5 | * Definitions for the CAN netlink interface |
| 6 | 6 | * |
| 7 | 7 | * Copyright (c) 2009 Wolfgang Grandegger <wg@grandegger.com> |
| 8 | + * Copyright (c) 2021-2025 Vincent Mailhol <mailhol@kernel.org> | |
| 8 | 9 | * |
| 9 | 10 | * This program is free software; you can redistribute it and/or modify |
| 10 | 11 | * it under the terms of the version 2 of the GNU General Public License |
| @@ -103,6 +104,11 @@ struct can_ctrlmode { · 92 unmodified lines | ||
| 103 | 104 | #define CAN_CTRLMODE_CC_LEN8_DLC 0x100 /* Classic CAN DLC option */ |
| 104 | 105 | #define CAN_CTRLMODE_TDC_AUTO 0x200 /* FD transceiver automatically calculates TDCV */ |
| 105 | 106 | #define CAN_CTRLMODE_TDC_MANUAL 0x400 /* FD TDCV is manually set up by user */ |
| 107 | +#define CAN_CTRLMODE_RESTRICTED 0x800 /* Restricted operation mode */ | |
| 108 | +#define CAN_CTRLMODE_XL 0x1000 /* CAN XL mode */ | |
| 109 | +#define CAN_CTRLMODE_XL_TDC_AUTO 0x2000 /* XL transceiver automatically calculates TDCV */ | |
| 110 | +#define CAN_CTRLMODE_XL_TDC_MANUAL 0x4000 /* XL TDCV is manually set up by user */ | |
| 111 | +#define CAN_CTRLMODE_XL_TMS 0x8000 /* Transceiver Mode Switching */ | |
| 106 | 112 | |
| 107 | 113 | /* |
| 108 | 114 | * CAN device statistics |
| @@ -138,6 +144,11 @@ enum { · 29 unmodified lines | ||
| 138 | 144 | IFLA_CAN_BITRATE_MAX, |
| 139 | 145 | IFLA_CAN_TDC, /* FD */ |
| 140 | 146 | IFLA_CAN_CTRLMODE_EXT, |
| 147 | + IFLA_CAN_XL_DATA_BITTIMING, | |
| 148 | + IFLA_CAN_XL_DATA_BITTIMING_CONST, | |
| 149 | + IFLA_CAN_XL_DATA_BITRATE_CONST, | |
| 150 | + IFLA_CAN_XL_TDC, | |
| 151 | + IFLA_CAN_XL_PWM, | |
| 141 | 152 | |
| 142 | 153 | /* add new constants above here */ |
| 143 | 154 | __IFLA_CAN_MAX, |
| @@ -179,6 +190,29 @@ enum { · 35 unmodified lines | ||
| 179 | 190 | IFLA_CAN_CTRLMODE_MAX = __IFLA_CAN_CTRLMODE - 1 |
| 180 | 191 | }; |
| 181 | 192 | |
| 193 | +/* | |
| 194 | + * CAN FD/XL Pulse-Width Modulation (PWM) | |
| 195 | + * | |
| 196 | + * Please refer to struct can_pwm_const and can_pwm in | |
| 197 | + * include/linux/can/bittiming.h for further details. | |
| 198 | + */ | |
| 199 | +enum { | |
| 200 | + IFLA_CAN_PWM_UNSPEC, | |
| 201 | + IFLA_CAN_PWM_PWMS_MIN, /* u32 */ | |
| 202 | + IFLA_CAN_PWM_PWMS_MAX, /* u32 */ | |
| 203 | + IFLA_CAN_PWM_PWML_MIN, /* u32 */ | |
| 204 | + IFLA_CAN_PWM_PWML_MAX, /* u32 */ | |
| 205 | + IFLA_CAN_PWM_PWMO_MIN, /* u32 */ | |
| 206 | + IFLA_CAN_PWM_PWMO_MAX, /* u32 */ | |
| 207 | + IFLA_CAN_PWM_PWMS, /* u32 */ | |
| 208 | + IFLA_CAN_PWM_PWML, /* u32 */ | |
| 209 | + IFLA_CAN_PWM_PWMO, /* u32 */ | |
| 210 | + | |
| 211 | + /* add new constants above here */ | |
| 212 | + __IFLA_CAN_PWM, | |
| 213 | + IFLA_CAN_PWM_MAX = __IFLA_CAN_PWM - 1 | |
| 214 | +}; | |
| 215 | + | |
| 182 | 216 | /* u16 termination range: 1..65535 Ohms */ |
| 183 | 217 | #define CAN_TERMINATION_DISABLED 0 |
| 184 | 218 | |