Re: iproute2 fd-non-iso PoC - was Re: [PATCH v4] can/peak_usb: add support for PEAK new CANFD USB adapters

[Marc Kleine-Budde <mkl@pengutronix.de>]

[-- Attachment #1: Type: text/plain, Size: 3031 bytes --]

On 01/07/2015 07:37 PM, Oliver Hartkopp wrote:
> Just a short test:
> 
> I added u32 ctrlmode in Stephanes peak_usb_adapter struct for a test:
> 
> @@ -44,8 +46,11 @@ struct peak_usb_device;
>  struct peak_usb_adapter {
>         char *name;
>         u32 device_id;
> +       u32 ctrlmode_supported;
> +       u32 ctrlmode;
>         struct can_clock clock;
> 
> Which looks like this in pcan_usb_pro.c
> 
> @@ -1015,6 +1007,8 @@ struct peak_usb_adapter pcan_usb_pro = {
>         .name = "PCAN-USB Pro",
>         .device_id = PCAN_USBPRO_PRODUCT_ID,
>         .ctrl_count = PCAN_USBPRO_CHANNEL_COUNT,
> +       .ctrlmode = 0,

Not needed, as 0 is default.

> +       .ctrlmode_supported = CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,
>         .clock = {
> 
> and in pcan_usb_fd.c :
> 
> /* describes the PCAN-USB Pro FD adapter */
> struct peak_usb_adapter pcan_usb_pro_fd = {
>         .name = "PCAN-USB Pro FD",
>         .device_id = PCAN_USBPROFD_PRODUCT_ID,
>         .ctrl_count = PCAN_USBPROFD_CHANNEL_COUNT,
>         .ctrlmode = CAN_CTRLMODE_FD_NON_ISO,
>         .ctrlmode_supported = CAN_CTRLMODE_FD |
>                         CAN_CTRLMODE_3_SAMPLES | CAN_CTRLMODE_LISTENONLY,
>         .clock = {
> 
> Finally the ip tools gives this output (when FD is enabled):
> 
> # ip -det link show can0
> 17: can0: <NOARP,ECHO> mtu 72 qdisc noop state DOWN mode DEFAULT group default qlen 10
>     link/can  promiscuity 0 
>     can <FD,FD-NON-ISO> state STOPPED restart-ms 0 
> 	  pcan_usb_fd: tseg1 1..64 tseg2 1..16 sjw 1..16 brp 1..1024 brp-inc 1
> 	  pcan_usb_fd: dtseg1 1..16 dtseg2 1..8 dsjw 1..4 dbrp 1..1024 dbrp-inc 1
> 	  clock 80000000
> 
> AND - as expected - removing this flag is denied:
> 
> # ip link set dev can0 type can fd-non-iso off
> RTNETLINK answers: Operation not supported
> 
> Regards,
> Oliver
> 
> ps. Current patch for iproute2 is attached. Will send a proper patch when
> CAN_CTRLMODE_FD_NON_ISO found its way into mainline.
> 
> 
> 
> iproute2-fd-non-iso.patch
> 
> 
> diff --git a/include/linux/can/netlink.h b/include/linux/can/netlink.h
> index 25fd52c..6d4ec2a 100644
> --- a/include/linux/can/netlink.h
> +++ b/include/linux/can/netlink.h
> @@ -98,6 +98,7 @@ struct can_ctrlmode {
>  #define CAN_CTRLMODE_BERR_REPORTING	0x10	/* Bus-error reporting */
>  #define CAN_CTRLMODE_FD			0x20	/* CAN FD mode */
>  #define CAN_CTRLMODE_PRESUME_ACK	0x40	/* Ignore missing CAN ACKs */
> +#define CAN_CTRLMODE_FD_NON_ISO		0x80	/* CAN FD in non-ISO mode */

AFAIC the headers are imported from the Linux tree, so no need to modify
this file in the final patch. You might have to ask for the import when
sending these patches, though.

Marc
-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]