diff options
| author | David Lin <dtwlin@google.com> | 2016-07-07 22:07:00 -0500 |
|---|---|---|
| committer | Alex Elder <elder@linaro.org> | 2016-07-08 14:56:28 -0500 |
| commit | 385227fce67959a1ab2094fdc9afb78ac19a0dfe (patch) | |
| tree | 58fa97753e0262d09faef9d96f16ca04dbb937ab /drivers | |
| parent | 30ea26bdd403396c62d6c9fa26477ca1f7af5676 (diff) | |
| download | op-kernel-dev-385227fce67959a1ab2094fdc9afb78ac19a0dfe.zip op-kernel-dev-385227fce67959a1ab2094fdc9afb78ac19a0dfe.tar.gz | |
greybus: control: add interface hibernate abort operation
Add the AP implementation for the Greybus Control Hibernate Abort
Operation. AP may use this Operation to abort a previous Control
Interface Suspend or Control Interface Deactivate Prepare Operation.
Signed-off-by: David Lin <dtwlin@google.com>
Reviewed-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Alex Elder <elder@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/greybus/control.c | 24 | ||||
| -rw-r--r-- | drivers/staging/greybus/control.h | 1 | ||||
| -rw-r--r-- | drivers/staging/greybus/greybus_protocols.h | 1 |
3 files changed, 26 insertions, 0 deletions
diff --git a/drivers/staging/greybus/control.c b/drivers/staging/greybus/control.c index a1c78fc6..55bb465 100644 --- a/drivers/staging/greybus/control.c +++ b/drivers/staging/greybus/control.c @@ -406,6 +406,30 @@ int gb_control_interface_deactivate_prepare(struct gb_control *control) return 0; } +int gb_control_interface_hibernate_abort(struct gb_control *control) +{ + struct gb_control_intf_pm_response response; + int ret; + + ret = gb_operation_sync(control->connection, + GB_CONTROL_TYPE_INTF_HIBERNATE_ABORT, NULL, 0, + &response, sizeof(response)); + if (ret) { + dev_err(&control->dev, + "failed to send interface aborting hibernate: %d\n", + ret); + return ret; + } + + if (response.status != GB_CONTROL_INTF_PM_OK) { + dev_err(&control->dev, "interface error while aborting hibernate: %d\n", + response.status); + return gb_control_interface_pm_status_map(response.status); + } + + return 0; +} + static ssize_t vendor_string_show(struct device *dev, struct device_attribute *attr, char *buf) { diff --git a/drivers/staging/greybus/control.h b/drivers/staging/greybus/control.h index 2f76ae4..86a4902 100644 --- a/drivers/staging/greybus/control.h +++ b/drivers/staging/greybus/control.h @@ -58,4 +58,5 @@ int gb_control_bundle_deactivate(struct gb_control *control, u8 bundle_id); int gb_control_bundle_activate(struct gb_control *control, u8 bundle_id); int gb_control_interface_suspend_prepare(struct gb_control *control); int gb_control_interface_deactivate_prepare(struct gb_control *control); +int gb_control_interface_hibernate_abort(struct gb_control *control); #endif /* __CONTROL_H */ diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h index 10209ae..dfee737 100644 --- a/drivers/staging/greybus/greybus_protocols.h +++ b/drivers/staging/greybus/greybus_protocols.h @@ -132,6 +132,7 @@ struct gb_protocol_version_response { #define GB_CONTROL_TYPE_BUNDLE_ACTIVATE 0x12 #define GB_CONTROL_TYPE_INTF_SUSPEND_PREPARE 0x13 #define GB_CONTROL_TYPE_INTF_DEACTIVATE_PREPARE 0x14 +#define GB_CONTROL_TYPE_INTF_HIBERNATE_ABORT 0x15 struct gb_control_version_request { __u8 major; |
