Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ccf389b authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

greybus: svc: remove deprecated hotplug operations 



Now that firmware has made the switch to the new interface boot
sequence, we can remove support for the deprecated hotplug and
hot-unplug operations.

Reviewed-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 55742d2a

drivers/staging/greybus/greybus_protocols.h

+0 −19
Original line number Diff line number Diff line
@@ -908,8 +908,6 @@ struct gb_spi_transfer_response { 
#define GB_SVC_TYPE_PROTOCOL_VERSION		0x01

#define GB_SVC_TYPE_SVC_HELLO			0x02

#define GB_SVC_TYPE_INTF_DEVICE_ID		0x03

#define GB_SVC_TYPE_INTF_HOTPLUG		0x04

#define GB_SVC_TYPE_INTF_HOT_UNPLUG		0x05

#define GB_SVC_TYPE_INTF_RESET			0x06

#define GB_SVC_TYPE_CONN_CREATE			0x07

#define GB_SVC_TYPE_CONN_DESTROY		0x08
@@ -983,23 +981,6 @@ struct gb_svc_intf_device_id_request { 
} __packed;

/* device id response has no payload */



struct gb_svc_intf_hotplug_request {

	__u8	intf_id;

	struct {

		__le32	ddbl1_mfr_id;

		__le32	ddbl1_prod_id;

		__le32	ara_vend_id;

		__le32	ara_prod_id;

		__le64	serial_number;

	} data;

} __packed;

/* hotplug response has no payload */



struct gb_svc_intf_hot_unplug_request {

	__u8	intf_id;

} __packed;

/* hot unplug response has no payload */



struct gb_svc_intf_reset_request {

	__u8	intf_id;

} __packed;

drivers/staging/greybus/svc.c

+0 −122
Original line number Diff line number Diff line
@@ -924,73 +924,6 @@ static void gb_svc_process_hello_deferred(struct gb_operation *operation) 
			ret);

}



static void gb_svc_process_intf_hotplug(struct gb_operation *operation)

{

	struct gb_svc_intf_hotplug_request *request;

	struct gb_connection *connection = operation->connection;

	struct gb_svc *svc = gb_connection_get_data(connection);

	struct gb_host_device *hd = connection->hd;

	struct gb_module *module;

	u8 intf_id;

	int ret;



	/* The request message size has already been verified. */

	request = operation->request->payload;

	intf_id = request->intf_id;



	dev_dbg(&svc->dev, "%s - id = %u\n", __func__, intf_id);



	/* All modules are considered 1x2 for now */

	module = gb_svc_module_lookup(svc, intf_id);

	if (module) {

		/* legacy mode switch */

		return gb_interface_mailbox_event(module->interfaces[0], 0,

						GB_SVC_INTF_MAILBOX_GREYBUS);

	}



	module = gb_module_create(hd, intf_id, 1);

	if (!module) {

		dev_err(&svc->dev, "failed to create module\n");

		return;

	}



	ret = gb_module_add(module);

	if (ret) {

		gb_module_put(module);

		return;

	}



	list_add(&module->hd_node, &hd->modules);

}



static void gb_svc_process_intf_hot_unplug(struct gb_operation *operation)

{

	struct gb_svc *svc = gb_connection_get_data(operation->connection);

	struct gb_svc_intf_hot_unplug_request *request;

	struct gb_module *module;

	u8 intf_id;



	/* The request message size has already been verified. */

	request = operation->request->payload;

	intf_id = request->intf_id;



	dev_dbg(&svc->dev, "%s - id = %u\n", __func__, intf_id);



	/* All modules are considered 1x2 for now */

	module = gb_svc_module_lookup(svc, intf_id);

	if (!module) {

		dev_warn(&svc->dev, "could not find hot-unplug interface %u\n",

				intf_id);

		return;

	}



	module->disconnected = true;



	gb_module_del(module);

	list_del(&module->hd_node);

	gb_module_put(module);

}



static void gb_svc_process_module_inserted(struct gb_operation *operation)

{

	struct gb_svc_module_inserted_request *request;
@@ -1111,12 +1044,6 @@ static void gb_svc_process_deferred_request(struct work_struct *work) 
	case GB_SVC_TYPE_SVC_HELLO:

		gb_svc_process_hello_deferred(operation);

		break;

	case GB_SVC_TYPE_INTF_HOTPLUG:

		gb_svc_process_intf_hotplug(operation);

		break;

	case GB_SVC_TYPE_INTF_HOT_UNPLUG:

		gb_svc_process_intf_hot_unplug(operation);

		break;

	case GB_SVC_TYPE_MODULE_INSERTED:

		gb_svc_process_module_inserted(operation);

		break;
@@ -1153,51 +1080,6 @@ static int gb_svc_queue_deferred_request(struct gb_operation *operation) 
	return 0;

}



/*

 * Bringing up a module can be time consuming, as that may require lots of

 * initialization on the module side. Over that, we may also need to download

 * the firmware first and flash that on the module.

 *

 * In order not to make other svc events wait for all this to finish,

 * handle most of module hotplug stuff outside of the hotplug callback, with

 * help of a workqueue.

 */

static int gb_svc_intf_hotplug_recv(struct gb_operation *op)

{

	struct gb_svc *svc = gb_connection_get_data(op->connection);

	struct gb_svc_intf_hotplug_request *request;



	if (op->request->payload_size < sizeof(*request)) {

		dev_warn(&svc->dev, "short hotplug request received (%zu < %zu)\n",

				op->request->payload_size, sizeof(*request));

		return -EINVAL;

	}



	request = op->request->payload;



	dev_dbg(&svc->dev, "%s - id = %u\n", __func__, request->intf_id);



	return gb_svc_queue_deferred_request(op);

}



static int gb_svc_intf_hot_unplug_recv(struct gb_operation *op)

{

	struct gb_svc *svc = gb_connection_get_data(op->connection);

	struct gb_svc_intf_hot_unplug_request *request;



	if (op->request->payload_size < sizeof(*request)) {

		dev_warn(&svc->dev, "short hot unplug request received (%zu < %zu)\n",

				op->request->payload_size, sizeof(*request));

		return -EINVAL;

	}



	request = op->request->payload;



	dev_dbg(&svc->dev, "%s - id = %u\n", __func__, request->intf_id);



	return gb_svc_queue_deferred_request(op);

}



static int gb_svc_intf_reset_recv(struct gb_operation *op)

{

	struct gb_svc *svc = gb_connection_get_data(op->connection);
@@ -1371,10 +1253,6 @@ static int gb_svc_request_handler(struct gb_operation *op) 
		if (!ret)

			svc->state = GB_SVC_STATE_SVC_HELLO;

		return ret;

	case GB_SVC_TYPE_INTF_HOTPLUG:

		return gb_svc_intf_hotplug_recv(op);

	case GB_SVC_TYPE_INTF_HOT_UNPLUG:

		return gb_svc_intf_hot_unplug_recv(op);

	case GB_SVC_TYPE_INTF_RESET:

		return gb_svc_intf_reset_recv(op);

	case GB_SVC_TYPE_KEY_EVENT: