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

Commit 88f7b96d authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

greybus: svc: register svc device at hello 



Register the svc device upon reception of the HELLO request.

The SVC HELLO request contains the endo id and AP interface id, which
will be exposed from the svc device rather than the endo.

Signed-off-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 6106e51b

drivers/staging/greybus/core.c

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ static int greybus_uevent(struct device *dev, struct kobj_uevent_env *env) 
	struct gb_module *module = NULL;

	struct gb_interface *intf = NULL;

	struct gb_bundle *bundle = NULL;

	struct gb_svc *svc = NULL;



	if (is_gb_endo(dev)) {

		/*
@@ -99,6 +100,8 @@ static int greybus_uevent(struct device *dev, struct kobj_uevent_env *env) 
	} else if (is_gb_bundle(dev)) {

		bundle = to_gb_bundle(dev);

		intf = bundle->intf;

	} else if (is_gb_svc(dev)) {

		svc = to_gb_svc(dev);

	} else {

		dev_WARN(dev, "uevent for unknown greybus device \"type\"!\n");

		return -EINVAL;

drivers/staging/greybus/greybus.h

+6 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ extern struct device_type greybus_endo_type; 
extern struct device_type greybus_module_type;

extern struct device_type greybus_interface_type;

extern struct device_type greybus_bundle_type;

extern struct device_type greybus_svc_type;



static inline int is_gb_host_device(const struct device *dev)

{
@@ -135,6 +136,11 @@ static inline int is_gb_bundle(const struct device *dev) 
	return dev->type == &greybus_bundle_type;

}



static inline int is_gb_svc(const struct device *dev)

{

	return dev->type == &greybus_svc_type;

}



static inline bool cport_id_valid(struct gb_host_device *hd, u16 cport_id)

{

	return cport_id != CPORT_ID_BAD && cport_id < hd->num_cports;

drivers/staging/greybus/svc.c

+11 −14
Original line number Diff line number Diff line
@@ -16,19 +16,6 @@ 
#define CPORT_FLAGS_CSD_N       BIT(1)

#define CPORT_FLAGS_CSV_N       BIT(2)



enum gb_svc_state {

	GB_SVC_STATE_RESET,

	GB_SVC_STATE_PROTOCOL_VERSION,

	GB_SVC_STATE_SVC_HELLO,

};



struct gb_svc {

	struct device		dev;



	struct gb_connection	*connection;

	enum gb_svc_state	state;

	struct ida		device_id_map;

};



struct svc_hotplug {

	struct work_struct work;
@@ -348,6 +335,7 @@ static int gb_svc_version_request(struct gb_operation *op) 
static int gb_svc_hello(struct gb_operation *op)

{

	struct gb_connection *connection = op->connection;

	struct gb_svc *svc = connection->private;

	struct gb_host_device *hd = connection->hd;

	struct gb_svc_hello_request *hello_request;

	struct gb_interface *intf;
@@ -370,6 +358,12 @@ static int gb_svc_hello(struct gb_operation *op) 
	endo_id = le16_to_cpu(hello_request->endo_id);

	interface_id = hello_request->interface_id;



	ret = device_add(&svc->dev);

	if (ret) {

		dev_err(&svc->dev, "failed to register svc device: %d\n", ret);

		return ret;

	}



	/* Setup Endo */

	ret = greybus_endo_setup(hd, endo_id, interface_id);

	if (ret)
@@ -671,7 +665,7 @@ static int gb_svc_request_recv(u8 type, struct gb_operation *op) 


static void gb_svc_release(struct device *dev)

{

	struct gb_svc *svc = container_of(dev, struct gb_svc, dev);

	struct gb_svc *svc = to_gb_svc(dev);



	ida_destroy(&svc->device_id_map);

	kfree(svc);
@@ -716,6 +710,9 @@ static void gb_svc_connection_exit(struct gb_connection *connection) 
{

	struct gb_svc *svc = connection->private;



	if (device_is_registered(&svc->dev))

		device_del(&svc->dev);



	connection->hd->svc = NULL;

	connection->private = NULL;

drivers/staging/greybus/svc.h

+14 −1
Original line number Diff line number Diff line
@@ -10,7 +10,20 @@ 
#ifndef __SVC_H

#define __SVC_H



struct gb_svc;

enum gb_svc_state {

	GB_SVC_STATE_RESET,

	GB_SVC_STATE_PROTOCOL_VERSION,

	GB_SVC_STATE_SVC_HELLO,

};



struct gb_svc {

	struct device		dev;



	struct gb_connection	*connection;

	enum gb_svc_state	state;

	struct ida		device_id_map;

};

#define to_gb_svc(d) container_of(d, struct gb_svc, d)



int gb_svc_intf_reset(struct gb_svc *svc, u8 intf_id);

int gb_svc_connection_create(struct gb_svc *svc, u8 intf1_id, u16 cport1_id,