]> rtime.felk.cvut.cz Git - can-utils.git/blobdiff - can-calc-bit-timing.c
can-calc-bit-timing: fix checkpatch warnings
[can-utils.git] / can-calc-bit-timing.c
index 9031a78f36180735195ad521a24f0f30c5a435f7..46e2c16cbd515bf3f51deee9351aa364d302d2e8 100644 (file)
 
 #include <errno.h>
 #include <getopt.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <linux/types.h>
+#include <linux/can/netlink.h>
 
-/* seems not to be defined in errno.h */
-#ifndef ENOTSUPP
-#define ENOTSUPP       524     /* Operation is not supported */
-#endif
+/* imported from kernel */
 
-/* useful defines */
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-
-#define do_div(a,b) a = (a) / (b)
+/**
+ * abs - return absolute value of an argument
+ * @x: the value.  If it is unsigned type, it is converted to signed type first.
+ *     char is treated as if it was signed (regardless of whether it really is)
+ *     but the macro's return type is preserved as char.
+ *
+ * Return: an absolute value of x.
+ */
+#define abs(x) __abs_choose_expr(x, long long,                         \
+               __abs_choose_expr(x, long,                              \
+               __abs_choose_expr(x, int,                               \
+               __abs_choose_expr(x, short,                             \
+               __abs_choose_expr(x, char,                              \
+               __builtin_choose_expr(                                  \
+                       __builtin_types_compatible_p(typeof(x), char),  \
+                       (char)({ signed char __x = (x); __x<0?-__x:__x; }), \
+                       ((void)0)))))))
+
+#define __abs_choose_expr(x, type, other) __builtin_choose_expr(       \
+       __builtin_types_compatible_p(typeof(x),   signed type) ||       \
+       __builtin_types_compatible_p(typeof(x), unsigned type),         \
+       ({ signed type __x = (x); __x < 0 ? -__x : __x; }), other)
 
-#define abs(x) ({                              \
-               long __x = (x);                 \
-               (__x < 0) ? -__x : __x;         \
-       })
+/*
+ * min()/max()/clamp() macros that also do
+ * strict type-checking.. See the
+ * "unnecessary" pointer comparison.
+ */
+#define min(x, y) ({                           \
+       typeof(x) _min1 = (x);                  \
+       typeof(y) _min2 = (y);                  \
+       (void) (&_min1 == &_min2);              \
+       _min1 < _min2 ? _min1 : _min2; })
+
+#define max(x, y) ({                           \
+       typeof(x) _max1 = (x);                  \
+       typeof(y) _max2 = (y);                  \
+       (void) (&_max1 == &_max2);              \
+       _max1 > _max2 ? _max1 : _max2; })
 
 /**
  * clamp - return a value clamped to a given range with strict typechecking
  * @val: current value
- * @min: minimum allowable value
- * @max: maximum allowable value
+ * @lo: lowest allowable value
+ * @hi: highest allowable value
  *
- * This macro does strict typechecking of min/max to make sure they are of the
+ * This macro does strict typechecking of lo/hi to make sure they are of the
  * same type as val.  See the unnecessary pointer comparisons.
  */
-#define clamp(val, min, max) ({                        \
-       typeof(val) __val = (val);              \
-       typeof(min) __min = (min);              \
-       typeof(max) __max = (max);              \
-       (void) (&__val == &__min);              \
-       (void) (&__val == &__max);              \
-       __val = __val < __min ? __min: __val;   \
-       __val > __max ? __max: __val; })
+#define clamp(val, lo, hi) min((typeof(val))max(val, lo), hi)
+
+# define do_div(n,base) ({                                     \
+       uint32_t __base = (base);                               \
+       uint32_t __rem;                                         \
+       __rem = ((uint64_t)(n)) % __base;                       \
+       (n) = ((uint64_t)(n)) / __base;                         \
+       __rem;                                                  \
+ })
+
+/* */
+
+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
 
 /* we don't want to see these prints */
-#define dev_err(dev, format, arg...)   do { } while (0)
-#define dev_warn(dev, format, arg...)  do { } while (0)
+#define netdev_err(dev, format, arg...) do { } while (0)
+#define netdev_warn(dev, format, arg...) do { } while (0)
 
 /* define in-kernel-types */
 typedef __u64 u64;
 typedef __u32 u32;
 
+struct calc_bittiming_const {
+       struct can_bittiming_const bittiming_const;
 
-/*
- * CAN bit-timing parameters
- *
- * For futher 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.
- */
-struct can_bittiming {
-       __u32 bitrate;          /* Bit-rate in bits/second */
-       __u32 sample_point;     /* Sample point in one-tenth of a percent */
-       __u32 tq;               /* Time quanta (TQ) in nanoseconds */
-       __u32 prop_seg;         /* Propagation segment in TQs */
-       __u32 phase_seg1;       /* Phase buffer segment 1 in TQs */
-       __u32 phase_seg2;       /* Phase buffer segment 2 in TQs */
-       __u32 sjw;              /* Synchronisation jump width in TQs */
-       __u32 brp;              /* Bit-rate prescaler */
-};
-
-/*
- * CAN harware-dependent bit-timing constant
- *
- * Used for calculating and checking bit-timing parameters
- */
-struct can_bittiming_const {
-       char name[16];          /* Name of the CAN controller hardware */
-       __u32 tseg1_min;        /* Time segement 1 = prop_seg + phase_seg1 */
-       __u32 tseg1_max;
-       __u32 tseg2_min;        /* Time segement 2 = phase_seg2 */
-       __u32 tseg2_max;
-       __u32 sjw_max;          /* Synchronisation jump width */
-       __u32 brp_min;          /* Bit-rate prescaler */
-       __u32 brp_max;
-       __u32 brp_inc;
-
-       /* added for can-calc-bit-timing utility */
        __u32 ref_clk;          /* CAN system clock frequency in Hz */
-       void (*printf_btr)(struct can_bittiming *bt, int hdr);
+       void (*printf_btr)(struct can_bittiming *bt, bool hdr);
 };
 
-/*
- * CAN clock parameters
- */
-struct can_clock {
-       __u32 freq;             /* CAN system clock frequency in Hz */
-};
-
-
 /*
  * minimal structs, just enough to be source level compatible
  */
 struct can_priv {
-       const struct can_bittiming_const *bittiming_const;
        struct can_clock clock;
 };
 
@@ -130,7 +122,7 @@ static inline void *netdev_priv(const struct net_device *dev)
        return (void *)&dev->priv;
 }
 
-static void print_usage(charcmd)
+static void print_usage(char *cmd)
 {
        printf("Usage: %s [options] [<CAN-contoller-name>]\n"
               "\tOptions:\n"
@@ -145,7 +137,7 @@ static void print_usage(char* cmd)
        exit(EXIT_FAILURE);
 }
 
-static void printf_btr_sja1000(struct can_bittiming *bt, int hdr)
+static void printf_btr_sja1000(struct can_bittiming *bt, bool hdr)
 {
        uint8_t btr0, btr1;
 
@@ -159,7 +151,7 @@ static void printf_btr_sja1000(struct can_bittiming *bt, int hdr)
        }
 }
 
-static void printf_btr_at91(struct can_bittiming *bt, int hdr)
+static void printf_btr_at91(struct can_bittiming *bt, bool hdr)
 {
        if (hdr) {
                printf("%10s", "CAN_BR");
@@ -173,7 +165,7 @@ static void printf_btr_at91(struct can_bittiming *bt, int hdr)
        }
 }
 
-static void printf_btr_flexcan(struct can_bittiming *bt, int hdr)
+static void printf_btr_flexcan(struct can_bittiming *bt, bool hdr)
 {
        if (hdr) {
                printf("%10s", "CAN_CTRL");
@@ -188,7 +180,7 @@ static void printf_btr_flexcan(struct can_bittiming *bt, int hdr)
        }
 }
 
-static void printf_btr_mcp251x(struct can_bittiming *bt, int hdr)
+static void printf_btr_mcp251x(struct can_bittiming *bt, bool hdr)
 {
        uint8_t cnf1, cnf2, cnf3;
 
@@ -202,7 +194,7 @@ static void printf_btr_mcp251x(struct can_bittiming *bt, int hdr)
        }
 }
 
-static void printf_btr_ti_hecc(struct can_bittiming *bt, int hdr)
+static void printf_btr_ti_hecc(struct can_bittiming *bt, bool hdr)
 {
        if (hdr) {
                printf("%10s", "CANBTC");
@@ -219,260 +211,310 @@ static void printf_btr_ti_hecc(struct can_bittiming *bt, int hdr)
        }
 }
 
-static struct can_bittiming_const can_calc_consts[] = {
-       {
-               .name = "sja1000",
-               .tseg1_min = 1,
-               .tseg1_max = 16,
-               .tseg2_min = 1,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 64,
-               .brp_inc = 1,
+#define RCAR_CAN_BCR_TSEG1(x)  (((x) & 0x0f) << 20)
+#define RCAR_CAN_BCR_BPR(x)    (((x) & 0x3ff) << 8)
+#define RCAR_CAN_BCR_SJW(x)    (((x) & 0x3) << 4)
+#define RCAR_CAN_BCR_TSEG2(x)  ((x) & 0x07)
 
+static void printf_btr_rcar_can(struct can_bittiming *bt, bool hdr)
+{
+       if (hdr) {
+               printf("%10s", "CiBCR");
+       } else {
+               uint32_t bcr;
+
+               bcr = RCAR_CAN_BCR_TSEG1(bt->phase_seg1 + bt->prop_seg - 1) |
+                       RCAR_CAN_BCR_BPR(bt->brp - 1) |
+                       RCAR_CAN_BCR_SJW(bt->sjw - 1) |
+                       RCAR_CAN_BCR_TSEG2(bt->phase_seg2 - 1);
+
+               printf("0x%08x", bcr << 8);
+       }
+}
+
+static struct calc_bittiming_const can_calc_consts[] = {
+       {
+               .bittiming_const = {
+                       .name = "sja1000",
+                       .tseg1_min = 1,
+                       .tseg1_max = 16,
+                       .tseg2_min = 1,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 64,
+                       .brp_inc = 1,
+               },
                .ref_clk = 8000000,
                .printf_btr = printf_btr_sja1000,
-       },
-       {
-               .name = "mscan",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 64,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "mscan",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 64,
+                       .brp_inc = 1,
+               },
                .ref_clk = 32000000,
                .printf_btr = printf_btr_sja1000,
-       },
-       {
-               .name = "mscan",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 64,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "mscan",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 64,
+                       .brp_inc = 1,
+               },
                .ref_clk = 33000000,
                .printf_btr = printf_btr_sja1000,
-       },
-       {
-               .name = "mscan",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 64,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "mscan",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 64,
+                       .brp_inc = 1,
+               },
                .ref_clk = 33300000,
                .printf_btr = printf_btr_sja1000,
-       },
-       {
-               .name = "mscan",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 64,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "mscan",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 64,
+                       .brp_inc = 1,
+               },
                .ref_clk = 33333333,
                .printf_btr = printf_btr_sja1000,
-       },
-       {
-               .name = "mscan",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 64,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "mscan",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 64,
+                       .brp_inc = 1,
+               },
                .ref_clk = 66660000,    /* mpc5121 */
                .printf_btr = printf_btr_sja1000,
-       },
-       {
-               .name = "mscan",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 64,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "mscan",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 64,
+                       .brp_inc = 1,
+               },
                .ref_clk = 66666666,    /* mpc5121 */
                .printf_btr = printf_btr_sja1000,
-       },
-       {
-               .name = "at91",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 2,
-               .brp_max = 128,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "at91",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 2,
+                       .brp_max = 128,
+                       .brp_inc = 1,
+               },
                .ref_clk = 100000000,
                .printf_btr = printf_btr_at91,
-       },
-       {
-               .name = "at91",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 2,
-               .brp_max = 128,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "at91",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 2,
+                       .brp_max = 128,
+                       .brp_inc = 1,
+               },
                /* real world clock as found on the ronetix PM9263 */
                .ref_clk = 99532800,
                .printf_btr = printf_btr_at91,
-       },
-       {
-               .name = "flexcan",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 256,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "flexcan",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 256,
+                       .brp_inc = 1,
+               },
                .ref_clk = 24000000,    /* mx28 */
                .printf_btr = printf_btr_flexcan,
-       },
-       {
-               .name = "flexcan",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 256,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "flexcan",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 256,
+                       .brp_inc = 1,
+               },
+               .ref_clk = 30000000,    /* mx6 */
+               .printf_btr = printf_btr_flexcan,
+       }, {
+               .bittiming_const = {
+                       .name = "flexcan",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 256,
+                       .brp_inc = 1,
+               },
                .ref_clk = 49875000,
                .printf_btr = printf_btr_flexcan,
-       },
-       {
-               .name = "flexcan",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 256,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "flexcan",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 256,
+                       .brp_inc = 1,
+               },
                .ref_clk = 66000000,
                .printf_btr = printf_btr_flexcan,
-       },
-       {
-               .name = "flexcan",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 256,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "flexcan",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 256,
+                       .brp_inc = 1,
+               },
                .ref_clk = 66500000,
                .printf_btr = printf_btr_flexcan,
-       },
-       {
-               .name = "flexcan",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 256,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "flexcan",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 256,
+                       .brp_inc = 1,
+               },
                .ref_clk = 66666666,
                .printf_btr = printf_btr_flexcan,
-       },
-       {
-               .name = "flexcan",
-               .tseg1_min = 4,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 256,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "flexcan",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 256,
+                       .brp_inc = 1,
+               },
                .ref_clk = 83368421,
                .printf_btr = printf_btr_flexcan, /* vybrid */
-       },
-       {
-               .name = "mcp251x",
-               .tseg1_min = 3,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 64,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "mcp251x",
+                       .tseg1_min = 3,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 64,
+                       .brp_inc = 1,
+               },
                .ref_clk = 8000000,
                .printf_btr = printf_btr_mcp251x,
-       },
-       {
-               .name = "mcp251x",
-               .tseg1_min = 3,
-               .tseg1_max = 16,
-               .tseg2_min = 2,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 64,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "mcp251x",
+                       .tseg1_min = 3,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 64,
+                       .brp_inc = 1,
+               },
                .ref_clk = 16000000,
                .printf_btr = printf_btr_mcp251x,
-       },
-       {
-               .name = "ti_hecc",
-               .tseg1_min = 1,
-               .tseg1_max = 16,
-               .tseg2_min = 1,
-               .tseg2_max = 8,
-               .sjw_max = 4,
-               .brp_min = 1,
-               .brp_max = 256,
-               .brp_inc = 1,
-
+       }, {
+               .bittiming_const = {
+                       .name = "ti_hecc",
+                       .tseg1_min = 1,
+                       .tseg1_max = 16,
+                       .tseg2_min = 1,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 256,
+                       .brp_inc = 1,
+               },
                .ref_clk = 13000000,
                .printf_btr = printf_btr_ti_hecc,
-       }
+       }, {
+               .bittiming_const = {
+                       .name = "rcar_can",
+                       .tseg1_min = 4,
+                       .tseg1_max = 16,
+                       .tseg2_min = 2,
+                       .tseg2_max = 8,
+                       .sjw_max = 4,
+                       .brp_min = 1,
+                       .brp_max = 1024,
+                       .brp_inc = 1,
+               },
+               .ref_clk = 65000000,
+               .printf_btr = printf_btr_rcar_can,
+       },
 };
 
 static long common_bitrates[] = {
@@ -489,6 +531,19 @@ static long common_bitrates[] = {
 
 #define CAN_CALC_MAX_ERROR 50 /* in one-tenth of a percent */
 
+/*
+ * Bit-timing calculation derived from:
+ *
+ * Code based on LinCAN sources and H8S2638 project
+ * Copyright 2004-2006 Pavel Pisa - DCE FELK CVUT cz
+ * Copyright 2005      Stanislav Marek
+ * email: pisa@cmp.felk.cvut.cz
+ *
+ * Calculates proper bit-timing parameters for a specified bit-rate
+ * and sample-point, which can then be used to set the bit-timing
+ * registers of the CAN controller. You can find more information
+ * in the header file linux/can/netlink.h.
+ */
 static int can_update_spt(const struct can_bittiming_const *btc,
                          int sampl_pt, int tseg, int *tseg1, int *tseg2)
 {
@@ -505,21 +560,18 @@ static int can_update_spt(const struct can_bittiming_const *btc,
        return 1000 * (tseg + 1 - *tseg2) / (tseg + 1);
 }
 
-static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt)
+static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt,
+                             const struct can_bittiming_const *btc)
 {
        struct can_priv *priv = netdev_priv(dev);
-       const struct can_bittiming_const *btc = priv->bittiming_const;
-       long rate = 0;
        long best_error = 1000000000, error = 0;
        int best_tseg = 0, best_brp = 0, brp = 0;
        int tsegall, tseg = 0, tseg1 = 0, tseg2 = 0;
        int spt_error = 1000, spt = 0, sampl_pt;
+       long rate;
        u64 v64;
 
-       if (!priv->bittiming_const)
-               return -ENOTSUPP;
-
-       /* Use CIA recommended sample points */
+       /* Use CiA recommended sample points */
        if (bt->sample_point) {
                sampl_pt = bt->sample_point;
        } else {
@@ -569,14 +621,13 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt)
                /* Error in one-tenth of a percent */
                error = (best_error * 1000) / bt->bitrate;
                if (error > CAN_CALC_MAX_ERROR) {
-                       dev_err(dev->dev.parent,
-                               "bitrate error %ld.%ld%% too high\n",
-                               error / 10, error % 10);
+                       netdev_err(dev,
+                                  "bitrate error %ld.%ld%% too high\n",
+                                  error / 10, error % 10);
                        return -EDOM;
-               } else {
-                       dev_warn(dev->dev.parent, "bitrate error %ld.%ld%%\n",
-                                error / 10, error % 10);
                }
+               netdev_warn(dev, "bitrate error %ld.%ld%%\n",
+                           error / 10, error % 10);
        }
 
        /* real sample point */
@@ -589,9 +640,20 @@ static int can_calc_bittiming(struct net_device *dev, struct can_bittiming *bt)
        bt->prop_seg = tseg1 / 2;
        bt->phase_seg1 = tseg1 - bt->prop_seg;
        bt->phase_seg2 = tseg2;
-       bt->sjw = 1;
-       bt->brp = best_brp;
 
+       /* check for sjw user settings */
+       if (!bt->sjw || !btc->sjw_max)
+               bt->sjw = 1;
+       else {
+               /* bt->sjw is at least 1 -> sanitize upper bound to sjw_max */
+               if (bt->sjw > btc->sjw_max)
+                       bt->sjw = btc->sjw_max;
+               /* bt->sjw must not be higher than tseg2 */
+               if (tseg2 < bt->sjw)
+                       bt->sjw = tseg2;
+       }
+
+       bt->brp = best_brp;
        /* real bit-rate */
        bt->bitrate = priv->clock.freq / (bt->brp * (tseg1 + tseg2 + 1));
 
@@ -612,12 +674,11 @@ static __u32 get_cia_sample_point(__u32 bitrate)
        return sampl_pt;
 }
 
-static void print_bit_timing(const struct can_bittiming_const *btc,
+static void print_bit_timing(const struct calc_bittiming_const *btc,
                             __u32 bitrate, __u32 sample_point, __u32 ref_clk,
-                            int quiet)
+                            bool quiet)
 {
        struct net_device dev = {
-               .priv.bittiming_const = btc,
                .priv.clock.freq = ref_clk,
        };
        struct can_bittiming bt = {
@@ -630,14 +691,14 @@ static void print_bit_timing(const struct can_bittiming_const *btc,
                printf("Bit timing parameters for %s with %.6f MHz ref clock\n"
                       "nominal                                 real Bitrt   nom  real SampP\n"
                       "Bitrate TQ[ns] PrS PhS1 PhS2 SJW BRP Bitrate Error SampP SampP Error ",
-                      btc->name,
+                      btc->bittiming_const.name,
                       ref_clk / 1000000.0);
 
-               btc->printf_btr(&bt, 1);
+               btc->printf_btr(&bt, true);
                printf("\n");
        }
 
-       if (can_calc_bittiming(&dev, &bt)) {
+       if (can_calc_bittiming(&dev, &bt, &btc->bittiming_const)) {
                printf("%7d ***bitrate not possible***\n", bitrate);
                return;
        }
@@ -665,7 +726,7 @@ static void print_bit_timing(const struct can_bittiming_const *btc,
               bt.sample_point / 10.0,
               100.0 * spt_error / sample_point);
 
-       btc->printf_btr(&bt, 0);
+       btc->printf_btr(&bt, false);
        printf("\n");
 }
 
@@ -674,7 +735,7 @@ static void do_list(void)
        unsigned int i;
 
        for (i = 0; i < ARRAY_SIZE(can_calc_consts); i++)
-               printf("%s\n", can_calc_consts[i].name);
+               printf("%s\n", can_calc_consts[i].bittiming_const.name);
 }
 
 int main(int argc, char *argv[])
@@ -682,13 +743,12 @@ int main(int argc, char *argv[])
        __u32 bitrate = 0;
        __u32 opt_ref_clk = 0, ref_clk;
        int sampl_pt = 0;
-       int quiet = 0;
-       int list = 0;
+       bool quiet = false, list = false, found = false;
        char *name = NULL;
        unsigned int i, j;
-       int opt, found = 0;
+       int opt;
 
-       const struct can_bittiming_const *btc = NULL;
+       const struct calc_bittiming_const *btc = NULL;
 
        while ((opt = getopt(argc, argv, "b:c:lps:")) != -1) {
                switch (opt) {
@@ -701,11 +761,11 @@ int main(int argc, char *argv[])
                        break;
 
                case 'l':
-                       list = 1;
+                       list = true;
                        break;
 
                case 'q':
-                       quiet = 1;
+                       quiet = true;
                        break;
 
                case 's':
@@ -733,10 +793,10 @@ int main(int argc, char *argv[])
                print_usage(argv[0]);
 
        for (i = 0; i < ARRAY_SIZE(can_calc_consts); i++) {
-               if (name && strcmp(can_calc_consts[i].name, name))
+               if (name && strcmp(can_calc_consts[i].bittiming_const.name, name))
                        continue;
 
-               found = 1;
+               found = true;
                btc = &can_calc_consts[i];
 
                if (opt_ref_clk)