dpll: zl3073x: Implement input pin selection in manual mode

Implement input pin state setting if the DPLL is running in manual mode.
The driver indicates manual mode if the DPLL mode is one of ref-lock,
forced-holdover, freerun.

Use these modes to implement input pin state change between connected
and disconnected states. When the user set the particular pin as
connected the driver marks this input pin as forced reference and
switches the DPLL mode to ref-lock. When the use set the pin as
disconnected the driver switches the DPLL to freerun or forced holdover
mode. The switch to holdover mode is done if the DPLL has holdover
capability (e.g is currently locked with holdover acquired).

Signed-off-by: Ivan Vecera <ivecera@redhat.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Link: https://patch.msgid.link/20250704182202.1641943-10-ivecera@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/dpll/zl3073x/dpll.c b/drivers/dpll/zl3073x/dpll.c
index d1656095b4d3fdf0d5bed85c13cbfe952c670274..70c452a877ef400177b4b59d59121da0f187d991 100644 (file)
--- a/drivers/dpll/zl3073x/dpll.c
+++ b/drivers/dpll/zl3073x/dpll.c
@@ -132,6 +132,81 @@ zl3073x_dpll_selected_ref_get(struct zl3073x_dpll *zldpll, u8 *ref)
        return 0;
 }
 
+/**
+ * zl3073x_dpll_selected_ref_set - select reference in manual mode
+ * @zldpll: pointer to zl3073x_dpll
+ * @ref: input reference to be selected
+ *
+ * Selects the given reference for the DPLL channel it should be
+ * locked to.
+ *
+ * Return: 0 on success, <0 on error
+ */
+static int
+zl3073x_dpll_selected_ref_set(struct zl3073x_dpll *zldpll, u8 ref)
+{
+       struct zl3073x_dev *zldev = zldpll->dev;
+       u8 mode, mode_refsel;
+       int rc;
+
+       mode = zldpll->refsel_mode;
+
+       switch (mode) {
+       case ZL_DPLL_MODE_REFSEL_MODE_REFLOCK:
+               /* Manual mode with ref selected */
+               if (ref == ZL3073X_DPLL_REF_NONE) {
+                       switch (zldpll->lock_status) {
+                       case DPLL_LOCK_STATUS_LOCKED_HO_ACQ:
+                       case DPLL_LOCK_STATUS_HOLDOVER:
+                               /* Switch to forced holdover */
+                               mode = ZL_DPLL_MODE_REFSEL_MODE_HOLDOVER;
+                               break;
+                       default:
+                               /* Switch to freerun */
+                               mode = ZL_DPLL_MODE_REFSEL_MODE_FREERUN;
+                               break;
+                       }
+                       /* Keep selected reference */
+                       ref = zldpll->forced_ref;
+               } else if (ref == zldpll->forced_ref) {
+                       /* No register update - same mode and same ref */
+                       return 0;
+               }
+               break;
+       case ZL_DPLL_MODE_REFSEL_MODE_FREERUN:
+       case ZL_DPLL_MODE_REFSEL_MODE_HOLDOVER:
+               /* Manual mode without no ref */
+               if (ref == ZL3073X_DPLL_REF_NONE)
+                       /* No register update - keep current mode */
+                       return 0;
+
+               /* Switch to reflock mode and update ref selection */
+               mode = ZL_DPLL_MODE_REFSEL_MODE_REFLOCK;
+               break;
+       default:
+               /* For other modes like automatic or NCO ref cannot be selected
+                * manually
+                */
+               return -EOPNOTSUPP;
+       }
+
+       /* Build mode_refsel value */
+       mode_refsel = FIELD_PREP(ZL_DPLL_MODE_REFSEL_MODE, mode) |
+                     FIELD_PREP(ZL_DPLL_MODE_REFSEL_REF, ref);
+
+       /* Update dpll_mode_refsel register */
+       rc = zl3073x_write_u8(zldev, ZL_REG_DPLL_MODE_REFSEL(zldpll->id),
+                             mode_refsel);
+       if (rc)
+               return rc;
+
+       /* Store new mode and forced reference */
+       zldpll->refsel_mode = mode;
+       zldpll->forced_ref = ref;
+
+       return rc;
+}
+
 /**
  * zl3073x_dpll_connected_ref_get - get currently connected reference
  * @zldpll: pointer to zl3073x_dpll
@@ -283,6 +358,48 @@ zl3073x_dpll_input_pin_state_on_dpll_get(const struct dpll_pin *dpll_pin,
        return zl3073x_dpll_ref_state_get(pin, state);
 }
 
+static int
+zl3073x_dpll_input_pin_state_on_dpll_set(const struct dpll_pin *dpll_pin,
+                                        void *pin_priv,
+                                        const struct dpll_device *dpll,
+                                        void *dpll_priv,
+                                        enum dpll_pin_state state,
+                                        struct netlink_ext_ack *extack)
+{
+       struct zl3073x_dpll *zldpll = dpll_priv;
+       struct zl3073x_dpll_pin *pin = pin_priv;
+       u8 new_ref;
+       int rc;
+
+       switch (zldpll->refsel_mode) {
+       case ZL_DPLL_MODE_REFSEL_MODE_REFLOCK:
+       case ZL_DPLL_MODE_REFSEL_MODE_FREERUN:
+       case ZL_DPLL_MODE_REFSEL_MODE_HOLDOVER:
+               if (state == DPLL_PIN_STATE_CONNECTED) {
+                       /* Choose the pin as new selected reference */
+                       new_ref = zl3073x_input_pin_ref_get(pin->id);
+               } else if (state == DPLL_PIN_STATE_DISCONNECTED) {
+                       /* No reference */
+                       new_ref = ZL3073X_DPLL_REF_NONE;
+               } else {
+                       NL_SET_ERR_MSG_MOD(extack,
+                                          "Invalid pin state for manual mode");
+                       return -EINVAL;
+               }
+
+               rc = zl3073x_dpll_selected_ref_set(zldpll, new_ref);
+               break;
+       default:
+               /* In other modes we cannot change input reference */
+               NL_SET_ERR_MSG(extack,
+                              "Pin state cannot be changed in current mode");
+               rc = -EOPNOTSUPP;
+               break;
+       }
+
+       return rc;
+}
+
 static int
 zl3073x_dpll_output_pin_state_on_dpll_get(const struct dpll_pin *dpll_pin,
                                          void *pin_priv,
@@ -377,6 +494,7 @@ zl3073x_dpll_mode_get(const struct dpll_device *dpll, void *dpll_priv,
 static const struct dpll_pin_ops zl3073x_dpll_input_pin_ops = {
        .direction_get = zl3073x_dpll_pin_direction_get,
        .state_on_dpll_get = zl3073x_dpll_input_pin_state_on_dpll_get,
+       .state_on_dpll_set = zl3073x_dpll_input_pin_state_on_dpll_set,
 };
 
 static const struct dpll_pin_ops zl3073x_dpll_output_pin_ops = {

diff --git a/drivers/dpll/zl3073x/prop.c b/drivers/dpll/zl3073x/prop.c
index bc8b78cfb5ae0835d38b55a11591e1f1c1529f6f..c3224e78cbf019d3be122eb771de4efc77f12b0a 100644 (file)
--- a/drivers/dpll/zl3073x/prop.c
+++ b/drivers/dpll/zl3073x/prop.c
@@ -201,11 +201,14 @@ struct zl3073x_pin_props *zl3073x_pin_props_get(struct zl3073x_dev *zldev,
        if (!props)
                return ERR_PTR(-ENOMEM);
 
-       /* Set default pin type */
-       if (dir == DPLL_PIN_DIRECTION_INPUT)
+       /* Set default pin type and capabilities */
+       if (dir == DPLL_PIN_DIRECTION_INPUT) {
                props->dpll_props.type = DPLL_PIN_TYPE_EXT;
-       else
+               props->dpll_props.capabilities =
+                       DPLL_PIN_CAPABILITIES_STATE_CAN_CHANGE;
+       } else {
                props->dpll_props.type = DPLL_PIN_TYPE_GNSS;
+       }
 
        props->dpll_props.phase_range.min = S32_MIN;
        props->dpll_props.phase_range.max = S32_MAX;