greybus: replace Ara references
[cascardo/linux.git] / drivers / staging / greybus / interface.c
index 9b90209..19f5c71 100644 (file)
@@ -7,6 +7,8 @@
  * Released under the GPLv2 only.
  */
 
+#include <linux/delay.h>
+
 #include "greybus.h"
 #include "greybus_trace.h"
 
 
 #define GB_INTERFACE_DEVICE_ID_BAD     0xff
 
+#define GB_INTERFACE_AUTOSUSPEND_MS                    3000
+
+/* Time required for interface to enter standby before disabling REFCLK */
+#define GB_INTERFACE_SUSPEND_HIBERNATE_DELAY_MS                        20
+
 /* Don't-care selector index */
 #define DME_SELECTOR_INDEX_NULL                0
 
 #define DME_DDBL1_MANUFACTURERID       0x5003
 #define DME_DDBL1_PRODUCTID            0x5004
 
-#define DME_TOSHIBA_ARA_VID            0x6000
-#define DME_TOSHIBA_ARA_PID            0x6001
-#define DME_TOSHIBA_ARA_SN0            0x6002
-#define DME_TOSHIBA_ARA_SN1            0x6003
-#define DME_TOSHIBA_ARA_INIT_STATUS    0x6101
+#define DME_TOSHIBA_GMP_VID            0x6000
+#define DME_TOSHIBA_GMP_PID            0x6001
+#define DME_TOSHIBA_GMP_SN0            0x6002
+#define DME_TOSHIBA_GMP_SN1            0x6003
+#define DME_TOSHIBA_GMP_INIT_STATUS    0x6101
 
 /* DDBL1 Manufacturer and Product ids */
 #define TOSHIBA_DMID                   0x0126
@@ -36,6 +43,8 @@
 #define TOSHIBA_ES3_APBRIDGE_DPID      0x1001
 #define TOSHIBA_ES3_GBPHY_DPID 0x1002
 
+static int gb_interface_hibernate_link(struct gb_interface *intf);
+static int gb_interface_refclk_set(struct gb_interface *intf, bool enable);
 
 static int gb_interface_dme_attr_get(struct gb_interface *intf,
                                                        u16 attr, u32 *val)
@@ -51,7 +60,7 @@ static int gb_interface_read_ara_dme(struct gb_interface *intf)
 
        /*
         * Unless this is a Toshiba bridge, bail out until we have defined
-        * standard Ara attributes.
+        * standard GMP attributes.
         */
        if (intf->ddbl1_manufacturer_id != TOSHIBA_DMID) {
                dev_err(&intf->dev, "unknown manufacturer %08x\n",
@@ -59,21 +68,21 @@ static int gb_interface_read_ara_dme(struct gb_interface *intf)
                return -ENODEV;
        }
 
-       ret = gb_interface_dme_attr_get(intf, DME_TOSHIBA_ARA_VID,
+       ret = gb_interface_dme_attr_get(intf, DME_TOSHIBA_GMP_VID,
                                        &intf->vendor_id);
        if (ret)
                return ret;
 
-       ret = gb_interface_dme_attr_get(intf, DME_TOSHIBA_ARA_PID,
+       ret = gb_interface_dme_attr_get(intf, DME_TOSHIBA_GMP_PID,
                                        &intf->product_id);
        if (ret)
                return ret;
 
-       ret = gb_interface_dme_attr_get(intf, DME_TOSHIBA_ARA_SN0, &sn0);
+       ret = gb_interface_dme_attr_get(intf, DME_TOSHIBA_GMP_SN0, &sn0);
        if (ret)
                return ret;
 
-       ret = gb_interface_dme_attr_get(intf, DME_TOSHIBA_ARA_SN1, &sn1);
+       ret = gb_interface_dme_attr_get(intf, DME_TOSHIBA_GMP_SN1, &sn1);
        if (ret)
                return ret;
 
@@ -86,6 +95,10 @@ static int gb_interface_read_dme(struct gb_interface *intf)
 {
        int ret;
 
+       /* DME attributes have already been read */
+       if (intf->dme_read)
+               return 0;
+
        ret = gb_interface_dme_attr_get(intf, DME_DDBL1_MANUFACTURERID,
                                        &intf->ddbl1_manufacturer_id);
        if (ret)
@@ -98,11 +111,17 @@ static int gb_interface_read_dme(struct gb_interface *intf)
 
        if (intf->ddbl1_manufacturer_id == TOSHIBA_DMID &&
                        intf->ddbl1_product_id == TOSHIBA_ES2_BRIDGE_DPID) {
-               intf->quirks |= GB_INTERFACE_QUIRK_NO_ARA_IDS;
+               intf->quirks |= GB_INTERFACE_QUIRK_NO_GMP_IDS;
                intf->quirks |= GB_INTERFACE_QUIRK_NO_INIT_STATUS;
        }
 
-       return gb_interface_read_ara_dme(intf);
+       ret = gb_interface_read_ara_dme(intf);
+       if (ret)
+               return ret;
+
+       intf->dme_read = true;
+
+       return 0;
 }
 
 static int gb_interface_route_create(struct gb_interface *intf)
@@ -344,6 +363,7 @@ static int gb_interface_read_and_clear_init_status(struct gb_interface *intf)
 {
        struct gb_host_device *hd = intf->hd;
        unsigned long bootrom_quirks;
+       unsigned long s2l_quirks;
        int ret;
        u32 value;
        u16 attr;
@@ -357,7 +377,7 @@ static int gb_interface_read_and_clear_init_status(struct gb_interface *intf)
        if (intf->quirks & GB_INTERFACE_QUIRK_NO_INIT_STATUS)
                attr = DME_T_TST_SRC_INCREMENT;
        else
-               attr = DME_TOSHIBA_ARA_INIT_STATUS;
+               attr = DME_TOSHIBA_GMP_INIT_STATUS;
 
        ret = gb_svc_dme_peer_get(hd->svc, intf->interface_id, attr,
                                  DME_SELECTOR_INDEX_NULL, &value);
@@ -392,14 +412,24 @@ static int gb_interface_read_and_clear_init_status(struct gb_interface *intf)
         */
        bootrom_quirks = GB_INTERFACE_QUIRK_NO_CPORT_FEATURES |
                                GB_INTERFACE_QUIRK_FORCED_DISABLE |
-                               GB_INTERFACE_QUIRK_LEGACY_MODE_SWITCH;
+                               GB_INTERFACE_QUIRK_LEGACY_MODE_SWITCH |
+                               GB_INTERFACE_QUIRK_NO_BUNDLE_ACTIVATE;
+
+       s2l_quirks = GB_INTERFACE_QUIRK_NO_PM;
+
        switch (init_status) {
        case GB_INIT_BOOTROM_UNIPRO_BOOT_STARTED:
        case GB_INIT_BOOTROM_FALLBACK_UNIPRO_BOOT_STARTED:
                intf->quirks |= bootrom_quirks;
                break;
+       case GB_INIT_S2_LOADER_BOOT_STARTED:
+               /* S2 Loader doesn't support runtime PM */
+               intf->quirks &= ~bootrom_quirks;
+               intf->quirks |= s2l_quirks;
+               break;
        default:
                intf->quirks &= ~bootrom_quirks;
+               intf->quirks &= ~s2l_quirks;
        }
 
        /* Clear the init status. */
@@ -482,19 +512,182 @@ static ssize_t power_now_show(struct device *dev,
 }
 static DEVICE_ATTR_RO(power_now);
 
-static struct attribute *interface_attrs[] = {
+static ssize_t power_state_show(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+       struct gb_interface *intf = to_gb_interface(dev);
+
+       if (intf->active)
+               return scnprintf(buf, PAGE_SIZE, "on\n");
+       else
+               return scnprintf(buf, PAGE_SIZE, "off\n");
+}
+
+static ssize_t power_state_store(struct device *dev,
+                                struct device_attribute *attr, const char *buf,
+                                size_t len)
+{
+       struct gb_interface *intf = to_gb_interface(dev);
+       bool activate;
+       int ret = 0;
+
+       if (kstrtobool(buf, &activate))
+               return -EINVAL;
+
+       mutex_lock(&intf->mutex);
+
+       if (activate == intf->active)
+               goto unlock;
+
+       if (activate) {
+               ret = gb_interface_activate(intf);
+               if (ret) {
+                       dev_err(&intf->dev,
+                               "failed to activate interface: %d\n", ret);
+                       goto unlock;
+               }
+
+               ret = gb_interface_enable(intf);
+               if (ret) {
+                       dev_err(&intf->dev,
+                               "failed to enable interface: %d\n", ret);
+                       gb_interface_deactivate(intf);
+                       goto unlock;
+               }
+       } else {
+               gb_interface_disable(intf);
+               gb_interface_deactivate(intf);
+       }
+
+unlock:
+       mutex_unlock(&intf->mutex);
+
+       if (ret)
+               return ret;
+
+       return len;
+}
+static DEVICE_ATTR_RW(power_state);
+
+static const char *gb_interface_type_string(struct gb_interface *intf)
+{
+       static const char * const types[] = {
+               [GB_INTERFACE_TYPE_INVALID] = "invalid",
+               [GB_INTERFACE_TYPE_UNKNOWN] = "unknown",
+               [GB_INTERFACE_TYPE_DUMMY] = "dummy",
+               [GB_INTERFACE_TYPE_UNIPRO] = "unipro",
+               [GB_INTERFACE_TYPE_GREYBUS] = "greybus",
+       };
+
+       return types[intf->type];
+}
+
+static ssize_t interface_type_show(struct device *dev,
+                                  struct device_attribute *attr, char *buf)
+{
+       struct gb_interface *intf = to_gb_interface(dev);
+
+       return sprintf(buf, "%s\n", gb_interface_type_string(intf));
+}
+static DEVICE_ATTR_RO(interface_type);
+
+static struct attribute *interface_unipro_attrs[] = {
        &dev_attr_ddbl1_manufacturer_id.attr,
        &dev_attr_ddbl1_product_id.attr,
-       &dev_attr_interface_id.attr,
+       NULL
+};
+
+static struct attribute *interface_greybus_attrs[] = {
        &dev_attr_vendor_id.attr,
        &dev_attr_product_id.attr,
        &dev_attr_serial_number.attr,
+       NULL
+};
+
+static struct attribute *interface_power_attrs[] = {
        &dev_attr_voltage_now.attr,
        &dev_attr_current_now.attr,
        &dev_attr_power_now.attr,
-       NULL,
+       &dev_attr_power_state.attr,
+       NULL
+};
+
+static struct attribute *interface_common_attrs[] = {
+       &dev_attr_interface_id.attr,
+       &dev_attr_interface_type.attr,
+       NULL
+};
+
+static umode_t interface_unipro_is_visible(struct kobject *kobj,
+                                               struct attribute *attr, int n)
+{
+       struct device *dev = container_of(kobj, struct device, kobj);
+       struct gb_interface *intf = to_gb_interface(dev);
+
+       switch (intf->type) {
+       case GB_INTERFACE_TYPE_UNIPRO:
+       case GB_INTERFACE_TYPE_GREYBUS:
+               return attr->mode;
+       default:
+               return 0;
+       }
+}
+
+static umode_t interface_greybus_is_visible(struct kobject *kobj,
+                                               struct attribute *attr, int n)
+{
+       struct device *dev = container_of(kobj, struct device, kobj);
+       struct gb_interface *intf = to_gb_interface(dev);
+
+       switch (intf->type) {
+       case GB_INTERFACE_TYPE_GREYBUS:
+               return attr->mode;
+       default:
+               return 0;
+       }
+}
+
+static umode_t interface_power_is_visible(struct kobject *kobj,
+                                               struct attribute *attr, int n)
+{
+       struct device *dev = container_of(kobj, struct device, kobj);
+       struct gb_interface *intf = to_gb_interface(dev);
+
+       switch (intf->type) {
+       case GB_INTERFACE_TYPE_UNIPRO:
+       case GB_INTERFACE_TYPE_GREYBUS:
+               return attr->mode;
+       default:
+               return 0;
+       }
+}
+
+static const struct attribute_group interface_unipro_group = {
+       .is_visible     = interface_unipro_is_visible,
+       .attrs          = interface_unipro_attrs,
+};
+
+static const struct attribute_group interface_greybus_group = {
+       .is_visible     = interface_greybus_is_visible,
+       .attrs          = interface_greybus_attrs,
+};
+
+static const struct attribute_group interface_power_group = {
+       .is_visible     = interface_power_is_visible,
+       .attrs          = interface_power_attrs,
+};
+
+static const struct attribute_group interface_common_group = {
+       .attrs          = interface_common_attrs,
+};
+
+static const struct attribute_group *interface_groups[] = {
+       &interface_unipro_group,
+       &interface_greybus_group,
+       &interface_power_group,
+       &interface_common_group,
+       NULL
 };
-ATTRIBUTE_GROUPS(interface);
 
 static void gb_interface_release(struct device *dev)
 {
@@ -505,13 +698,102 @@ static void gb_interface_release(struct device *dev)
        kfree(intf);
 }
 
+#ifdef CONFIG_PM_RUNTIME
+static int gb_interface_suspend(struct device *dev)
+{
+       struct gb_interface *intf = to_gb_interface(dev);
+       int ret, timesync_ret;
+
+       ret = gb_control_interface_suspend_prepare(intf->control);
+       if (ret)
+               return ret;
+
+       gb_timesync_interface_remove(intf);
+
+       ret = gb_control_suspend(intf->control);
+       if (ret)
+               goto err_hibernate_abort;
+
+       ret = gb_interface_hibernate_link(intf);
+       if (ret)
+               return ret;
+
+       /* Delay to allow interface to enter standby before disabling refclk */
+       msleep(GB_INTERFACE_SUSPEND_HIBERNATE_DELAY_MS);
+
+       ret = gb_interface_refclk_set(intf, false);
+       if (ret)
+               return ret;
+
+       return 0;
+
+err_hibernate_abort:
+       gb_control_interface_hibernate_abort(intf->control);
+
+       timesync_ret = gb_timesync_interface_add(intf);
+       if (timesync_ret) {
+               dev_err(dev, "failed to add to timesync: %d\n", timesync_ret);
+               return timesync_ret;
+       }
+
+       return ret;
+}
+
+static int gb_interface_resume(struct device *dev)
+{
+       struct gb_interface *intf = to_gb_interface(dev);
+       struct gb_svc *svc = intf->hd->svc;
+       int ret;
+
+       ret = gb_interface_refclk_set(intf, true);
+       if (ret)
+               return ret;
+
+       ret = gb_svc_intf_resume(svc, intf->interface_id);
+       if (ret)
+               return ret;
+
+       ret = gb_control_resume(intf->control);
+       if (ret)
+               return ret;
+
+       ret = gb_timesync_interface_add(intf);
+       if (ret) {
+               dev_err(dev, "failed to add to timesync: %d\n", ret);
+               return ret;
+       }
+
+       ret = gb_timesync_schedule_synchronous(intf);
+       if (ret) {
+               dev_err(dev, "failed to synchronize FrameTime: %d\n", ret);
+               return ret;
+       }
+
+       return 0;
+}
+
+static int gb_interface_runtime_idle(struct device *dev)
+{
+       pm_runtime_mark_last_busy(dev);
+       pm_request_autosuspend(dev);
+
+       return 0;
+}
+#endif
+
+static const struct dev_pm_ops gb_interface_pm_ops = {
+       SET_RUNTIME_PM_OPS(gb_interface_suspend, gb_interface_resume,
+                          gb_interface_runtime_idle)
+};
+
 struct device_type greybus_interface_type = {
        .name =         "greybus_interface",
        .release =      gb_interface_release,
+       .pm =           &gb_interface_pm_ops,
 };
 
 /*
- * A Greybus module represents a user-replaceable component on an Ara
+ * A Greybus module represents a user-replaceable component on a GMP
  * phone.  An interface is the physical connection on that module.  A
  * module may have more than one interface.
  *
@@ -553,6 +835,9 @@ struct gb_interface *gb_interface_create(struct gb_module *module,
        dev_set_name(&intf->dev, "%s.%u", dev_name(&module->dev),
                        interface_id);
 
+       pm_runtime_set_autosuspend_delay(&intf->dev,
+                                        GB_INTERFACE_AUTOSUSPEND_MS);
+
        trace_gb_interface_create(intf);
 
        return intf;
@@ -606,7 +891,8 @@ static int gb_interface_unipro_set(struct gb_interface *intf, bool enable)
        return 0;
 }
 
-static int gb_interface_activate_operation(struct gb_interface *intf)
+static int gb_interface_activate_operation(struct gb_interface *intf,
+                                          enum gb_interface_type *intf_type)
 {
        struct gb_svc *svc = intf->hd->svc;
        u8 type;
@@ -622,17 +908,20 @@ static int gb_interface_activate_operation(struct gb_interface *intf)
 
        switch (type) {
        case GB_SVC_INTF_TYPE_DUMMY:
-               dev_info(&intf->dev, "dummy interface detected\n");
+               *intf_type = GB_INTERFACE_TYPE_DUMMY;
                /* FIXME: handle as an error for now */
                return -ENODEV;
        case GB_SVC_INTF_TYPE_UNIPRO:
+               *intf_type = GB_INTERFACE_TYPE_UNIPRO;
                dev_err(&intf->dev, "interface type UniPro not supported\n");
-               /* FIXME: check if this is a Toshiba bridge before retrying? */
-               return -EAGAIN;
+               /* FIXME: handle as an error for now */
+               return -ENODEV;
        case GB_SVC_INTF_TYPE_GREYBUS:
+               *intf_type = GB_INTERFACE_TYPE_GREYBUS;
                break;
        default:
                dev_err(&intf->dev, "unknown interface type: %u\n", type);
+               *intf_type = GB_INTERFACE_TYPE_UNKNOWN;
                return -ENODEV;
        }
 
@@ -641,23 +930,19 @@ static int gb_interface_activate_operation(struct gb_interface *intf)
 
 static int gb_interface_hibernate_link(struct gb_interface *intf)
 {
-       dev_dbg(&intf->dev, "%s\n", __func__);
-
-       /* FIXME: implement */
+       struct gb_svc *svc = intf->hd->svc;
 
-       return 0;
+       return gb_svc_intf_set_power_mode_hibernate(svc, intf->interface_id);
 }
 
-/*
- * Activate an interface.
- *
- * Locking: Caller holds the interface mutex.
- */
-int gb_interface_activate(struct gb_interface *intf)
+static int _gb_interface_activate(struct gb_interface *intf,
+                                 enum gb_interface_type *type)
 {
        int ret;
 
-       if (intf->ejected)
+       *type = GB_INTERFACE_TYPE_UNKNOWN;
+
+       if (intf->ejected || intf->removed)
                return -ENODEV;
 
        ret = gb_interface_vsys_set(intf, true);
@@ -672,9 +957,16 @@ int gb_interface_activate(struct gb_interface *intf)
        if (ret)
                goto err_refclk_disable;
 
-       ret = gb_interface_activate_operation(intf);
-       if (ret)
-               goto err_unipro_disable;
+       ret = gb_interface_activate_operation(intf, type);
+       if (ret) {
+               switch (*type) {
+               case GB_INTERFACE_TYPE_UNIPRO:
+               case GB_INTERFACE_TYPE_GREYBUS:
+                       goto err_hibernate_link;
+               default:
+                       goto err_unipro_disable;
+               }
+       }
 
        ret = gb_interface_read_dme(intf);
        if (ret)
@@ -702,6 +994,66 @@ err_vsys_disable:
        return ret;
 }
 
+/*
+ * At present, we assume a UniPro-only module to be a Greybus module that
+ * failed to send its mailbox poke. There is some reason to believe that this
+ * is because of a bug in the ES3 bootrom.
+ *
+ * FIXME: Check if this is a Toshiba bridge before retrying?
+ */
+static int _gb_interface_activate_es3_hack(struct gb_interface *intf,
+                                          enum gb_interface_type *type)
+{
+       int retries = 3;
+       int ret;
+
+       while (retries--) {
+               ret = _gb_interface_activate(intf, type);
+               if (ret == -ENODEV && *type == GB_INTERFACE_TYPE_UNIPRO)
+                       continue;
+
+               break;
+       }
+
+       return ret;
+}
+
+/*
+ * Activate an interface.
+ *
+ * Locking: Caller holds the interface mutex.
+ */
+int gb_interface_activate(struct gb_interface *intf)
+{
+       enum gb_interface_type type;
+       int ret;
+
+       switch (intf->type) {
+       case GB_INTERFACE_TYPE_INVALID:
+       case GB_INTERFACE_TYPE_GREYBUS:
+               ret = _gb_interface_activate_es3_hack(intf, &type);
+               break;
+       default:
+               ret = _gb_interface_activate(intf, &type);
+       }
+
+       /* Make sure type is detected correctly during reactivation. */
+       if (intf->type != GB_INTERFACE_TYPE_INVALID) {
+               if (type != intf->type) {
+                       dev_err(&intf->dev, "failed to detect interface type\n");
+
+                       if (!ret)
+                               gb_interface_deactivate(intf);
+
+                       return -EIO;
+               }
+       } else {
+               intf->type = type;
+       }
+
+       return ret;
+}
+
 /*
  * Deactivate an interface.
  *
@@ -811,6 +1163,11 @@ int gb_interface_enable(struct gb_interface *intf)
                goto err_destroy_bundles;
        }
 
+       pm_runtime_use_autosuspend(&intf->dev);
+       pm_runtime_get_noresume(&intf->dev);
+       pm_runtime_set_active(&intf->dev);
+       pm_runtime_enable(&intf->dev);
+
        list_for_each_entry_safe_reverse(bundle, tmp, &intf->bundles, links) {
                ret = gb_bundle_add(bundle);
                if (ret) {
@@ -823,6 +1180,8 @@ int gb_interface_enable(struct gb_interface *intf)
 
        intf->enabled = true;
 
+       pm_runtime_put(&intf->dev);
+
        trace_gb_interface_enable(intf);
 
        return 0;
@@ -856,6 +1215,8 @@ void gb_interface_disable(struct gb_interface *intf)
 
        trace_gb_interface_disable(intf);
 
+       pm_runtime_get_sync(&intf->dev);
+
        /* Set disconnected flag to avoid I/O during connection tear down. */
        if (intf->quirks & GB_INTERFACE_QUIRK_FORCED_DISABLE)
                intf->disconnected = true;
@@ -863,6 +1224,9 @@ void gb_interface_disable(struct gb_interface *intf)
        list_for_each_entry_safe(bundle, next, &intf->bundles, links)
                gb_bundle_destroy(bundle);
 
+       if (!intf->mode_switch && !intf->disconnected)
+               gb_control_interface_deactivate_prepare(intf->control);
+
        gb_timesync_interface_remove(intf);
        gb_control_del(intf->control);
        gb_control_disable(intf->control);
@@ -870,61 +1234,34 @@ void gb_interface_disable(struct gb_interface *intf)
        intf->control = NULL;
 
        intf->enabled = false;
+
+       pm_runtime_disable(&intf->dev);
+       pm_runtime_set_suspended(&intf->dev);
+       pm_runtime_dont_use_autosuspend(&intf->dev);
+       pm_runtime_put_noidle(&intf->dev);
 }
 
-/*
- * Enable TimeSync on an Interface control connection.
- *
- * Locking: Takes and releases the interface mutex.
- */
+/* Enable TimeSync on an Interface control connection. */
 int gb_interface_timesync_enable(struct gb_interface *intf, u8 count,
                                 u64 frame_time, u32 strobe_delay, u32 refclk)
 {
-       int ret = -ENODEV;
-
-       mutex_lock(&intf->mutex);
-       if (intf->enabled) {
-               ret = gb_control_timesync_enable(intf->control, count,
-                                                frame_time, strobe_delay,
-                                                refclk);
-       }
-       mutex_unlock(&intf->mutex);
-       return ret;
+       return gb_control_timesync_enable(intf->control, count,
+                                         frame_time, strobe_delay,
+                                         refclk);
 }
 
-/*
- * Disable TimeSync on an Interface control connection.
- *
- * Locking: Takes and releases the interface mutex.
- */
+/* Disable TimeSync on an Interface control connection. */
 int gb_interface_timesync_disable(struct gb_interface *intf)
 {
-       int ret = -ENODEV;
-
-       mutex_lock(&intf->mutex);
-       if (intf->enabled)
-               ret = gb_control_timesync_disable(intf->control);
-       mutex_unlock(&intf->mutex);
-       return ret;
+       return gb_control_timesync_disable(intf->control);
 }
 
-/*
- * Transmit the Authoritative FrameTime via an Interface control connection.
- *
- * Locking: Takes and releases the interface mutex.
- */
+/* Transmit the Authoritative FrameTime via an Interface control connection. */
 int gb_interface_timesync_authoritative(struct gb_interface *intf,
                                        u64 *frame_time)
 {
-       int ret = -ENODEV;
-
-       mutex_lock(&intf->mutex);
-       if (intf->enabled) {
-               ret = gb_control_timesync_authoritative(intf->control,
-                                                       frame_time);
-       }
-       mutex_unlock(&intf->mutex);
-       return ret;
+       return gb_control_timesync_authoritative(intf->control,
+                                               frame_time);
 }
 
 /* Register an interface. */
@@ -940,10 +1277,22 @@ int gb_interface_add(struct gb_interface *intf)
 
        trace_gb_interface_add(intf);
 
-       dev_info(&intf->dev, "Interface added: VID=0x%08x, PID=0x%08x\n",
-                intf->vendor_id, intf->product_id);
-       dev_info(&intf->dev, "DDBL1 Manufacturer=0x%08x, Product=0x%08x\n",
-                intf->ddbl1_manufacturer_id, intf->ddbl1_product_id);
+       dev_info(&intf->dev, "Interface added (%s)\n",
+                       gb_interface_type_string(intf));
+
+       switch (intf->type) {
+       case GB_INTERFACE_TYPE_GREYBUS:
+               dev_info(&intf->dev, "GMP VID=0x%08x, PID=0x%08x\n",
+                               intf->vendor_id, intf->product_id);
+               /* fall-through */
+       case GB_INTERFACE_TYPE_UNIPRO:
+               dev_info(&intf->dev, "DDBL1 Manufacturer=0x%08x, Product=0x%08x\n",
+                               intf->ddbl1_manufacturer_id,
+                               intf->ddbl1_product_id);
+               break;
+       default:
+               break;
+       }
 
        return 0;
 }