]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
dpll: add reference sync get/set
authorArkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
Thu, 26 Jun 2025 13:52:18 +0000 (15:52 +0200)
committerJakub Kicinski <kuba@kernel.org>
Fri, 27 Jun 2025 23:38:02 +0000 (16:38 -0700)
Define function for reference sync pin registration and callback ops to
set/get current feature state.

Implement netlink handler to fill netlink messages with reference sync
pin configuration of capable pins (pin-get).

Implement netlink handler to call proper ops and configure reference
sync pin state (pin-set).

Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: Milena Olech <milena.olech@intel.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Arkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
Link: https://patch.msgid.link/20250626135219.1769350-3-arkadiusz.kubalewski@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/dpll/dpll_core.c
drivers/dpll/dpll_core.h
drivers/dpll/dpll_netlink.c
drivers/dpll/dpll_netlink.h
include/linux/dpll.h

index 20bdc52f63a5031feba8e037253c793f094f0aec..a461095efd8ac7a579a9cfc20c63efc652994718 100644 (file)
@@ -506,6 +506,7 @@ dpll_pin_alloc(u64 clock_id, u32 pin_idx, struct module *module,
        refcount_set(&pin->refcount, 1);
        xa_init_flags(&pin->dpll_refs, XA_FLAGS_ALLOC);
        xa_init_flags(&pin->parent_refs, XA_FLAGS_ALLOC);
+       xa_init_flags(&pin->ref_sync_pins, XA_FLAGS_ALLOC);
        ret = xa_alloc_cyclic(&dpll_pin_xa, &pin->id, pin, xa_limit_32b,
                              &dpll_pin_xa_id, GFP_KERNEL);
        if (ret < 0)
@@ -514,6 +515,7 @@ dpll_pin_alloc(u64 clock_id, u32 pin_idx, struct module *module,
 err_xa_alloc:
        xa_destroy(&pin->dpll_refs);
        xa_destroy(&pin->parent_refs);
+       xa_destroy(&pin->ref_sync_pins);
        dpll_pin_prop_free(&pin->prop);
 err_pin_prop:
        kfree(pin);
@@ -595,6 +597,7 @@ void dpll_pin_put(struct dpll_pin *pin)
                xa_erase(&dpll_pin_xa, pin->id);
                xa_destroy(&pin->dpll_refs);
                xa_destroy(&pin->parent_refs);
+               xa_destroy(&pin->ref_sync_pins);
                dpll_pin_prop_free(&pin->prop);
                kfree_rcu(pin, rcu);
        }
@@ -659,11 +662,26 @@ dpll_pin_register(struct dpll_device *dpll, struct dpll_pin *pin,
 }
 EXPORT_SYMBOL_GPL(dpll_pin_register);
 
+static void dpll_pin_ref_sync_pair_del(u32 ref_sync_pin_id)
+{
+       struct dpll_pin *pin, *ref_sync_pin;
+       unsigned long i;
+
+       xa_for_each(&dpll_pin_xa, i, pin) {
+               ref_sync_pin = xa_load(&pin->ref_sync_pins, ref_sync_pin_id);
+               if (ref_sync_pin) {
+                       xa_erase(&pin->ref_sync_pins, ref_sync_pin_id);
+                       __dpll_pin_change_ntf(pin);
+               }
+       }
+}
+
 static void
 __dpll_pin_unregister(struct dpll_device *dpll, struct dpll_pin *pin,
                      const struct dpll_pin_ops *ops, void *priv, void *cookie)
 {
        ASSERT_DPLL_PIN_REGISTERED(pin);
+       dpll_pin_ref_sync_pair_del(pin->id);
        dpll_xa_ref_pin_del(&dpll->pin_refs, pin, ops, priv, cookie);
        dpll_xa_ref_dpll_del(&pin->dpll_refs, dpll, ops, priv, cookie);
        if (xa_empty(&pin->dpll_refs))
@@ -783,6 +801,33 @@ void dpll_pin_on_pin_unregister(struct dpll_pin *parent, struct dpll_pin *pin,
 }
 EXPORT_SYMBOL_GPL(dpll_pin_on_pin_unregister);
 
+/**
+ * dpll_pin_ref_sync_pair_add - create a reference sync signal pin pair
+ * @pin: pin which produces the base frequency
+ * @ref_sync_pin: pin which produces the sync signal
+ *
+ * Once pins are paired, the user-space configuration of reference sync pair
+ * is possible.
+ * Context: Acquires a lock (dpll_lock)
+ * Return:
+ * * 0 on success
+ * * negative - error value
+ */
+int dpll_pin_ref_sync_pair_add(struct dpll_pin *pin,
+                              struct dpll_pin *ref_sync_pin)
+{
+       int ret;
+
+       mutex_lock(&dpll_lock);
+       ret = xa_insert(&pin->ref_sync_pins, ref_sync_pin->id,
+                       ref_sync_pin, GFP_KERNEL);
+       __dpll_pin_change_ntf(pin);
+       mutex_unlock(&dpll_lock);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(dpll_pin_ref_sync_pair_add);
+
 static struct dpll_device_registration *
 dpll_device_registration_first(struct dpll_device *dpll)
 {
index 9b11e637397b52786e3a2ab2cae9989444b76b3f..8ce969bbeb64ef98eda0cfb31ed096868a1661f9 100644 (file)
@@ -44,6 +44,7 @@ struct dpll_device {
  * @module:            module of creator
  * @dpll_refs:         hold referencees to dplls pin was registered with
  * @parent_refs:       hold references to parent pins pin was registered with
+ * @ref_sync_pins:     hold references to pins for Reference SYNC feature
  * @prop:              pin properties copied from the registerer
  * @refcount:          refcount
  * @rcu:               rcu_head for kfree_rcu()
@@ -55,6 +56,7 @@ struct dpll_pin {
        struct module *module;
        struct xarray dpll_refs;
        struct xarray parent_refs;
+       struct xarray ref_sync_pins;
        struct dpll_pin_properties prop;
        refcount_t refcount;
        struct rcu_head rcu;
index 4619aaa18b9c0778879dbb1f4730947427539a17..036f21cac0a91813e67689a25bf9c3e99a4d96a9 100644 (file)
@@ -48,6 +48,24 @@ dpll_msg_add_dev_parent_handle(struct sk_buff *msg, u32 id)
        return 0;
 }
 
+static bool dpll_pin_available(struct dpll_pin *pin)
+{
+       struct dpll_pin_ref *par_ref;
+       unsigned long i;
+
+       if (!xa_get_mark(&dpll_pin_xa, pin->id, DPLL_REGISTERED))
+               return false;
+       xa_for_each(&pin->parent_refs, i, par_ref)
+               if (xa_get_mark(&dpll_pin_xa, par_ref->pin->id,
+                               DPLL_REGISTERED))
+                       return true;
+       xa_for_each(&pin->dpll_refs, i, par_ref)
+               if (xa_get_mark(&dpll_device_xa, par_ref->dpll->id,
+                               DPLL_REGISTERED))
+                       return true;
+       return false;
+}
+
 /**
  * dpll_msg_add_pin_handle - attach pin handle attribute to a given message
  * @msg: pointer to sk_buff message to attach a pin handle
@@ -428,6 +446,47 @@ nest_cancel:
        return -EMSGSIZE;
 }
 
+static int
+dpll_msg_add_pin_ref_sync(struct sk_buff *msg, struct dpll_pin *pin,
+                         struct dpll_pin_ref *ref,
+                         struct netlink_ext_ack *extack)
+{
+       const struct dpll_pin_ops *ops = dpll_pin_ops(ref);
+       struct dpll_device *dpll = ref->dpll;
+       void *pin_priv, *ref_sync_pin_priv;
+       struct dpll_pin *ref_sync_pin;
+       enum dpll_pin_state state;
+       struct nlattr *nest;
+       unsigned long index;
+       int ret;
+
+       pin_priv = dpll_pin_on_dpll_priv(dpll, pin);
+       xa_for_each(&pin->ref_sync_pins, index, ref_sync_pin) {
+               if (!dpll_pin_available(ref_sync_pin))
+                       continue;
+               ref_sync_pin_priv = dpll_pin_on_dpll_priv(dpll, ref_sync_pin);
+               if (WARN_ON(!ops->ref_sync_get))
+                       return -EOPNOTSUPP;
+               ret = ops->ref_sync_get(pin, pin_priv, ref_sync_pin,
+                                       ref_sync_pin_priv, &state, extack);
+               if (ret)
+                       return ret;
+               nest = nla_nest_start(msg, DPLL_A_PIN_REFERENCE_SYNC);
+               if (!nest)
+                       return -EMSGSIZE;
+               if (nla_put_s32(msg, DPLL_A_PIN_ID, ref_sync_pin->id))
+                       goto nest_cancel;
+               if (nla_put_s32(msg, DPLL_A_PIN_STATE, state))
+                       goto nest_cancel;
+               nla_nest_end(msg, nest);
+       }
+       return 0;
+
+nest_cancel:
+       nla_nest_cancel(msg, nest);
+       return -EMSGSIZE;
+}
+
 static bool dpll_pin_is_freq_supported(struct dpll_pin *pin, u32 freq)
 {
        int fs;
@@ -570,6 +629,10 @@ dpll_cmd_pin_get_one(struct sk_buff *msg, struct dpll_pin *pin,
        if (ret)
                return ret;
        ret = dpll_msg_add_pin_esync(msg, pin, ref, extack);
+       if (ret)
+               return ret;
+       if (!xa_empty(&pin->ref_sync_pins))
+               ret = dpll_msg_add_pin_ref_sync(msg, pin, ref, extack);
        if (ret)
                return ret;
        if (xa_empty(&pin->parent_refs))
@@ -665,24 +728,6 @@ __dpll_device_change_ntf(struct dpll_device *dpll)
        return dpll_device_event_send(DPLL_CMD_DEVICE_CHANGE_NTF, dpll);
 }
 
-static bool dpll_pin_available(struct dpll_pin *pin)
-{
-       struct dpll_pin_ref *par_ref;
-       unsigned long i;
-
-       if (!xa_get_mark(&dpll_pin_xa, pin->id, DPLL_REGISTERED))
-               return false;
-       xa_for_each(&pin->parent_refs, i, par_ref)
-               if (xa_get_mark(&dpll_pin_xa, par_ref->pin->id,
-                               DPLL_REGISTERED))
-                       return true;
-       xa_for_each(&pin->dpll_refs, i, par_ref)
-               if (xa_get_mark(&dpll_device_xa, par_ref->dpll->id,
-                               DPLL_REGISTERED))
-                       return true;
-       return false;
-}
-
 /**
  * dpll_device_change_ntf - notify that the dpll device has been changed
  * @dpll: registered dpll pointer
@@ -745,7 +790,7 @@ int dpll_pin_delete_ntf(struct dpll_pin *pin)
        return dpll_pin_event_send(DPLL_CMD_PIN_DELETE_NTF, pin);
 }
 
-static int __dpll_pin_change_ntf(struct dpll_pin *pin)
+int __dpll_pin_change_ntf(struct dpll_pin *pin)
 {
        return dpll_pin_event_send(DPLL_CMD_PIN_CHANGE_NTF, pin);
 }
@@ -935,6 +980,108 @@ rollback:
        return ret;
 }
 
+static int
+dpll_pin_ref_sync_state_set(struct dpll_pin *pin,
+                           unsigned long ref_sync_pin_idx,
+                           const enum dpll_pin_state state,
+                           struct netlink_ext_ack *extack)
+
+{
+       struct dpll_pin_ref *ref, *failed;
+       const struct dpll_pin_ops *ops;
+       enum dpll_pin_state old_state;
+       struct dpll_pin *ref_sync_pin;
+       struct dpll_device *dpll;
+       unsigned long i;
+       int ret;
+
+       ref_sync_pin = xa_find(&pin->ref_sync_pins, &ref_sync_pin_idx,
+                              ULONG_MAX, XA_PRESENT);
+       if (!ref_sync_pin) {
+               NL_SET_ERR_MSG(extack, "reference sync pin not found");
+               return -EINVAL;
+       }
+       if (!dpll_pin_available(ref_sync_pin)) {
+               NL_SET_ERR_MSG(extack, "reference sync pin not available");
+               return -EINVAL;
+       }
+       ref = dpll_xa_ref_dpll_first(&pin->dpll_refs);
+       ASSERT_NOT_NULL(ref);
+       ops = dpll_pin_ops(ref);
+       if (!ops->ref_sync_set || !ops->ref_sync_get) {
+               NL_SET_ERR_MSG(extack, "reference sync not supported by this pin");
+               return -EOPNOTSUPP;
+       }
+       dpll = ref->dpll;
+       ret = ops->ref_sync_get(pin, dpll_pin_on_dpll_priv(dpll, pin),
+                               ref_sync_pin,
+                               dpll_pin_on_dpll_priv(dpll, ref_sync_pin),
+                               &old_state, extack);
+       if (ret) {
+               NL_SET_ERR_MSG(extack, "unable to get old reference sync state");
+               return ret;
+       }
+       if (state == old_state)
+               return 0;
+       xa_for_each(&pin->dpll_refs, i, ref) {
+               ops = dpll_pin_ops(ref);
+               dpll = ref->dpll;
+               ret = ops->ref_sync_set(pin, dpll_pin_on_dpll_priv(dpll, pin),
+                                       ref_sync_pin,
+                                       dpll_pin_on_dpll_priv(dpll,
+                                                             ref_sync_pin),
+                                       state, extack);
+               if (ret) {
+                       failed = ref;
+                       NL_SET_ERR_MSG_FMT(extack, "reference sync set failed for dpll_id:%u",
+                                          dpll->id);
+                       goto rollback;
+               }
+       }
+       __dpll_pin_change_ntf(pin);
+
+       return 0;
+
+rollback:
+       xa_for_each(&pin->dpll_refs, i, ref) {
+               if (ref == failed)
+                       break;
+               ops = dpll_pin_ops(ref);
+               dpll = ref->dpll;
+               if (ops->ref_sync_set(pin, dpll_pin_on_dpll_priv(dpll, pin),
+                                     ref_sync_pin,
+                                     dpll_pin_on_dpll_priv(dpll, ref_sync_pin),
+                                     old_state, extack))
+                       NL_SET_ERR_MSG(extack, "set reference sync rollback failed");
+       }
+       return ret;
+}
+
+static int
+dpll_pin_ref_sync_set(struct dpll_pin *pin, struct nlattr *nest,
+                     struct netlink_ext_ack *extack)
+{
+       struct nlattr *tb[DPLL_A_PIN_MAX + 1];
+       enum dpll_pin_state state;
+       u32 sync_pin_id;
+
+       nla_parse_nested(tb, DPLL_A_PIN_MAX, nest,
+                        dpll_reference_sync_nl_policy, extack);
+       if (!tb[DPLL_A_PIN_ID]) {
+               NL_SET_ERR_MSG(extack, "sync pin id expected");
+               return -EINVAL;
+       }
+       sync_pin_id = nla_get_u32(tb[DPLL_A_PIN_ID]);
+
+       if (!tb[DPLL_A_PIN_STATE]) {
+               NL_SET_ERR_MSG(extack, "sync pin state expected");
+               return -EINVAL;
+       }
+       state = nla_get_u32(tb[DPLL_A_PIN_STATE]);
+
+       return dpll_pin_ref_sync_state_set(pin, sync_pin_id, state, extack);
+}
+
 static int
 dpll_pin_on_pin_state_set(struct dpll_pin *pin, u32 parent_idx,
                          enum dpll_pin_state state,
@@ -1241,6 +1388,11 @@ dpll_pin_set_from_nlattr(struct dpll_pin *pin, struct genl_info *info)
                        if (ret)
                                return ret;
                        break;
+               case DPLL_A_PIN_REFERENCE_SYNC:
+                       ret = dpll_pin_ref_sync_set(pin, a, info->extack);
+                       if (ret)
+                               return ret;
+                       break;
                }
        }
 
index a9cfd55f57fc4281bacaac53d5ca959906121209..dd28b56d27c56dd37f63bf13fff6bcb0475656c6 100644 (file)
@@ -11,3 +11,5 @@ int dpll_device_delete_ntf(struct dpll_device *dpll);
 int dpll_pin_create_ntf(struct dpll_pin *pin);
 
 int dpll_pin_delete_ntf(struct dpll_pin *pin);
+
+int __dpll_pin_change_ntf(struct dpll_pin *pin);
index 6ad6c2968a28c079019e46597340dbfdbfe8900e..fa1e76920d0eed18f7f4f5f95ec5695ae3819ade 100644 (file)
@@ -103,6 +103,16 @@ struct dpll_pin_ops {
                         const struct dpll_device *dpll, void *dpll_priv,
                         struct dpll_pin_esync *esync,
                         struct netlink_ext_ack *extack);
+       int (*ref_sync_set)(const struct dpll_pin *pin, void *pin_priv,
+                           const struct dpll_pin *ref_sync_pin,
+                           void *ref_sync_pin_priv,
+                           const enum dpll_pin_state state,
+                           struct netlink_ext_ack *extack);
+       int (*ref_sync_get)(const struct dpll_pin *pin, void *pin_priv,
+                           const struct dpll_pin *ref_sync_pin,
+                           void *ref_sync_pin_priv,
+                           enum dpll_pin_state *state,
+                           struct netlink_ext_ack *extack);
 };
 
 struct dpll_pin_frequency {
@@ -202,6 +212,9 @@ int dpll_pin_on_pin_register(struct dpll_pin *parent, struct dpll_pin *pin,
 void dpll_pin_on_pin_unregister(struct dpll_pin *parent, struct dpll_pin *pin,
                                const struct dpll_pin_ops *ops, void *priv);
 
+int dpll_pin_ref_sync_pair_add(struct dpll_pin *pin,
+                              struct dpll_pin *ref_sync_pin);
+
 int dpll_device_change_ntf(struct dpll_device *dpll);
 
 int dpll_pin_change_ntf(struct dpll_pin *pin);