Ver Fonte

greybus: hd/es2: add cport_connected callback and ARPC

Add a host-device cport_connected callback, which will be called after a
connection has been created and that can be used by the host-device
driver to make sure its internal state is updated to match the CPort
attributes set by the SVC.

This callback will eventually replace the cport_features_enable
callback.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Sandeep Patil <sspatil@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Johan Hovold há 9 anos atrás
pai
commit
a9dc1cf5b7

+ 6 - 0
drivers/staging/greybus/arpc.h

@@ -77,9 +77,15 @@ struct arpc_response_message {
 
 /* ARPC requests */
 #define ARPC_TYPE_CPORT_RESET			0x00
+#define ARPC_TYPE_CPORT_CONNECTED		0x01
 
 struct arpc_cport_reset_req {
 	__le16 cport_id;
 } __packed;
 
+struct arpc_cport_connected_req {
+	__le16 cport_id;
+} __packed;
+
+
 #endif	/* __ARPC_H */

+ 20 - 0
drivers/staging/greybus/es2.c

@@ -746,6 +746,25 @@ static int cport_disable(struct gb_host_device *hd, u16 cport_id)
 	return 0;
 }
 
+static int es2_cport_connected(struct gb_host_device *hd, u16 cport_id)
+{
+	struct es2_ap_dev *es2 = hd_to_es2(hd);
+	struct device *dev = &es2->usb_dev->dev;
+	struct arpc_cport_connected_req req;
+	int ret;
+
+	req.cport_id = cpu_to_le16(cport_id);
+	ret = arpc_sync(es2, ARPC_TYPE_CPORT_CONNECTED, &req, sizeof(req),
+			NULL, ES2_ARPC_CPORT_TIMEOUT);
+	if (ret) {
+		dev_err(dev, "failed to set connected state for cport %u: %d\n",
+				cport_id, ret);
+		return ret;
+	}
+
+	return 0;
+}
+
 static int latency_tag_enable(struct gb_host_device *hd, u16 cport_id)
 {
 	int retval;
@@ -930,6 +949,7 @@ static struct gb_hd_driver es2_driver = {
 	.cport_release			= es2_cport_release,
 	.cport_enable			= cport_enable,
 	.cport_disable			= cport_disable,
+	.cport_connected		= es2_cport_connected,
 	.latency_tag_enable		= latency_tag_enable,
 	.latency_tag_disable		= latency_tag_disable,
 	.output				= output,

+ 1 - 0
drivers/staging/greybus/hd.h

@@ -22,6 +22,7 @@ struct gb_hd_driver {
 	int (*cport_enable)(struct gb_host_device *hd, u16 cport_id,
 				unsigned long flags);
 	int (*cport_disable)(struct gb_host_device *hd, u16 cport_id);
+	int (*cport_connected)(struct gb_host_device *hd, u16 cport_id);
 	int (*cport_flush)(struct gb_host_device *hd, u16 cport_id);
 	int (*cport_ping)(struct gb_host_device *hd, u16 cport_id);
 	int (*message_send)(struct gb_host_device *hd, u16 dest_cport_id,