CAN_CTRLMODE_PRESUME_ACK follow-up patches

CAN_CTRLMODE_PRESUME_ACK follow-up patches

[Nikita Edward Baruzdin]

Some minor patches for iplink and libsocketcan.

[iproute2 1/2] Update CAN netlink header

[Nikita Edward Baruzdin]

Signed-off-by: Nikita Edward Baruzdin <nebaruzdin@gmail.com>
---
 include/linux/can/netlink.h | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/linux/can/netlink.h b/include/linux/can/netlink.h
index df944ed..3e4323a 100644
--- a/include/linux/can/netlink.h
+++ b/include/linux/can/netlink.h
@@ -15,8 +15,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef CAN_NETLINK_H
-#define CAN_NETLINK_H
+#ifndef _UAPI_CAN_NETLINK_H
+#define _UAPI_CAN_NETLINK_H
 
 #include <linux/types.h>
 
@@ -92,10 +92,12 @@ struct can_ctrlmode {
 };
 
 #define CAN_CTRLMODE_LOOPBACK		0x01	/* Loopback mode */
-#define CAN_CTRLMODE_LISTENONLY		0x02 	/* Listen-only mode */
+#define CAN_CTRLMODE_LISTENONLY		0x02	/* Listen-only mode */
 #define CAN_CTRLMODE_3_SAMPLES		0x04	/* Triple sampling mode */
 #define CAN_CTRLMODE_ONE_SHOT		0x08	/* One-Shot mode */
 #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 */
 
 /*
  * CAN device statistics
@@ -122,9 +124,11 @@ enum {
 	IFLA_CAN_RESTART_MS,
 	IFLA_CAN_RESTART,
 	IFLA_CAN_BERR_COUNTER,
+	IFLA_CAN_DATA_BITTIMING,
+	IFLA_CAN_DATA_BITTIMING_CONST,
 	__IFLA_CAN_MAX
 };
 
 #define IFLA_CAN_MAX	(__IFLA_CAN_MAX - 1)
 
-#endif /* CAN_NETLINK_H */
+#endif /* !_UAPI_CAN_NETLINK_H */
-- 
2.0.2

Re: [iproute2 1/2] Update CAN netlink header

[Oliver Hartkopp]

Hello Nikita,

On 21.07.2014 11:43, Nikita Edward Baruzdin wrote:
> Signed-off-by: Nikita Edward Baruzdin <nebaruzdin@gmail.com>
> ---
>  include/linux/can/netlink.h | 12 ++++++++----


>   * CAN device statistics
> @@ -122,9 +124,11 @@ enum {
>  	IFLA_CAN_RESTART_MS,
>  	IFLA_CAN_RESTART,
>  	IFLA_CAN_BERR_COUNTER,
> +	IFLA_CAN_DATA_BITTIMING,
> +	IFLA_CAN_DATA_BITTIMING_CONST,
>  	__IFLA_CAN_MAX
>  };

This change has already been applied to the iproute2 git repository from
Stephen Hemminger:

http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/

See:

http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/diff/include/linux/can/netlink.h?id=e4d5edba68970124c5ce245a11a5c5cd4dde9ae1

The best is, to wait until Stephen has pulled the Linux headers into his tree.
This will usually happen when the merge window for the Kernel 3.17(!) is
closed - e.g. in 4-6 weeks from now.

After the kernel header update in the iproute2 git repository it makes sense
to post your patch 2/2 as

	iproute2: add support for CAN presume-ack feature

and send this simultaneously on linux-can and linux-netdev ML.

So let's wait for Stephen updating his iproute2 tree ...

Thanks,
Oliver

Re: [iproute2 1/2] Update CAN netlink header

[Nikita Edward Baruzdin]

On Mon, 2014-07-21 at 19:51 +0200, Oliver Hartkopp wrote:
> Hello Nikita,
> 
> On 21.07.2014 11:43, Nikita Edward Baruzdin wrote:
> > Signed-off-by: Nikita Edward Baruzdin <nebaruzdin@gmail.com>
> > ---
> >  include/linux/can/netlink.h | 12 ++++++++----
> 
> 
> >   * CAN device statistics
> > @@ -122,9 +124,11 @@ enum {
> >  	IFLA_CAN_RESTART_MS,
> >  	IFLA_CAN_RESTART,
> >  	IFLA_CAN_BERR_COUNTER,
> > +	IFLA_CAN_DATA_BITTIMING,
> > +	IFLA_CAN_DATA_BITTIMING_CONST,
> >  	__IFLA_CAN_MAX
> >  };
> 
> This change has already been applied to the iproute2 git repository from
> Stephen Hemminger:
> 
> http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/
> 
> See:
> 
> http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/diff/include/linux/can/netlink.h?id=e4d5edba68970124c5ce245a11a5c5cd4dde9ae1
> 
> The best is, to wait until Stephen has pulled the Linux headers into his tree.
> This will usually happen when the merge window for the Kernel 3.17(!) is
> closed - e.g. in 4-6 weeks from now.
> 
> After the kernel header update in the iproute2 git repository it makes sense
> to post your patch 2/2 as
> 
> 	iproute2: add support for CAN presume-ack feature
> 
> and send this simultaneously on linux-can and linux-netdev ML.
> 
> So let's wait for Stephen updating his iproute2 tree ...
> 
> Thanks,
> Oliver
> 

Got it, I was looking at linux-can/iproute2 tree.

And what about libsocketcan patches?

Re: [iproute2 1/2] Update CAN netlink header

[Marc Kleine-Budde]

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

On 07/22/2014 04:09 PM, Nikita Edward Baruzdin wrote:
> On Mon, 2014-07-21 at 19:51 +0200, Oliver Hartkopp wrote:
>> Hello Nikita,
>>
>> On 21.07.2014 11:43, Nikita Edward Baruzdin wrote:
>>> Signed-off-by: Nikita Edward Baruzdin <nebaruzdin@gmail.com>
>>> ---
>>>  include/linux/can/netlink.h | 12 ++++++++----
>>
>>
>>>   * CAN device statistics
>>> @@ -122,9 +124,11 @@ enum {
>>>  	IFLA_CAN_RESTART_MS,
>>>  	IFLA_CAN_RESTART,
>>>  	IFLA_CAN_BERR_COUNTER,
>>> +	IFLA_CAN_DATA_BITTIMING,
>>> +	IFLA_CAN_DATA_BITTIMING_CONST,
>>>  	__IFLA_CAN_MAX
>>>  };
>>
>> This change has already been applied to the iproute2 git repository from
>> Stephen Hemminger:
>>
>> http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/
>>
>> See:
>>
>> http://git.kernel.org/cgit/linux/kernel/git/shemminger/iproute2.git/diff/include/linux/can/netlink.h?id=e4d5edba68970124c5ce245a11a5c5cd4dde9ae1
>>
>> The best is, to wait until Stephen has pulled the Linux headers into his tree.
>> This will usually happen when the merge window for the Kernel 3.17(!) is
>> closed - e.g. in 4-6 weeks from now.
>>
>> After the kernel header update in the iproute2 git repository it makes sense
>> to post your patch 2/2 as
>>
>> 	iproute2: add support for CAN presume-ack feature
>>
>> and send this simultaneously on linux-can and linux-netdev ML.
>>
>> So let's wait for Stephen updating his iproute2 tree ...
>>
>> Thanks,
>> Oliver
>>
> 
> Got it, I was looking at linux-can/iproute2 tree.
> 
> And what about libsocketcan patches?

I've just applied them to libsocketcan master.

Thnx,
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: 242 bytes --]

[iproute2 2/2] iplink: Support for CAN presume-ack feature

[Nikita Edward Baruzdin]

This patch makes the newly introduced CAN_CTRLMODE_PRESUME_ACK netlink
feature configurable. When enabled, the feature sets CAN controller in
mode in which acknowledgement absence is ignored.

Signed-off-by: Nikita Edward Baruzdin <nebaruzdin@gmail.com>
---
 ip/iplink_can.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ip/iplink_can.c b/ip/iplink_can.c
index 5674358..01d8131 100644
--- a/ip/iplink_can.c
+++ b/ip/iplink_can.c
@@ -32,6 +32,7 @@ static void usage(void)
 	        "\t[ triple-sampling { on | off } ]\n"
 	        "\t[ one-shot { on | off } ]\n"
 	        "\t[ berr-reporting { on | off } ]\n"
+	        "\t[ presume-ack { on | off } ]\n"
 		"\n"
 	        "\t[ restart-ms TIME-MS ]\n"
 	        "\t[ restart ]\n"
@@ -88,6 +89,7 @@ static void print_ctrlmode(FILE *f, __u32 cm)
 	_PF(CAN_CTRLMODE_3_SAMPLES, "TRIPLE-SAMPLING");
 	_PF(CAN_CTRLMODE_ONE_SHOT, "ONE-SHOT");
 	_PF(CAN_CTRLMODE_BERR_REPORTING, "BERR-REPORTING");
+	_PF(CAN_CTRLMODE_PRESUME_ACK, "PRESUME-ACK");
 #undef _PF
 	if (cm)
 		fprintf(f, "%x", cm);
@@ -154,6 +156,10 @@ static int can_parse_opt(struct link_util *lu, int argc, char **argv,
 			NEXT_ARG();
 			set_ctrlmode("berr-reporting", *argv, &cm,
 				     CAN_CTRLMODE_BERR_REPORTING);
+		} else if (matches(*argv, "presume-ack") == 0) {
+			NEXT_ARG();
+			set_ctrlmode("presume-ack", *argv, &cm,
+				     CAN_CTRLMODE_PRESUME_ACK);
 		} else if (matches(*argv, "restart") == 0) {
 			__u32 val = 1;
 
-- 
2.0.2

[libsocketcan 1/2] Update CAN netlink header

[Nikita Edward Baruzdin]

Signed-off-by: Nikita Edward Baruzdin <nebaruzdin@gmail.com>
---
 include/can_netlink.h | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/include/can_netlink.h b/include/can_netlink.h
index 31cfa6a..3e4323a 100644
--- a/include/can_netlink.h
+++ b/include/can_netlink.h
@@ -5,19 +5,25 @@
  *
  * Copyright (c) 2009 Wolfgang Grandegger <wg@grandegger.com>
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the version 2 of the GNU General Public License
+ * as published by the Free Software Foundation
  *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  */
 
-#ifndef CAN_NETLINK_H
-#define CAN_NETLINK_H
+#ifndef _UAPI_CAN_NETLINK_H
+#define _UAPI_CAN_NETLINK_H
 
 #include <linux/types.h>
 
 /*
  * CAN bit-timing parameters
  *
- * For futher information, please read chapter "8 BIT TIMING
+ * For further information, please read chapter "8 BIT TIMING
  * REQUIREMENTS" of the "Bosch CAN Specification version 2.0"
  * at http://www.semiconductors.bosch.de/pdf/can2spec.pdf.
  */
@@ -85,11 +91,13 @@ struct can_ctrlmode {
 	__u32 flags;
 };
 
-#define CAN_CTRLMODE_LOOPBACK	0x01	/* Loopback mode */
-#define CAN_CTRLMODE_LISTENONLY	0x02 	/* Listen-only mode */
-#define CAN_CTRLMODE_3_SAMPLES	0x04	/* Triple sampling mode */
-#define CAN_CTRLMODE_ONE_SHOT 0x08 /* One-Shot mode */
-#define CAN_CTRLMODE_BERR_REPORTING 0x10 /* Bus-error reporting */
+#define CAN_CTRLMODE_LOOPBACK		0x01	/* Loopback mode */
+#define CAN_CTRLMODE_LISTENONLY		0x02	/* Listen-only mode */
+#define CAN_CTRLMODE_3_SAMPLES		0x04	/* Triple sampling mode */
+#define CAN_CTRLMODE_ONE_SHOT		0x08	/* One-Shot mode */
+#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 */
 
 /*
  * CAN device statistics
@@ -116,9 +124,11 @@ enum {
 	IFLA_CAN_RESTART_MS,
 	IFLA_CAN_RESTART,
 	IFLA_CAN_BERR_COUNTER,
+	IFLA_CAN_DATA_BITTIMING,
+	IFLA_CAN_DATA_BITTIMING_CONST,
 	__IFLA_CAN_MAX
 };
 
 #define IFLA_CAN_MAX	(__IFLA_CAN_MAX - 1)
 
-#endif /* CAN_NETLINK_H */
+#endif /* !_UAPI_CAN_NETLINK_H */
-- 
2.0.2

[libsocketcan 2/2] Update can_set_ctrlmode() documentation

[Nikita Edward Baruzdin]

Signed-off-by: Nikita Edward Baruzdin <nebaruzdin@gmail.com>
---
 src/libsocketcan.c | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/libsocketcan.c b/src/libsocketcan.c
index fe3a0b3..21884b6 100644
--- a/src/libsocketcan.c
+++ b/src/libsocketcan.c
@@ -774,13 +774,20 @@ int can_set_restart_ms(const char *name, __u32 restart_ms)
  *
  * @param cm pointer of a can_ctrlmode struct
  *
- * This sets the control mode of the can device. There're currently three
- * different control modes:
- * - LOOPBACK
- * - LISTEN_ONLY
- * - TRIPPLE_SAMPLING
+ * This sets the control mode of the can device. There are currently the
+ * following modes available (each mapped to its own macro):
  *
- * You have to define the control mode struct yourself. a can_ctrlmode struct
+ * @code
+ * #define CAN_CTRLMODE_LOOPBACK           0x01    /* Loopback mode */
+ * #define CAN_CTRLMODE_LISTENONLY         0x02    /* Listen-only mode */
+ * #define CAN_CTRLMODE_3_SAMPLES          0x04    /* Triple sampling mode */
+ * #define CAN_CTRLMODE_ONE_SHOT           0x08    /* One-Shot mode */
+ * #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 */
+ * @endcode
+ *
+ * You have to define the control mode struct yourself. A can_ctrlmode struct
  * is declared as:
  *
  * @code
@@ -791,16 +798,8 @@ int can_set_restart_ms(const char *name, __u32 restart_ms)
  * @endcode
  *
  * You can use mask to select modes you want to control and flags to determine
- * if you want to turn the selected mode(s) on or off. Every control mode is
- * mapped to an own macro
- *
- * @code
- * #define CAN_CTRLMODE_LOOPBACK   0x1
- * #define CAN_CTRLMODE_LISTENONLY 0x2
- * #define CAN_CTRLMODE_3_SAMPLES  0x4
- * @endcode
- *
- * e.g. the following pseudocode
+ * if you want to turn the selected mode(s) on or off. E. g. the following
+ * pseudocode will turn the loopback mode on and listenonly mode off:
  *
  * @code
  * struct can_ctrlmode cm;
@@ -810,8 +809,6 @@ int can_set_restart_ms(const char *name, __u32 restart_ms)
  * can_set_ctrlmode(candev, &cm);
  * @endcode
  *
- * will turn the loopback mode on and listenonly mode off.
- *
  * @return 0 if success
  * @return -1 if failed
  */
-- 
2.0.2

Re: [libsocketcan 2/2] Update can_set_ctrlmode() documentation

[Marc Kleine-Budde]

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

On 07/21/2014 11:43 AM, Nikita Edward Baruzdin wrote:
> Signed-off-by: Nikita Edward Baruzdin <nebaruzdin@gmail.com>
> ---
>  src/libsocketcan.c | 33 +++++++++++++++------------------
>  1 file changed, 15 insertions(+), 18 deletions(-)
> 
> diff --git a/src/libsocketcan.c b/src/libsocketcan.c
> index fe3a0b3..21884b6 100644
> --- a/src/libsocketcan.c
> +++ b/src/libsocketcan.c
> @@ -774,13 +774,20 @@ int can_set_restart_ms(const char *name, __u32 restart_ms)
>   *
>   * @param cm pointer of a can_ctrlmode struct
>   *
> - * This sets the control mode of the can device. There're currently three
> - * different control modes:
> - * - LOOPBACK
> - * - LISTEN_ONLY
> - * - TRIPPLE_SAMPLING
> + * This sets the control mode of the can device. There are currently the
> + * following modes available (each mapped to its own macro):
>   *
> - * You have to define the control mode struct yourself. a can_ctrlmode struct
> + * @code
> + * #define CAN_CTRLMODE_LOOPBACK           0x01    /* Loopback mode */

Have you actually compile-tested this change?

> libsocketcan.c:781:52: warning: "/*" within comment [-Wcomment]
>   * #define CAN_CTRLMODE_LOOPBACK           0x01    /* Loopback mode */

...and it finally fails to build from source. I've fixed this while
applying the patch.

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: 242 bytes --]

Re: [libsocketcan 2/2] Update can_set_ctrlmode() documentation

[Nikita Edward Baruzdin]

On Tue, 2014-07-22 at 16:26 +0200, Marc Kleine-Budde wrote:
> Have you actually compile-tested this change?
> 
> > libsocketcan.c:781:52: warning: "/*" within comment [-Wcomment]
> >   * #define CAN_CTRLMODE_LOOPBACK           0x01    /* Loopback mode */
> 
> ...and it finally fails to build from source. I've fixed this while
> applying the patch.

By compiling just the docs... Sorry, my fault.