aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@hovoldconsulting.com>2016-07-20 16:40:22 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2016-07-20 10:16:54 -0700
commit3e93cb6abbc023aebf311618481263e000bf26fb (patch)
treea40c0f73179ca0fea48971faaf220918ca45846c
parentgreybus: interface: do not read DME during reactivation (diff)
downloadlinux-dev-3e93cb6abbc023aebf311618481263e000bf26fb.tar.xz
linux-dev-3e93cb6abbc023aebf311618481263e000bf26fb.zip
greybus: interface: clean up ES3 activation-retry hack
Clean up the ES3 activation retry-hack and isolate it in the interface code. This way the retry hack can be reused when we soon start allowing interfaces to be reactivated after having been powered down. Reviewed-by: Sandeep Patil <sspatil@google.com> Signed-off-by: Johan Hovold <johan@hovoldconsulting.com> Reviewed-by: Alex Elder <elder@linaro.org> Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org> Reviewed-by: Patrick Titiano <ptitiano@baylibre.com> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
-rw-r--r--drivers/staging/greybus/interface.c40
-rw-r--r--drivers/staging/greybus/module.c20
2 files changed, 33 insertions, 27 deletions
diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c
index 9fe6764a6ac2..8e1b6c017c81 100644
--- a/drivers/staging/greybus/interface.c
+++ b/drivers/staging/greybus/interface.c
@@ -844,8 +844,8 @@ static int gb_interface_activate_operation(struct gb_interface *intf)
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;
@@ -865,12 +865,7 @@ static int gb_interface_hibernate_link(struct gb_interface *intf)
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)
{
int ret;
@@ -920,6 +915,35 @@ err_vsys_disable:
}
/*
+ * Activate an interface.
+ *
+ * Locking: Caller holds the interface mutex.
+ */
+int gb_interface_activate(struct gb_interface *intf)
+{
+ int retries = 3;
+ int 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?
+ */
+ while (retries--) {
+ ret = _gb_interface_activate(intf);
+ if (ret == -ENODEV && intf->type == GB_SVC_INTF_TYPE_UNIPRO)
+ continue;
+
+ break;
+ }
+
+ return ret;
+}
+
+/*
* Deactivate an interface.
*
* Locking: Caller holds the interface mutex.
diff --git a/drivers/staging/greybus/module.c b/drivers/staging/greybus/module.c
index 3ae58768cc87..d506fa0b3272 100644
--- a/drivers/staging/greybus/module.c
+++ b/drivers/staging/greybus/module.c
@@ -143,15 +143,10 @@ static void gb_module_register_interface(struct gb_interface *intf)
struct gb_module *module = intf->module;
u8 intf_id = intf->interface_id;
int ret;
- int retries = 3;
mutex_lock(&intf->mutex);
- while (retries--) {
- ret = gb_interface_activate(intf);
- if (ret != -EAGAIN)
- break;
- }
+ ret = gb_interface_activate(intf);
if (ret) {
if (intf->type != GB_INTERFACE_TYPE_DUMMY) {
dev_err(&module->dev,
@@ -159,19 +154,6 @@ static void gb_module_register_interface(struct gb_interface *intf)
intf_id, ret);
}
- /*
- * -EAGAIN indicates that the Greybus operation
- * interface_activate determined the remote interface to be
- * UniPro-only. 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. If we exhause our
- * retries trying to activate such an interface, convert
- * the error code back into a "no device" error.
- */
- if (ret == -EAGAIN)
- ret = -ENODEV;
-
gb_interface_add(intf);
goto err_unlock;
}