can: netlink: add PWM netlink interface

When the TMS is switched on, the node uses PWM (Pulse Width
Modulation) during the data phase instead of the classic NRZ (Non
Return to Zero) encoding.

PWM is configured by three parameters:

  - PWMS: Pulse Width Modulation Short phase
  - PWML: Pulse Width Modulation Long phase
  - PWMO: Pulse Width Modulation Offset time

For each of these parameters, define three IFLA symbols:

  - IFLA_CAN_PWM_PWM*_MIN: the minimum allowed value.
  - IFLA_CAN_PWM_PWM*_MAX: the maximum allowed value.
  - IFLA_CAN_PWM_PWM*: the runtime value.

This results in a total of nine IFLA symbols which are all nested in a
parent IFLA_CAN_XL_PWM symbol.

IFLA_CAN_PWM_PWM*_MIN and IFLA_CAN_PWM_PWM*_MAX define the range of
allowed values and will match the value statically configured by the
device in struct can_pwm_const.

IFLA_CAN_PWM_PWM* match the runtime values stored in struct can_pwm.
Those parameters may only be configured when the tms mode is on. If
the PWMS, PWML and PWMO parameters are provided, check that all the
needed parameters are present using can_validate_pwm(), then check
their value using can_validate_pwm_bittiming(). PWMO defaults to zero
if omitted. Otherwise, if CAN_CTRLMODE_XL_TMS is true but none of the
PWM parameters are provided, calculate them using can_calc_pwm().

Signed-off-by: Vincent Mailhol <mailhol@kernel.org>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://patch.msgid.link/20251126-canxl-v8-11-e7e3eb74f889@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c
index b2c24439abba66c68e731ce79ace99e89030cd96..d6b0e686fb114fa35c811ad924c7b404a330ac09 100644 (file)
--- a/drivers/net/can/dev/netlink.c
+++ b/drivers/net/can/dev/netlink.c
@@ -25,6 +25,7 @@ static const struct nla_policy can_policy[IFLA_CAN_MAX + 1] = {
        [IFLA_CAN_XL_DATA_BITTIMING] = { .len = sizeof(struct can_bittiming) },
        [IFLA_CAN_XL_DATA_BITTIMING_CONST] = { .len = sizeof(struct can_bittiming_const) },
        [IFLA_CAN_XL_TDC] = { .type = NLA_NESTED },
+       [IFLA_CAN_XL_PWM] = { .type = NLA_NESTED },
 };
 
 static const struct nla_policy can_tdc_policy[IFLA_CAN_TDC_MAX + 1] = {
@@ -39,6 +40,18 @@ static const struct nla_policy can_tdc_policy[IFLA_CAN_TDC_MAX + 1] = {
        [IFLA_CAN_TDC_TDCF] = { .type = NLA_U32 },
 };
 
+static const struct nla_policy can_pwm_policy[IFLA_CAN_PWM_MAX + 1] = {
+       [IFLA_CAN_PWM_PWMS_MIN] = { .type = NLA_U32 },
+       [IFLA_CAN_PWM_PWMS_MAX] = { .type = NLA_U32 },
+       [IFLA_CAN_PWM_PWML_MIN] = { .type = NLA_U32 },
+       [IFLA_CAN_PWM_PWML_MAX] = { .type = NLA_U32 },
+       [IFLA_CAN_PWM_PWMO_MIN] = { .type = NLA_U32 },
+       [IFLA_CAN_PWM_PWMO_MAX] = { .type = NLA_U32 },
+       [IFLA_CAN_PWM_PWMS] = { .type = NLA_U32 },
+       [IFLA_CAN_PWM_PWML] = { .type = NLA_U32 },
+       [IFLA_CAN_PWM_PWMO] = { .type = NLA_U32 },
+};
+
 static int can_validate_bittiming(struct nlattr *data[],
                                  struct netlink_ext_ack *extack,
                                  int ifla_can_bittiming)
@@ -119,6 +132,40 @@ static int can_validate_tdc(struct nlattr *data_tdc,
        return 0;
 }
 
+static int can_validate_pwm(struct nlattr *data[],
+                           struct netlink_ext_ack *extack, u32 flags)
+{
+       struct nlattr *tb_pwm[IFLA_CAN_PWM_MAX + 1];
+       int err;
+
+       if (!data[IFLA_CAN_XL_PWM])
+               return 0;
+
+       if (!(flags & CAN_CTRLMODE_XL_TMS)) {
+               NL_SET_ERR_MSG(extack, "PWM requires TMS");
+               return -EOPNOTSUPP;
+       }
+
+       err = nla_parse_nested(tb_pwm, IFLA_CAN_PWM_MAX, data[IFLA_CAN_XL_PWM],
+                              can_pwm_policy, extack);
+       if (err)
+               return err;
+
+       if (!tb_pwm[IFLA_CAN_PWM_PWMS] != !tb_pwm[IFLA_CAN_PWM_PWML]) {
+               NL_SET_ERR_MSG(extack,
+                              "Provide either both PWMS and PWML, or none for automatic calculation");
+               return -EOPNOTSUPP;
+       }
+
+       if (tb_pwm[IFLA_CAN_PWM_PWMO] &&
+           (!tb_pwm[IFLA_CAN_PWM_PWMS] || !tb_pwm[IFLA_CAN_PWM_PWML])) {
+               NL_SET_ERR_MSG(extack, "PWMO requires both PWMS and PWML");
+               return -EOPNOTSUPP;
+       }
+
+       return 0;
+}
+
 static int can_validate_databittiming(struct nlattr *data[],
                                      struct netlink_ext_ack *extack,
                                      int ifla_can_data_bittiming, u32 flags)
@@ -247,6 +294,10 @@ static int can_validate(struct nlattr *tb[], struct nlattr *data[],
        if (err)
                return err;
 
+       err = can_validate_pwm(data, extack, flags);
+       if (err)
+               return err;
+
        return 0;
 }
 
@@ -322,6 +373,7 @@ static int can_ctrlmode_changelink(struct net_device *dev,
                       sizeof(priv->fd.data_bittiming));
                priv->ctrlmode &= ~CAN_CTRLMODE_XL_TDC_MASK;
                memset(&priv->xl.tdc, 0, sizeof(priv->xl.tdc));
+               memset(&priv->xl.pwm, 0, sizeof(priv->xl.pwm));
        }
 
        can_set_default_mtu(dev);
@@ -468,6 +520,76 @@ static int can_dbt_changelink(struct net_device *dev, struct nlattr *data[],
        return 0;
 }
 
+static int can_pwm_changelink(struct net_device *dev,
+                             const struct nlattr *pwm_nla,
+                             struct netlink_ext_ack *extack)
+{
+       struct can_priv *priv = netdev_priv(dev);
+       const struct can_pwm_const *pwm_const = priv->xl.pwm_const;
+       struct nlattr *tb_pwm[IFLA_CAN_PWM_MAX + 1];
+       struct can_pwm pwm = { 0 };
+       int err;
+
+       if (!(priv->ctrlmode & CAN_CTRLMODE_XL_TMS))
+               return 0;
+
+       if (!pwm_const) {
+               NL_SET_ERR_MSG(extack, "The device does not support PWM");
+               return -EOPNOTSUPP;
+       }
+
+       if (!pwm_nla)
+               return can_calc_pwm(dev, extack);
+
+       err = nla_parse_nested(tb_pwm, IFLA_CAN_PWM_MAX, pwm_nla,
+                              can_pwm_policy, extack);
+       if (err)
+               return err;
+
+       if (tb_pwm[IFLA_CAN_PWM_PWMS]) {
+               pwm.pwms = nla_get_u32(tb_pwm[IFLA_CAN_PWM_PWMS]);
+               if (pwm.pwms < pwm_const->pwms_min ||
+                   pwm.pwms > pwm_const->pwms_max) {
+                       NL_SET_ERR_MSG_FMT(extack,
+                                          "PWMS: %u tqmin is out of range: %u...%u",
+                                          pwm.pwms, pwm_const->pwms_min,
+                                          pwm_const->pwms_max);
+                       return -EINVAL;
+               }
+       }
+
+       if (tb_pwm[IFLA_CAN_PWM_PWML]) {
+               pwm.pwml = nla_get_u32(tb_pwm[IFLA_CAN_PWM_PWML]);
+               if (pwm.pwml < pwm_const->pwml_min ||
+                   pwm.pwml > pwm_const->pwml_max) {
+                       NL_SET_ERR_MSG_FMT(extack,
+                                          "PWML: %u tqmin is out of range: %u...%u",
+                                          pwm.pwml, pwm_const->pwml_min,
+                                          pwm_const->pwml_max);
+                       return -EINVAL;
+               }
+       }
+
+       if (tb_pwm[IFLA_CAN_PWM_PWMO]) {
+               pwm.pwmo = nla_get_u32(tb_pwm[IFLA_CAN_PWM_PWMO]);
+               if (pwm.pwmo < pwm_const->pwmo_min ||
+                   pwm.pwmo > pwm_const->pwmo_max) {
+                       NL_SET_ERR_MSG_FMT(extack,
+                                          "PWMO: %u tqmin is out of range: %u...%u",
+                                          pwm.pwmo, pwm_const->pwmo_min,
+                                          pwm_const->pwmo_max);
+                       return -EINVAL;
+               }
+       }
+
+       err = can_validate_pwm_bittiming(dev, &pwm, extack);
+       if (err)
+               return err;
+
+       priv->xl.pwm = pwm;
+       return 0;
+}
+
 static int can_changelink(struct net_device *dev, struct nlattr *tb[],
                          struct nlattr *data[],
                          struct netlink_ext_ack *extack)
@@ -559,6 +681,9 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
 
        /* CAN XL */
        err = can_dbt_changelink(dev, data, false, extack);
+       if (err)
+               return err;
+       err = can_pwm_changelink(dev, data[IFLA_CAN_XL_PWM], extack);
        if (err)
                return err;
 
@@ -647,6 +772,30 @@ static size_t can_ctrlmode_ext_get_size(void)
                nla_total_size(sizeof(u32));    /* IFLA_CAN_CTRLMODE_SUPPORTED */
 }
 
+static size_t can_pwm_get_size(const struct can_pwm_const *pwm_const,
+                              bool pwm_on)
+{
+       size_t size;
+
+       if (!pwm_const || !pwm_on)
+               return 0;
+
+       size = nla_total_size(0);                       /* nest IFLA_CAN_PWM */
+
+       size += nla_total_size(sizeof(u32));            /* IFLA_CAN_PWM_PWMS_MIN */
+       size += nla_total_size(sizeof(u32));            /* IFLA_CAN_PWM_PWMS_MAX */
+       size += nla_total_size(sizeof(u32));            /* IFLA_CAN_PWM_PWML_MIN */
+       size += nla_total_size(sizeof(u32));            /* IFLA_CAN_PWM_PWML_MAX */
+       size += nla_total_size(sizeof(u32));            /* IFLA_CAN_PWM_PWMO_MIN */
+       size += nla_total_size(sizeof(u32));            /* IFLA_CAN_PWM_PWMO_MAX */
+
+       size += nla_total_size(sizeof(u32));            /* IFLA_CAN_PWM_PWMS */
+       size += nla_total_size(sizeof(u32));            /* IFLA_CAN_PWM_PWML */
+       size += nla_total_size(sizeof(u32));            /* IFLA_CAN_PWM_PWMO */
+
+       return size;
+}
+
 static size_t can_get_size(const struct net_device *dev)
 {
        struct can_priv *priv = netdev_priv(dev);
@@ -678,6 +827,8 @@ static size_t can_get_size(const struct net_device *dev)
 
        size += can_data_bittiming_get_size(&priv->xl,
                                            priv->ctrlmode & CAN_CTRLMODE_XL_TDC_MASK);
+       size += can_pwm_get_size(priv->xl.pwm_const,            /* IFLA_CAN_XL_PWM */
+                                priv->ctrlmode & CAN_CTRLMODE_XL_TMS);
 
        return size;
 }
@@ -776,6 +927,42 @@ err_cancel:
        return -EMSGSIZE;
 }
 
+static int can_pwm_fill_info(struct sk_buff *skb, const struct can_priv *priv)
+{
+       const struct can_pwm_const *pwm_const = priv->xl.pwm_const;
+       const struct can_pwm *pwm = &priv->xl.pwm;
+       struct nlattr *nest;
+
+       if (!pwm_const)
+               return 0;
+
+       nest = nla_nest_start(skb, IFLA_CAN_XL_PWM);
+       if (!nest)
+               return -EMSGSIZE;
+
+       if (nla_put_u32(skb, IFLA_CAN_PWM_PWMS_MIN, pwm_const->pwms_min) ||
+           nla_put_u32(skb, IFLA_CAN_PWM_PWMS_MAX, pwm_const->pwms_max) ||
+           nla_put_u32(skb, IFLA_CAN_PWM_PWML_MIN, pwm_const->pwml_min) ||
+           nla_put_u32(skb, IFLA_CAN_PWM_PWML_MAX, pwm_const->pwml_max) ||
+           nla_put_u32(skb, IFLA_CAN_PWM_PWMO_MIN, pwm_const->pwmo_min) ||
+           nla_put_u32(skb, IFLA_CAN_PWM_PWMO_MAX, pwm_const->pwmo_max))
+               goto err_cancel;
+
+       if (priv->ctrlmode & CAN_CTRLMODE_XL_TMS) {
+               if (nla_put_u32(skb, IFLA_CAN_PWM_PWMS, pwm->pwms) ||
+                   nla_put_u32(skb, IFLA_CAN_PWM_PWML, pwm->pwml) ||
+                   nla_put_u32(skb, IFLA_CAN_PWM_PWMO, pwm->pwmo))
+                       goto err_cancel;
+       }
+
+       nla_nest_end(skb, nest);
+       return 0;
+
+err_cancel:
+       nla_nest_cancel(skb, nest);
+       return -EMSGSIZE;
+}
+
 static int can_ctrlmode_ext_fill_info(struct sk_buff *skb,
                                      const struct can_priv *priv)
 {
@@ -859,9 +1046,10 @@ static int can_fill_info(struct sk_buff *skb, const struct net_device *dev)
                                        priv->xl.data_bitrate_const,
                                        priv->xl.data_bitrate_const_cnt) ||
 
-           can_tdc_fill_info(skb, dev, IFLA_CAN_XL_TDC)
-           )
+           can_tdc_fill_info(skb, dev, IFLA_CAN_XL_TDC) ||
 
+           can_pwm_fill_info(skb, priv)
+           )
                return -EMSGSIZE;
 
        return 0;

diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netlink.h
index ebafb091d80fef6b35f329c42b4e16f19a05df5d..c30d167461595115a9a54536c5ba51f772767a07 100644 (file)
--- a/include/uapi/linux/can/netlink.h
+++ b/include/uapi/linux/can/netlink.h
@@ -5,6 +5,7 @@
  * Definitions for the CAN netlink interface
  *
  * Copyright (c) 2009 Wolfgang Grandegger <wg@grandegger.com>
+ * Copyright (c) 2021-2025 Vincent Mailhol <mailhol@kernel.org>
  *
  * 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
@@ -147,6 +148,7 @@ enum {
        IFLA_CAN_XL_DATA_BITTIMING_CONST,
        IFLA_CAN_XL_DATA_BITRATE_CONST,
        IFLA_CAN_XL_TDC,
+       IFLA_CAN_XL_PWM,
 
        /* add new constants above here */
        __IFLA_CAN_MAX,
@@ -188,6 +190,29 @@ enum {
        IFLA_CAN_CTRLMODE_MAX = __IFLA_CAN_CTRLMODE - 1
 };
 
+/*
+ * CAN FD/XL Pulse-Width Modulation (PWM)
+ *
+ * Please refer to struct can_pwm_const and can_pwm in
+ * include/linux/can/bittiming.h for further details.
+ */
+enum {
+       IFLA_CAN_PWM_UNSPEC,
+       IFLA_CAN_PWM_PWMS_MIN,  /* u32 */
+       IFLA_CAN_PWM_PWMS_MAX,  /* u32 */
+       IFLA_CAN_PWM_PWML_MIN,  /* u32 */
+       IFLA_CAN_PWM_PWML_MAX,  /* u32 */
+       IFLA_CAN_PWM_PWMO_MIN,  /* u32 */
+       IFLA_CAN_PWM_PWMO_MAX,  /* u32 */
+       IFLA_CAN_PWM_PWMS,      /* u32 */
+       IFLA_CAN_PWM_PWML,      /* u32 */
+       IFLA_CAN_PWM_PWMO,      /* u32 */
+
+       /* add new constants above here */
+       __IFLA_CAN_PWM,
+       IFLA_CAN_PWM_MAX = __IFLA_CAN_PWM - 1
+};
+
 /* u16 termination range: 1..65535 Ohms */
 #define CAN_TERMINATION_DISABLED 0