greybus: add gb_operation_find()

Add a red-black tree indexed by operation id to a connection to
allow pending operations (whose requests are in-flight) to be
found when their matching response is recieved.

Assign the id at the time an operation is inserted, and update
the operation's message header(s) to include it.

Rename gb_connection_op_id() to be more consistent with the
naming conventions being used elsewhere.

(Noting now that this may switch to a simple list implementation
based on Greg's assertion that lists are faster than red-black trees
for up to a few hundred entries.)

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

drivers/staging/greybus/connection.c

@@ -141,6 +141,7 @@ struct gb_connection *gb_connection_create(struct gb_interface *interface,
 	spin_unlock_irq(&gb_connections_lock);
 
 	INIT_LIST_HEAD(&connection->operations);
+	connection->pending = RB_ROOT;
 	atomic_set(&connection->op_cycle, 0);
 
 	return connection;
@@ -168,7 +169,7 @@ void gb_connection_destroy(struct gb_connection *connection)
 	kfree(connection);
 }
 
-u16 gb_connection_op_id(struct gb_connection *connection)
+u16 gb_connection_operation_id(struct gb_connection *connection)
 {
 	return (u16)(atomic_inc_return(&connection->op_cycle) % U16_MAX);
 }

drivers/staging/greybus/connection.h

@@ -24,6 +24,7 @@ struct gb_connection {
 	enum greybus_protocol		protocol;
 
 	struct list_head		operations;
+	struct rb_root			pending;	/* awaiting reponse */
 	atomic_t			op_cycle;
 
 	void				*private;
@@ -36,7 +37,7 @@ void gb_connection_destroy(struct gb_connection *connection);
 struct gb_connection *gb_hd_connection_find(struct greybus_host_device *hd,
 				u16 cport_id);
 
-u16 gb_connection_op_id(struct gb_connection *connection);
+u16 gb_connection_operation_id(struct gb_connection *connection);
 
 __printf(2, 3)
 void gb_connection_err(struct gb_connection *connection, const char *fmt, ...);

drivers/staging/greybus/operation.c

@@ -44,6 +44,75 @@ struct gb_operation_msg_hdr {
 /* XXX Could be per-host device, per-module, or even per-connection */
 static DEFINE_SPINLOCK(gb_operations_lock);
 
+static void gb_operation_insert(struct gb_operation *operation)
+{
+	struct gb_connection *connection = operation->connection;
+	struct rb_root *root = &connection->pending;
+	struct rb_node *node = &operation->node;
+	struct rb_node **link = &root->rb_node;
+	struct rb_node *above = NULL;
+	struct gb_operation_msg_hdr *header;
+	__le16 wire_id;
+
+	/*
+	 * Assign the operation's id, and store it in the header of
+	 * both request and response message headers.
+	 */
+	operation->id = gb_connection_operation_id(connection);
+	wire_id = cpu_to_le16(operation->id);
+	header = operation->request->transfer_buffer;
+	header->id = wire_id;
+
+	/* OK, insert the operation into its connection's tree */
+	spin_lock_irq(&gb_operations_lock);
+
+	while (*link) {
+		struct gb_operation *other;
+
+		above = *link;
+		other = rb_entry(above, struct gb_operation, node);
+		header = other->request->transfer_buffer;
+		if (other->id > operation->id)
+			link = &above->rb_left;
+		else if (other->id < operation->id)
+			link = &above->rb_right;
+	}
+	rb_link_node(node, above, link);
+	rb_insert_color(node, root);
+
+	spin_unlock_irq(&gb_operations_lock);
+}
+
+static void gb_operation_remove(struct gb_operation *operation)
+{
+	spin_lock_irq(&gb_operations_lock);
+	rb_erase(&operation->node, &operation->connection->pending);
+	spin_unlock_irq(&gb_operations_lock);
+}
+
+static struct gb_operation *
+gb_operation_find(struct gb_connection *connection, u16 id)
+{
+	struct gb_operation *operation;
+	struct rb_node *node;
+	bool found = false;
+
+	spin_lock_irq(&gb_operations_lock);
+	node = connection->pending.rb_node;
+	while (node && !found) {
+		operation = rb_entry(node, struct gb_operation, node);
+		if (operation->id > id)
+			node = node->rb_left;
+		else if (operation->id < id)
+			node = node->rb_right;
+		else
+			found = true;
+	}
+	spin_unlock_irq(&gb_operations_lock);
+
+	return found ? operation : NULL;
+}
+
 /*
  * An operations's response message has arrived.  If no callback was
  * supplied it was submitted for asynchronous completion, so we notify
@@ -93,6 +162,7 @@ int gb_operation_submit(struct gb_operation *operation,
 	 * setting the operation id and submitting the gbuf.
 	 */
 	operation->callback = callback;
+	gb_operation_insert(operation);
 	ret = greybus_submit_gbuf(operation->request, GFP_KERNEL);
 	if (ret)
 		return ret;
@@ -107,7 +177,21 @@ int gb_operation_submit(struct gb_operation *operation,
  */
 static void gb_operation_gbuf_complete(struct gbuf *gbuf)
 {
-	/* TODO */
+	struct gb_operation *operation;
+	struct gb_operation_msg_hdr *header;
+	u16 id;
+
+	/*
+	 * This isn't right, but it keeps things balanced until we
+	 * can set up operation response handling.
+	 */
+	header = gbuf->transfer_buffer;
+	id = le16_to_cpu(header->id);
+	operation = gb_operation_find(gbuf->connection, id);
+	if (operation)
+		gb_operation_remove(operation);
+	else
+		gb_connection_err(gbuf->connection, "operation not found");
 }
 
 /*

drivers/staging/greybus/operation.h

@@ -52,12 +52,14 @@ struct gb_operation {
 	struct gb_connection	*connection;
 	struct gbuf		*request;
 	struct gbuf		*response;
+	u16			id;
 
+	u8			result;
 	gb_operation_callback	callback;	/* If asynchronous */
 	struct completion	completion;	/* Used if no callback */
-	u8			result;
 
 	struct list_head	links;		/* connection->operations */
+	struct rb_node		node;		/* connection->pending */
 
 	/* These are what's used by caller */
 	void			*request_payload;