Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / drivers / staging / greybus / svc.c

diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c
index 1170515..550055e 100644 (file)
--- a/drivers/staging/greybus/svc.c
+++ b/drivers/staging/greybus/svc.c
@@ -14,7 +14,7 @@
 
 #define SVC_INTF_EJECT_TIMEOUT         9000
 #define SVC_INTF_ACTIVATE_TIMEOUT      6000
-#define SVC_INTF_RESUME_TIMEOUT        3000
+#define SVC_INTF_RESUME_TIMEOUT                3000
 
 struct gb_svc_deferred_request {
        struct work_struct work;
@@ -447,7 +447,6 @@ int gb_svc_dme_peer_get(struct gb_svc *svc, u8 intf_id, u16 attr, u16 selector,
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(gb_svc_dme_peer_get);
 
 int gb_svc_dme_peer_set(struct gb_svc *svc, u8 intf_id, u16 attr, u16 selector,
                        u32 value)
@@ -480,7 +479,6 @@ int gb_svc_dme_peer_set(struct gb_svc *svc, u8 intf_id, u16 attr, u16 selector,
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(gb_svc_dme_peer_set);
 
 int gb_svc_connection_create(struct gb_svc *svc,
                                u8 intf1_id, u16 cport1_id,
@@ -499,7 +497,6 @@ int gb_svc_connection_create(struct gb_svc *svc,
        return gb_operation_sync(svc->connection, GB_SVC_TYPE_CONN_CREATE,
                                 &request, sizeof(request), NULL, 0);
 }
-EXPORT_SYMBOL_GPL(gb_svc_connection_create);
 
 void gb_svc_connection_destroy(struct gb_svc *svc, u8 intf1_id, u16 cport1_id,
                               u8 intf2_id, u16 cport2_id)
@@ -520,7 +517,6 @@ void gb_svc_connection_destroy(struct gb_svc *svc, u8 intf1_id, u16 cport1_id,
                                intf1_id, cport1_id, intf2_id, cport2_id, ret);
        }
 }
-EXPORT_SYMBOL_GPL(gb_svc_connection_destroy);
 
 int gb_svc_timesync_enable(struct gb_svc *svc, u8 count, u64 frame_time,
                           u32 strobe_delay, u32 refclk)
@@ -536,7 +532,6 @@ int gb_svc_timesync_enable(struct gb_svc *svc, u8 count, u64 frame_time,
                                 GB_SVC_TYPE_TIMESYNC_ENABLE,
                                 &request, sizeof(request), NULL, 0);
 }
-EXPORT_SYMBOL_GPL(gb_svc_timesync_enable);
 
 int gb_svc_timesync_disable(struct gb_svc *svc)
 {
@@ -546,7 +541,6 @@ int gb_svc_timesync_disable(struct gb_svc *svc)
                                 GB_SVC_TYPE_TIMESYNC_DISABLE,
                                 NULL, 0, NULL, 0);
 }
-EXPORT_SYMBOL_GPL(gb_svc_timesync_disable);
 
 int gb_svc_timesync_authoritative(struct gb_svc *svc, u64 *frame_time)
 {
@@ -564,7 +558,6 @@ int gb_svc_timesync_authoritative(struct gb_svc *svc, u64 *frame_time)
                frame_time[i] = le64_to_cpu(response.frame_time[i]);
        return 0;
 }
-EXPORT_SYMBOL_GPL(gb_svc_timesync_authoritative);
 
 int gb_svc_timesync_ping(struct gb_svc *svc, u64 *frame_time)
 {
@@ -582,7 +575,6 @@ int gb_svc_timesync_ping(struct gb_svc *svc, u64 *frame_time)
        *frame_time = le64_to_cpu(response.frame_time);
        return 0;
 }
-EXPORT_SYMBOL_GPL(gb_svc_timesync_ping);
 
 int gb_svc_timesync_wake_pins_acquire(struct gb_svc *svc, u32 strobe_mask)
 {
@@ -595,7 +587,6 @@ int gb_svc_timesync_wake_pins_acquire(struct gb_svc *svc, u32 strobe_mask)
                                 &request, sizeof(request),
                                 NULL, 0);
 }
-EXPORT_SYMBOL_GPL(gb_svc_timesync_wake_pins_acquire);
 
 int gb_svc_timesync_wake_pins_release(struct gb_svc *svc)
 {
@@ -605,7 +596,6 @@ int gb_svc_timesync_wake_pins_release(struct gb_svc *svc)
                                 GB_SVC_TYPE_TIMESYNC_WAKE_PINS_RELEASE,
                                 NULL, 0, NULL, 0);
 }
-EXPORT_SYMBOL_GPL(gb_svc_timesync_wake_pins_release);
 
 /* Creates bi-directional routes between the devices */
 int gb_svc_route_create(struct gb_svc *svc, u8 intf1_id, u8 dev1_id,
@@ -728,7 +718,6 @@ int gb_svc_ping(struct gb_svc *svc)
                                         NULL, 0, NULL, 0,
                                         GB_OPERATION_TIMEOUT_DEFAULT * 2);
 }
-EXPORT_SYMBOL_GPL(gb_svc_ping);
 
 static int gb_svc_version_request(struct gb_operation *op)
 {
@@ -1112,6 +1101,37 @@ static void gb_svc_process_module_removed(struct gb_operation *operation)
        gb_module_put(module);
 }
 
+static void gb_svc_process_intf_oops(struct gb_operation *operation)
+{
+       struct gb_svc_intf_oops_request *request;
+       struct gb_connection *connection = operation->connection;
+       struct gb_svc *svc = gb_connection_get_data(connection);
+       struct gb_interface *intf;
+       u8 intf_id;
+       u8 reason;
+
+       /* The request message size has already been verified. */
+       request = operation->request->payload;
+       intf_id = request->intf_id;
+       reason = request->reason;
+
+       intf = gb_svc_interface_lookup(svc, intf_id);
+       if (!intf) {
+               dev_warn(&svc->dev, "unexpected interface-oops event %u\n",
+                        intf_id);
+               return;
+       }
+
+       dev_info(&svc->dev, "Deactivating interface %u, interface oops reason = %u\n",
+                intf_id, reason);
+
+       mutex_lock(&intf->mutex);
+       intf->disconnected = true;
+       gb_interface_disable(intf);
+       gb_interface_deactivate(intf);
+       mutex_unlock(&intf->mutex);
+}
+
 static void gb_svc_process_intf_mailbox_event(struct gb_operation *operation)
 {
        struct gb_svc_intf_mailbox_event_request *request;
@@ -1165,6 +1185,9 @@ static void gb_svc_process_deferred_request(struct work_struct *work)
        case GB_SVC_TYPE_INTF_MAILBOX_EVENT:
                gb_svc_process_intf_mailbox_event(operation);
                break;
+       case GB_SVC_TYPE_INTF_OOPS:
+               gb_svc_process_intf_oops(operation);
+               break;
        default:
                dev_err(&svc->dev, "bad deferred request type: 0x%02x\n", type);
        }
@@ -1251,6 +1274,20 @@ static int gb_svc_module_removed_recv(struct gb_operation *op)
        return gb_svc_queue_deferred_request(op);
 }
 
+static int gb_svc_intf_oops_recv(struct gb_operation *op)
+{
+       struct gb_svc *svc = gb_connection_get_data(op->connection);
+       struct gb_svc_intf_oops_request *request;
+
+       if (op->request->payload_size < sizeof(*request)) {
+               dev_warn(&svc->dev, "short intf-oops request received (%zu < %zu)\n",
+                        op->request->payload_size, sizeof(*request));
+               return -EINVAL;
+       }
+
+       return gb_svc_queue_deferred_request(op);
+}
+
 static int gb_svc_intf_mailbox_event_recv(struct gb_operation *op)
 {
        struct gb_svc *svc = gb_connection_get_data(op->connection);
@@ -1326,6 +1363,8 @@ static int gb_svc_request_handler(struct gb_operation *op)
                return gb_svc_module_removed_recv(op);
        case GB_SVC_TYPE_INTF_MAILBOX_EVENT:
                return gb_svc_intf_mailbox_event_recv(op);
+       case GB_SVC_TYPE_INTF_OOPS:
+               return gb_svc_intf_oops_recv(op);
        default:
                dev_warn(&svc->dev, "unsupported request 0x%02x\n", type);
                return -EINVAL;