iplink_can: add Classical CAN frame LEN8_DLC support
Subsystems (3)
PATCH RESEND 1/1 iplink_can: add Classical CAN frame LEN8_DLC support
The len8_dlc element is filled by the CAN interface driver and used for CAN frame creation by the CAN driver when the CAN_CTRLMODE_CC_LEN8_DLC flag is supported by the driver and enabled via netlink configuration interface.
Add the command line support for cc-len8-dlc for Linux 5.11+
--- ip/iplink_can.c | 6 ++++++ 1 file changed, 6 insertions(+)
ip/iplink_can.c +6 -0
@@ -35,10 +35,11 @@ static void print_usage(FILE *f)"\t[ one-shot { on | off } ]\n" "\t[ berr-reporting { on | off } ]\n" "\t[ fd { on | off } ]\n" "\t[ fd-non-iso { on | off } ]\n" "\t[ presume-ack { on | off } ]\n" +"\t[ cc-len8-dlc { on | off } ]\n" "\n" "\t[ restart-ms TIME-MS ]\n" "\t[ restart ]\n" "\n" "\t[ termination { 0..65535 } ]\n"
@@ -101,10 +102,11 @@ static void print_ctrlmode(FILE *f, __u32 cm)_PF (CAN_CTRLMODE_ONE_SHOT ,"ONE-SHOT" );_PF (CAN_CTRLMODE_BERR_REPORTING ,"BERR-REPORTING" );_PF (CAN_CTRLMODE_FD ,"FD" );_PF (CAN_CTRLMODE_FD_NON_ISO ,"FD-NON-ISO" );_PF (CAN_CTRLMODE_PRESUME_ACK ,"PRESUME-ACK" ); +_PF (CAN_CTRLMODE_CC_LEN8_DLC ,"CC-LEN8-DLC" );#undef _PFif (cm)print_hex (PRINT_ANY ,NULL ,"%x" , cm);close_json_array (PRINT_ANY ,"> " ); }
@@ -209,10 +211,14 @@ static int can_parse_opt(struct link_util *lu, int argc, char **argv, CAN_CTRLMODE_FD_NON_ISO); }else if (matches (*argv,"presume-ack" ) ==0 ) {NEXT_ARG ();set_ctrlmode ("presume-ack" , *argv, &cm,CAN_CTRLMODE_PRESUME_ACK ); + }else if (matches (*argv,"cc-len8-dlc" ) ==0 ) { +NEXT_ARG (); +set_ctrlmode ("cc-len8-dlc" , *argv, &cm, +CAN_CTRLMODE_CC_LEN8_DLC ); }else if (matches (*argv,"restart" ) ==0 ) {__u32 val =1 ;addattr32 (n,1024 ,IFLA_CAN_RESTART , val); }else if (matches (*argv,"restart-ms" ) ==0 ) {
Signature · 1 line
2.29.2
Quoted 55 lines · Oliver Hartkopp
The
len8_dlcelement is filled by the CAN interface driver and used for CAN frame creation by the CAN driver when theCAN_CTRLMODE_CC_LEN8_DLCflag is supported by the driver and enabled via netlink configuration interface.Add the command line support for cc-len8-dlc for Linux 5.11+
Signed-off-by Oliver Hartkopp <[email protected]>--- ip/iplink_can.c | 6 ++++++ 1 file changed, 6 insertions(+)ip/iplink_can.c +6
-1@@ -35,10 +35,11 @@ static void print_usage(FILE *f)"\t[ one-shot { on | off } ]\n" "\t[ berr-reporting { on | off } ]\n" "\t[ fd { on | off } ]\n" "\t[ fd-non-iso { on | off } ]\n" "\t[ presume-ack { on | off } ]\n" +"\t[ cc-len8-dlc { on | off } ]\n" "\n" "\t[ restart-ms TIME-MS ]\n" "\t[ restart ]\n" "\n" "\t[ termination { 0..65535 } ]\n" @@ -101,10 +102,11 @@ static void print_ctrlmode(FILE *f, __u32 cm)_PF (CAN_CTRLMODE_ONE_SHOT ,"ONE-SHOT" );_PF (CAN_CTRLMODE_BERR_REPORTING ,"BERR-REPORTING" );_PF (CAN_CTRLMODE_FD ,"FD" );_PF (CAN_CTRLMODE_FD_NON_ISO ,"FD-NON-ISO" );_PF (CAN_CTRLMODE_PRESUME_ACK ,"PRESUME-ACK" ); +_PF (CAN_CTRLMODE_CC_LEN8_DLC ,"CC-LEN8-DLC" );#undef _PFif (cm)print_hex (PRINT_ANY ,NULL ,"%x" , cm);close_json_array (PRINT_ANY ,"> " ); }@@ -209,10 +211,14 @@ static int can_parse_opt(struct link_util *lu, int argc, char **argv, CAN_CTRLMODE_FD_NON_ISO); }else if (matches (*argv,"presume-ack" ) ==0 ) {NEXT_ARG ();set_ctrlmode ("presume-ack" , *argv, &cm,CAN_CTRLMODE_PRESUME_ACK ); + }else if (matches (*argv,"cc-len8-dlc" ) ==0 ) { +NEXT_ARG (); +set_ctrlmode ("cc-len8-dlc" , *argv, &cm, +CAN_CTRLMODE_CC_LEN8_DLC ); }else if (matches (*argv,"restart" ) ==0 ) {__u32 val =1 ;addattr32 (n,1024 ,IFLA_CAN_RESTART , val); }else if (matches (*argv,"restart-ms" ) ==0 ) { --
Quoted 1 line
2.29.2
Reviewed and tested the patch, everything is OK for me. Thanks Oliver!
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hello David,
Quoted 7 lines · David Ahern
Quoted 6 lines · Oliver Hartkopp
The
len8_dlcelement is filled by the CAN interface driver and used for CAN frame creation by the CAN driver when theCAN_CTRLMODE_CC_LEN8_DLCflag is supported by the driver and enabled via netlink configuration interface.Add the command line support for cc-len8-dlc for Linux 5.11+
Quoted 9 lines
Quoted 5 lines
Signed-off-by Oliver Hartkopp <[email protected]>--- ip/iplink_can.c | 6 ++++++ 1 file changed, 6 insertions(+)applied to iproute2-next
Are you sure this patch is correctly assigned to iproute2-next?
IMO it has to be applied to iproute2 as the functionality is already in v5.11 which is in rc6 right now.
Regards,
Oliver
Quoted 6 lines · Oliver Hartkopp
Are you sure this patch is correctly assigned to iproute2-next?
IMO it has to be applied to iproute2 as the functionality is already in v5.11 which is in rc6 right now.
new features land in iproute2-next just as they do for the kernel with net-next.
Patches adding support for kernel features should be sent in the same development window if you want the iproute2 support to match kernel version.
Quoted 8 lines · David Ahern
Quoted 6 lines · Oliver Hartkopp
Are you sure this patch is correctly assigned to iproute2-next?
IMO it has to be applied to iproute2 as the functionality is already in v5.11 which is in rc6 right now.
Quoted 6 lines
new features land in iproute2-next just as they do for the kernel with net-next.
Patches adding support for kernel features should be sent in the same development window if you want the iproute2 support to match kernel version.
Oh, I followed the commits from iproute2 until the new include files from (in this case) 5.11 pre rc1 had been updated (on 2020-12-24):
I thought the uapi updates in iproute2 are *always* pulled from the kernel and not from iprout2-next which was new to me.
Do you expect patches for iproute2-next when the relevant changes become available in linux-next then?
Even though I did not know about iproute2-next the patch is needed for the 5.11 kernel (as written in the subject).
Regards,
Oliver
Quoted 19 lines · Oliver Hartkopp
Quoted 8 lines · David Ahern
Quoted 6 lines · Oliver Hartkopp
Are you sure this patch is correctly assigned to iproute2-next?
IMO it has to be applied to iproute2 as the functionality is already in v5.11 which is in rc6 right now.
Quoted 7 lines
new features land in iproute2-next just as they do for the kernel with net-next.
Patches adding support for kernel features should be sent in the same development window if you want the iproute2 support to match kernel version.
Quoted 8 lines
Oh, I followed the commits from iproute2 until the new include files from (in this case) 5.11 pre rc1 had been updated (on 2020-12-24):
I thought the uapi updates in iproute2 are *always* pulled from the kernel and not from iprout2-next which was new to me.
I sync kernel headers for iproute2-next with net-next, not linux-next.
Quoted 7 lines
Do you expect patches for iproute2-next when the relevant changes become available in linux-next then?
Even though I did not know about iproute2-next the patch is needed for the 5.11 kernel (as written in the subject).
From a cursory look it appears CAN commits do not go through the netdev tree yet the code is under net/can and the admin tool is through iproute2 and netdevs. Why is that? If features patches flowed through net-next, we would not have this problem.
Quoted 23 lines · David Ahern
Quoted 22 lines · Oliver Hartkopp
Quoted 8 lines · David Ahern
Quoted 6 lines · Oliver Hartkopp
Are you sure this patch is correctly assigned to iproute2-next?
IMO it has to be applied to iproute2 as the functionality is already in v5.11 which is in rc6 right now.
Quoted 7 lines
new features land in iproute2-next just as they do for the kernel with net-next.
Patches adding support for kernel features should be sent in the same development window if you want the iproute2 support to match kernel version.
Oh, I followed the commits from iproute2 until the new include files from (in this case) 5.11 pre rc1 had been updated (on 2020-12-24):
Quoted 7 lines
Quoted 5 lines
I thought the uapi updates in iproute2 are *always* pulled from the kernel and not from iprout2-next which was new to me.
I sync kernel headers for iproute2-next with net-next, not linux-next.
Ok. Got it.
Quoted 9 lines
Quoted 7 lines
Do you expect patches for iproute2-next when the relevant changes become available in linux-next then?
Even though I did not know about iproute2-next the patch is needed for the 5.11 kernel (as written in the subject).
Quoted 4 lines
From a cursory look it appears CAN commits do not go through the netdev
tree yet the code is under net/can and the admin tool is through iproute2 and netdevs. Why is that? If features patches flowed through net-next, we would not have this problem.
CAN commits go through linux-can-next -> net-next. Same for linux-can -> net.
The len8_dlc patches also went through linux-can-next -> net-next -> net -> linux
iproute2 provides the configuration interface for CAN drivers under driver/net/can only.
My only fault was, that I did not send the patch for iproute2-next at the time when the len8_dlc patches were in net-next, right?
I was just not aware of iproute2-next.
The former patches I posted for iproute2 were always applied by Stephen to the iproute2 tree directly.
Regards,
Oliver
Quoted 2 lines · Oliver Hartkopp
My only fault was, that I did not send the patch for iproute2-next at the time when the
len8_dlcpatches were in net-next, right?
yes
Quoted 6 lines · David Ahern
Quoted 2 lines · Oliver Hartkopp
My only fault was, that I did not send the patch for iproute2-next at the time when the
len8_dlcpatches were in net-next, right?yes
Now that I know about iproute2-next, I will do better next time.
Can you please apply this simple patch intended for Linux 5.11 to the iproute2 tree this time?
Thanks,
Oliver