Commit df671553 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

greybus: add module support 



Modules in the greybus system sit above the interface, so insert them
early in the sysfs tree.  We dynamically create them when we have an
interface that references a module, as we don't get a "module create"
message directly.  They also dynamically go away when the last interface
associated with a module is removed.

Naming scheme for modules/interfaces/bundles/connections is bumped up by
one ':', and now looks like the following:

/sys/bus/greybus $ tree
.
├── devices
│   ├── 7 -> ../../../devices/pci0000:00/0000:00:14.0/usb1/1-1/7
│   ├── 7:7 -> ../../../devices/pci0000:00/0000:00:14.0/usb1/1-1/7/7:7
│   ├── 7:7:0 -> ../../../devices/pci0000:00/0000:00:14.0/usb1/1-1/7/7:7/7:7:0
│   └── 7:7:0:1 -> ../../../devices/pci0000:00/0000:00:14.0/usb1/1-1/7/7:7/7:7:0/7:7:0:1
├── drivers
├── drivers_autoprobe
├── drivers_probe
└── uevent

6 directories, 3 files
/sys/bus/greybus $ grep . devices/*/uevent
devices/7/uevent:DEVTYPE=greybus_module
devices/7:7/uevent:DEVTYPE=greybus_interface
devices/7:7:0/uevent:DEVTYPE=greybus_bundle
devices/7:7:0:1/uevent:DEVTYPE=greybus_connection

We still have some "confusion" about interface ids and module ids, which
will be cleaned up later when the svc control protocol changes die down,
right now we just name a module after the interface as we don't have any
modules that have multiple interfaces in our systems.

This has been tested with gbsim.

Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 4901175f

drivers/staging/greybus/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ greybus-y := core.o \ 
		debugfs.o	\

		ap.o		\

		manifest.o	\

		module.o	\

		interface.o	\

		bundle.o	\

		connection.o	\

drivers/staging/greybus/bundle.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ struct gb_bundle *gb_bundle_create(struct gb_interface *intf, u8 interface_id) 
	bundle->dev.type = &greybus_bundle_type;

	bundle->dev.groups = bundle_groups;

	device_initialize(&bundle->dev);

	dev_set_name(&bundle->dev, "%d:%d", intf->module_id, interface_id);

	dev_set_name(&bundle->dev, "%s:%d", dev_name(&intf->dev), interface_id);



	retval = device_add(&bundle->dev);

	if (retval) {

drivers/staging/greybus/connection.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ void gb_connection_err(struct gb_connection *connection, const char *fmt, ...) 
	vaf.va = &args;



	pr_err("greybus: [%hhu:%hhu:%hu]: %pV\n",

		connection->bundle->intf->module_id,

		connection->bundle->intf->module->module_id,

		connection->bundle->id,

		connection->bundle_cport_id, &vaf);

drivers/staging/greybus/core.c

+4 −1
Original line number Diff line number Diff line
@@ -46,11 +46,14 @@ static int greybus_module_match(struct device *dev, struct device_driver *drv) 


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_connection *connection = NULL;



	if (is_gb_interface(dev)) {

	if (is_gb_module(dev)) {

		module = to_gb_module(dev);

	} else if (is_gb_interface(dev)) {

		intf = to_gb_interface(dev);

	} else if (is_gb_bundle(dev)) {

		bundle = to_gb_bundle(dev);

drivers/staging/greybus/greybus.h

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "greybus_id.h"

#include "greybus_manifest.h"

#include "manifest.h"

#include "module.h"

#include "interface.h"

#include "bundle.h"

#include "connection.h"
@@ -168,10 +169,16 @@ void gb_uart_device_exit(struct gb_connection *connection); 
int svc_set_route_send(struct gb_bundle *bundle,

			       struct greybus_host_device *hd);



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_connection_type;



static inline int is_gb_module(const struct device *dev)

{

	return dev->type == &greybus_module_type;

}



static inline int is_gb_interface(const struct device *dev)

{

	return dev->type == &greybus_interface_type;