* Released under the GPLv2 only.
*/
+#include <linux/workqueue.h>
+
#include "greybus.h"
+#define GB_CONNECTION_TS_KFIFO_ELEMENTS 2
+#define GB_CONNECTION_TS_KFIFO_LEN \
+ (GB_CONNECTION_TS_KFIFO_ELEMENTS * sizeof(struct timeval))
+
static DEFINE_SPINLOCK(gb_connections_lock);
/* This is only used at initialization time; no locking is required. */
static struct gb_connection *
-gb_connection_intf_find(struct greybus_host_device *hd, u16 cport_id)
+gb_connection_intf_find(struct gb_interface *intf, u16 cport_id)
{
+ struct greybus_host_device *hd = intf->hd;
struct gb_connection *connection;
list_for_each_entry(connection, &hd->connections, hd_links)
- if (connection->intf_cport_id == cport_id)
+ if (connection->bundle->intf == intf &&
+ connection->intf_cport_id == cport_id)
return connection;
return NULL;
}
}
EXPORT_SYMBOL_GPL(greybus_data_rcvd);
-/*
- * Allocate an available CPort Id for use for the host side of the
- * given connection. The lowest-available id is returned, so the
- * first call is guaranteed to allocate CPort Id 0.
- *
- * Assigns the connection's hd_cport_id and returns true if successful.
- * Returns false otherwise.
- */
-static bool gb_connection_hd_cport_id_alloc(struct gb_connection *connection)
-{
- struct ida *ida = &connection->hd->cport_id_map;
- int id;
-
- id = ida_simple_get(ida, 0, HOST_DEV_CPORT_ID_MAX, GFP_ATOMIC);
- if (id < 0)
- return false;
-
- connection->hd_cport_id = (u16)id;
-
- return true;
-}
-
-/*
- * Free a previously-allocated CPort Id on the given host device.
- */
-static void gb_connection_hd_cport_id_free(struct gb_connection *connection)
-{
- struct ida *ida = &connection->hd->cport_id_map;
-
- ida_simple_remove(ida, connection->hd_cport_id);
- connection->hd_cport_id = CPORT_ID_BAD;
-}
-
static ssize_t state_show(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct gb_connection *connection = to_gb_connection(dev);
+ enum gb_connection_state state;
- return sprintf(buf, "%d\n", connection->state);
+ spin_lock_irq(&connection->lock);
+ state = connection->state;
+ spin_unlock_irq(&connection->lock);
+
+ return sprintf(buf, "%d\n", state);
}
static DEVICE_ATTR_RO(state);
{
struct gb_connection *connection = to_gb_connection(dev);
- return sprintf(buf, "%d\n", connection->protocol->id);
+ if (connection->protocol)
+ return sprintf(buf, "%d\n", connection->protocol->id);
+ else
+ return -EINVAL;
}
static DEVICE_ATTR_RO(protocol_id);
+static ssize_t
+ap_cport_id_show(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ struct gb_connection *connection = to_gb_connection(dev);
+ return sprintf(buf, "%hu\n", connection->hd_cport_id);
+}
+static DEVICE_ATTR_RO(ap_cport_id);
+
static struct attribute *connection_attrs[] = {
&dev_attr_state.attr,
&dev_attr_protocol_id.attr,
+ &dev_attr_ap_cport_id.attr,
NULL,
};
{
struct gb_connection *connection = to_gb_connection(dev);
+ destroy_workqueue(connection->wq);
kfree(connection);
}
};
-void gb_connection_bind_protocol(struct gb_connection *connection)
+int svc_update_connection(struct gb_interface *intf,
+ struct gb_connection *connection)
{
struct gb_bundle *bundle;
- struct gb_protocol *protocol;
- /* If we already have a protocol bound here, just return */
- if (connection->protocol)
- return;
+ bundle = gb_bundle_create(intf, GB_SVC_BUNDLE_ID, GREYBUS_CLASS_SVC);
+ if (!bundle)
+ return -EINVAL;
- protocol = gb_protocol_get(connection->protocol_id,
- connection->major,
- connection->minor);
- if (!protocol)
- return;
- connection->protocol = protocol;
+ device_del(&connection->dev);
+ connection->bundle = bundle;
+ connection->dev.parent = &bundle->dev;
+ dev_set_name(&connection->dev, "%s:%d", dev_name(&bundle->dev),
+ GB_SVC_CPORT_ID);
- /*
- * If we have a valid device_id for the bundle, then we have an active
- * device, so bring up the connection at the same time.
- * */
- bundle = connection->bundle;
- if (bundle->device_id != GB_DEVICE_ID_BAD)
- gb_connection_init(connection);
+ WARN_ON(device_add(&connection->dev));
+
+ spin_lock_irq(&gb_connections_lock);
+ list_add(&connection->bundle_links, &bundle->connections);
+ spin_unlock_irq(&gb_connections_lock);
+
+ return 0;
}
/*
* Returns a pointer to the new connection if successful, or a null
* pointer otherwise.
*/
-struct gb_connection *gb_connection_create(struct gb_bundle *bundle,
- u16 cport_id, u8 protocol_id)
+struct gb_connection *
+gb_connection_create_range(struct greybus_host_device *hd,
+ struct gb_bundle *bundle, struct device *parent,
+ u16 cport_id, u8 protocol_id, u32 ida_start,
+ u32 ida_end)
{
struct gb_connection *connection;
- struct greybus_host_device *hd = bundle->intf->hd;
+ struct ida *id_map = &hd->cport_id_map;
+ int hd_cport_id;
int retval;
u8 major = 0;
u8 minor = 1;
* initialize connections serially so we don't need to worry
* about holding the connection lock.
*/
- if (gb_connection_intf_find(hd, cport_id)) {
+ if (bundle && gb_connection_intf_find(bundle->intf, cport_id)) {
pr_err("duplicate interface cport id 0x%04hx\n", cport_id);
return NULL;
}
+ hd_cport_id = ida_simple_get(id_map, ida_start, ida_end, GFP_KERNEL);
+ if (hd_cport_id < 0)
+ return NULL;
+
connection = kzalloc(sizeof(*connection), GFP_KERNEL);
if (!connection)
- return NULL;
+ goto err_remove_ida;
+ connection->hd_cport_id = hd_cport_id;
+ connection->intf_cport_id = cport_id;
connection->hd = hd;
+
connection->protocol_id = protocol_id;
connection->major = major;
connection->minor = minor;
- if (!gb_connection_hd_cport_id_alloc(connection)) {
- gb_protocol_put(connection->protocol);
- kfree(connection);
- return NULL;
- }
connection->bundle = bundle;
- connection->intf_cport_id = cport_id;
connection->state = GB_CONNECTION_STATE_DISABLED;
- connection->dev.parent = &bundle->dev;
+ atomic_set(&connection->op_cycle, 0);
+ spin_lock_init(&connection->lock);
+ INIT_LIST_HEAD(&connection->operations);
+
+ connection->wq = alloc_workqueue("%s:%d", WQ_UNBOUND, 1,
+ dev_name(parent), cport_id);
+ if (!connection->wq)
+ goto err_free_connection;
+
+ connection->dev.parent = parent;
connection->dev.bus = &greybus_bus_type;
connection->dev.type = &greybus_connection_type;
connection->dev.groups = connection_groups;
device_initialize(&connection->dev);
dev_set_name(&connection->dev, "%s:%d",
- dev_name(&bundle->dev), cport_id);
+ dev_name(parent), cport_id);
retval = device_add(&connection->dev);
if (retval) {
+ connection->hd_cport_id = CPORT_ID_BAD;
+ put_device(&connection->dev);
+
pr_err("failed to add connection device for cport 0x%04hx\n",
cport_id);
- gb_connection_hd_cport_id_free(connection);
- gb_protocol_put(connection->protocol);
- put_device(&connection->dev);
- return NULL;
+ goto err_remove_ida;
}
- /* XXX Will have to establish connections to get version */
- gb_connection_bind_protocol(connection);
- if (!connection->protocol)
- dev_warn(&bundle->dev,
- "protocol 0x%02hhx handler not found\n", protocol_id);
-
spin_lock_irq(&gb_connections_lock);
list_add(&connection->hd_links, &hd->connections);
- list_add(&connection->bundle_links, &bundle->connections);
+
+ if (bundle)
+ list_add(&connection->bundle_links, &bundle->connections);
+ else
+ INIT_LIST_HEAD(&connection->bundle_links);
+
spin_unlock_irq(&gb_connections_lock);
- atomic_set(&connection->op_cycle, 0);
- INIT_LIST_HEAD(&connection->operations);
+ gb_connection_bind_protocol(connection);
+ if (!connection->protocol)
+ dev_warn(&connection->dev,
+ "protocol 0x%02hhx handler not found\n", protocol_id);
return connection;
+
+err_free_connection:
+ kfree(connection);
+err_remove_ida:
+ ida_simple_remove(id_map, hd_cport_id);
+
+ return NULL;
+}
+
+static int gb_connection_hd_cport_enable(struct gb_connection *connection)
+{
+ struct greybus_host_device *hd = connection->hd;
+ int ret;
+
+ if (!hd->driver->cport_enable)
+ return 0;
+
+ ret = hd->driver->cport_enable(hd, connection->hd_cport_id);
+ if (ret) {
+ dev_err(&connection->dev,
+ "failed to enable host cport: %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static void gb_connection_hd_cport_disable(struct gb_connection *connection)
+{
+ struct greybus_host_device *hd = connection->hd;
+
+ if (!hd->driver->cport_disable)
+ return;
+
+ hd->driver->cport_disable(hd, connection->hd_cport_id);
+}
+
+struct gb_connection *gb_connection_create(struct gb_bundle *bundle,
+ u16 cport_id, u8 protocol_id)
+{
+ return gb_connection_create_range(bundle->intf->hd, bundle,
+ &bundle->dev, cport_id, protocol_id,
+ 0, bundle->intf->hd->num_cports - 1);
}
/*
- * Tear down a previously set up connection.
+ * Cancel all active operations on a connection.
+ *
+ * Should only be called during connection tear down.
*/
-void gb_connection_destroy(struct gb_connection *connection)
+static void gb_connection_cancel_operations(struct gb_connection *connection,
+ int errno)
{
struct gb_operation *operation;
- struct gb_operation *next;
- if (WARN_ON(!connection))
+ spin_lock_irq(&connection->lock);
+ while (!list_empty(&connection->operations)) {
+ operation = list_last_entry(&connection->operations,
+ struct gb_operation, links);
+ gb_operation_get(operation);
+ spin_unlock_irq(&connection->lock);
+
+ if (gb_operation_is_incoming(operation))
+ gb_operation_cancel_incoming(operation, errno);
+ else
+ gb_operation_cancel(operation, errno);
+
+ gb_operation_put(operation);
+
+ spin_lock_irq(&connection->lock);
+ }
+ spin_unlock_irq(&connection->lock);
+}
+
+/*
+ * Request the SVC to create a connection from AP's cport to interface's
+ * cport.
+ */
+static int
+gb_connection_svc_connection_create(struct gb_connection *connection)
+{
+ struct greybus_host_device *hd = connection->hd;
+ struct gb_protocol *protocol = connection->protocol;
+ int ret;
+
+ if (protocol->flags & GB_PROTOCOL_SKIP_SVC_CONNECTION)
+ return 0;
+
+ ret = gb_svc_connection_create(hd->svc,
+ hd->endo->ap_intf_id,
+ connection->hd_cport_id,
+ connection->bundle->intf->interface_id,
+ connection->intf_cport_id);
+ if (ret) {
+ dev_err(&connection->dev,
+ "failed to create svc connection: %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static void
+gb_connection_svc_connection_destroy(struct gb_connection *connection)
+{
+ if (connection->protocol->flags & GB_PROTOCOL_SKIP_SVC_CONNECTION)
return;
- /* XXX Need to wait for any outstanding requests to complete */
- if (WARN_ON(!list_empty(&connection->operations))) {
- list_for_each_entry_safe(operation, next,
- &connection->operations, links)
- gb_operation_cancel(operation, -ESHUTDOWN);
+ gb_svc_connection_destroy(connection->hd->svc,
+ connection->hd->endo->ap_intf_id,
+ connection->hd_cport_id,
+ connection->bundle->intf->interface_id,
+ connection->intf_cport_id);
+}
+
+/* Inform Interface about active CPorts */
+static int gb_connection_control_connected(struct gb_connection *connection)
+{
+ struct gb_protocol *protocol = connection->protocol;
+ struct gb_control *control;
+ u16 cport_id = connection->intf_cport_id;
+ int ret;
+
+ if (protocol->flags & GB_PROTOCOL_SKIP_CONTROL_CONNECTED)
+ return 0;
+
+ control = connection->bundle->intf->control;
+
+ ret = gb_control_connected_operation(control, cport_id);
+ if (ret) {
+ dev_err(&connection->dev,
+ "failed to connect cport: %d\n", ret);
+ return ret;
}
- spin_lock_irq(&gb_connections_lock);
- list_del(&connection->bundle_links);
- list_del(&connection->hd_links);
- spin_unlock_irq(&gb_connections_lock);
- gb_connection_hd_cport_id_free(connection);
- gb_protocol_put(connection->protocol);
+ return 0;
+}
- device_unregister(&connection->dev);
+/* Inform Interface about inactive CPorts */
+static void
+gb_connection_control_disconnected(struct gb_connection *connection)
+{
+ struct gb_protocol *protocol = connection->protocol;
+ struct gb_control *control;
+ u16 cport_id = connection->intf_cport_id;
+ int ret;
+
+ if (protocol->flags & GB_PROTOCOL_SKIP_CONTROL_DISCONNECTED)
+ return;
+
+ control = connection->bundle->intf->control;
+
+ ret = gb_control_disconnected_operation(control, cport_id);
+ if (ret) {
+ dev_warn(&connection->dev,
+ "failed to disconnect cport: %d\n", ret);
+ }
}
-int gb_connection_init(struct gb_connection *connection)
+/*
+ * Request protocol version supported by the module. We don't need to do
+ * this for SVC as that is initiated by the SVC.
+ */
+static int gb_connection_protocol_get_version(struct gb_connection *connection)
{
+ struct gb_protocol *protocol = connection->protocol;
int ret;
- if (!connection->protocol) {
- dev_warn(&connection->dev, "init without protocol.\n");
+ if (protocol->flags & GB_PROTOCOL_SKIP_VERSION)
return 0;
+
+ ret = gb_protocol_get_version(connection);
+ if (ret) {
+ dev_err(&connection->dev,
+ "failed to get protocol version: %d\n", ret);
+ return ret;
}
+ return 0;
+}
+
+static int gb_connection_init(struct gb_connection *connection)
+{
+ struct gb_protocol *protocol = connection->protocol;
+ int ret;
+
+ ret = gb_connection_hd_cport_enable(connection);
+ if (ret)
+ return ret;
+
+ ret = gb_connection_svc_connection_create(connection);
+ if (ret)
+ goto err_hd_cport_disable;
+
+ ret = gb_connection_control_connected(connection);
+ if (ret)
+ goto err_svc_destroy;
+
/* Need to enable the connection to initialize it */
+ spin_lock_irq(&connection->lock);
connection->state = GB_CONNECTION_STATE_ENABLED;
- ret = connection->protocol->connection_init(connection);
+ spin_unlock_irq(&connection->lock);
+
+ ret = gb_connection_protocol_get_version(connection);
if (ret)
- connection->state = GB_CONNECTION_STATE_ERROR;
+ goto err_disconnect;
+
+ ret = protocol->connection_init(connection);
+ if (ret)
+ goto err_disconnect;
+
+ return 0;
+
+err_disconnect:
+ spin_lock_irq(&connection->lock);
+ connection->state = GB_CONNECTION_STATE_ERROR;
+ spin_unlock_irq(&connection->lock);
+
+ gb_connection_control_disconnected(connection);
+err_svc_destroy:
+ gb_connection_svc_connection_destroy(connection);
+err_hd_cport_disable:
+ gb_connection_hd_cport_disable(connection);
return ret;
}
-void gb_connection_exit(struct gb_connection *connection)
+static void gb_connection_exit(struct gb_connection *connection)
{
- if (!connection->protocol) {
- dev_warn(&connection->dev, "exit without protocol.\n");
+ if (!connection->protocol)
return;
- }
- if (connection->state != GB_CONNECTION_STATE_ENABLED)
+ spin_lock_irq(&connection->lock);
+ if (connection->state != GB_CONNECTION_STATE_ENABLED) {
+ spin_unlock_irq(&connection->lock);
return;
-
+ }
connection->state = GB_CONNECTION_STATE_DESTROYING;
+ spin_unlock_irq(&connection->lock);
+
+ gb_connection_cancel_operations(connection, -ESHUTDOWN);
+
connection->protocol->connection_exit(connection);
+ gb_connection_control_disconnected(connection);
+ gb_connection_svc_connection_destroy(connection);
+ gb_connection_hd_cport_disable(connection);
+}
+
+/*
+ * Tear down a previously set up connection.
+ */
+void gb_connection_destroy(struct gb_connection *connection)
+{
+ struct ida *id_map;
+
+ if (WARN_ON(!connection))
+ return;
+
+ gb_connection_exit(connection);
+
+ spin_lock_irq(&gb_connections_lock);
+ list_del(&connection->bundle_links);
+ list_del(&connection->hd_links);
+ spin_unlock_irq(&gb_connections_lock);
+
+ if (connection->protocol)
+ gb_protocol_put(connection->protocol);
+ connection->protocol = NULL;
+
+ id_map = &connection->hd->cport_id_map;
+ ida_simple_remove(id_map, connection->hd_cport_id);
+ connection->hd_cport_id = CPORT_ID_BAD;
+
+ device_unregister(&connection->dev);
+}
+
+void gb_hd_connections_exit(struct greybus_host_device *hd)
+{
+ struct gb_connection *connection;
+
+ list_for_each_entry(connection, &hd->connections, hd_links)
+ gb_connection_destroy(connection);
+}
+
+int gb_connection_bind_protocol(struct gb_connection *connection)
+{
+ struct gb_protocol *protocol;
+ int ret;
+
+ /* If we already have a protocol bound here, just return */
+ if (connection->protocol)
+ return 0;
+
+ protocol = gb_protocol_get(connection->protocol_id,
+ connection->major,
+ connection->minor);
+ if (!protocol)
+ return 0;
+ connection->protocol = protocol;
+
+ /*
+ * If we have a valid device_id for the interface block, then we have an
+ * active device, so bring up the connection at the same time.
+ */
+ if ((!connection->bundle &&
+ protocol->flags & GB_PROTOCOL_NO_BUNDLE) ||
+ connection->bundle->intf->device_id != GB_DEVICE_ID_BAD) {
+ ret = gb_connection_init(connection);
+ if (ret) {
+ gb_protocol_put(protocol);
+ connection->protocol = NULL;
+ return ret;
+ }
+ }
+
+ return 0;
}
projects / cascardo / linux.git / blobdiff