mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
greybus: gpbridge: implement gpbridge "bus" logic
This creates a gpbridge "bus" that will be used to create devices that are the bridged phy devices that correspond to the protocols being implemented. Testing Done: Tested on gbsim. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Signed-off-by: Vaibhav Hiremath <vaibhav.hiremath@linaro.org> [vaibhav.hiremath@linaro.org: 1.Changed code to retain init/exit fns of drivers. 2.Exit path fix. 3. Fixed review comments] Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org> Tested-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
parent
0decdd55b3
commit
1d5f9ef9ef
2 changed files with 313 additions and 12 deletions
|
@ -19,8 +19,266 @@
|
|||
#include "greybus.h"
|
||||
#include "gpbridge.h"
|
||||
|
||||
struct gpbridge_host {
|
||||
struct gb_bundle *bundle;
|
||||
struct list_head devices;
|
||||
};
|
||||
|
||||
static DEFINE_IDA(gpbridge_id);
|
||||
|
||||
static void gpbdev_release(struct device *dev)
|
||||
{
|
||||
struct gpbridge_device *gpbdev = to_gpbridge_dev(dev);
|
||||
|
||||
ida_simple_remove(&gpbridge_id, gpbdev->id);
|
||||
kfree(gpbdev);
|
||||
}
|
||||
|
||||
static int gpbdev_uevent(struct device *dev, struct kobj_uevent_env *env)
|
||||
{
|
||||
/* FIXME add something here, userspace will care about these... */
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct gpbridge_device_id *
|
||||
gpbdev_match_cport(struct greybus_descriptor_cport *cport_desc,
|
||||
const struct gpbridge_device_id *id)
|
||||
{
|
||||
if (!id)
|
||||
return NULL;
|
||||
|
||||
for (; id->protocol_id; id++)
|
||||
if (id->protocol_id == cport_desc->protocol_id)
|
||||
return id;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static const struct gpbridge_device_id *gpbdev_match_id(struct gb_bundle *bundle,
|
||||
const struct gpbridge_device_id *id_table)
|
||||
{
|
||||
const struct gpbridge_device_id *id;
|
||||
int i;
|
||||
|
||||
if (!id_table || !bundle || bundle->num_cports == 0)
|
||||
return NULL;
|
||||
|
||||
for (i = 0; i < bundle->num_cports; i++) {
|
||||
id = gpbdev_match_cport(&bundle->cport_desc[i], id_table);
|
||||
if (id)
|
||||
return id;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int gpbdev_match(struct device *dev, struct device_driver *drv)
|
||||
{
|
||||
struct gpbridge_driver *gpbdrv = to_gpbridge_driver(drv);
|
||||
struct gpbridge_device *gpbdev = to_gpbridge_dev(dev);
|
||||
const struct gpbridge_device_id *id;
|
||||
|
||||
id = gpbdev_match_id(gpbdev->bundle, gpbdrv->id_table);
|
||||
if (id)
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int gpbdev_probe(struct device *dev)
|
||||
{
|
||||
struct gpbridge_driver *gpbdrv = to_gpbridge_driver(dev->driver);
|
||||
struct gpbridge_device *gpbdev = to_gpbridge_dev(dev);
|
||||
const struct gpbridge_device_id *id;
|
||||
|
||||
id = gpbdev_match_id(gpbdev->bundle, gpbdrv->id_table);
|
||||
if (!id)
|
||||
return -ENODEV;
|
||||
|
||||
return gpbdrv->probe(gpbdev, id);
|
||||
}
|
||||
|
||||
static int gpbdev_remove(struct device *dev)
|
||||
{
|
||||
struct gpbridge_driver *gpbdrv = to_gpbridge_driver(dev->driver);
|
||||
struct gpbridge_device *gpbdev = to_gpbridge_dev(dev);
|
||||
|
||||
gpbdrv->remove(gpbdev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct bus_type gpbridge_bus_type = {
|
||||
.name = "gpbridge",
|
||||
.match = gpbdev_match,
|
||||
.probe = gpbdev_probe,
|
||||
.remove = gpbdev_remove,
|
||||
.uevent = gpbdev_uevent,
|
||||
};
|
||||
|
||||
int gb_gpbridge_register_driver(struct gpbridge_driver *driver,
|
||||
struct module *owner, const char *mod_name)
|
||||
{
|
||||
int retval;
|
||||
|
||||
if (greybus_disabled())
|
||||
return -ENODEV;
|
||||
|
||||
driver->driver.bus = &gpbridge_bus_type;
|
||||
driver->driver.name = driver->name;
|
||||
driver->driver.owner = owner;
|
||||
driver->driver.mod_name = mod_name;
|
||||
|
||||
retval = driver_register(&driver->driver);
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
pr_info("registered new driver %s\n", driver->name);
|
||||
return 0;
|
||||
}
|
||||
|
||||
void gb_gpbridge_deregister_driver(struct gpbridge_driver *driver)
|
||||
{
|
||||
driver_unregister(&driver->driver);
|
||||
}
|
||||
|
||||
int gb_gpbridge_get_version(struct gb_connection *connection)
|
||||
{
|
||||
struct gb_protocol_version_request request;
|
||||
struct gb_protocol_version_response response;
|
||||
int retval;
|
||||
|
||||
request.major = 1;
|
||||
request.minor = 0;
|
||||
|
||||
retval = gb_operation_sync(connection, GB_REQUEST_TYPE_PROTOCOL_VERSION,
|
||||
&request, sizeof(request), &response,
|
||||
sizeof(response));
|
||||
if (retval)
|
||||
return retval;
|
||||
|
||||
/* FIXME - do proper version negotiation here someday... */
|
||||
|
||||
connection->module_major = response.major;
|
||||
connection->module_minor = response.minor;
|
||||
|
||||
dev_dbg(&connection->hd->dev, "%s: v%u.%u\n", connection->name,
|
||||
response.major, response.minor);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct gpbridge_device *gb_gpbridge_create_dev(struct gb_bundle *bundle,
|
||||
struct greybus_descriptor_cport *cport_desc)
|
||||
{
|
||||
struct gpbridge_device *gpbdev;
|
||||
int retval;
|
||||
int id;
|
||||
|
||||
id = ida_simple_get(&gpbridge_id, 0, 0, GFP_KERNEL);
|
||||
if (id < 0)
|
||||
return ERR_PTR(id);
|
||||
|
||||
gpbdev = kzalloc(sizeof(*gpbdev), GFP_KERNEL);
|
||||
if (!gpbdev) {
|
||||
ida_simple_remove(&gpbridge_id, id);
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
gpbdev->id = id;
|
||||
gpbdev->bundle = bundle;
|
||||
gpbdev->cport_desc = cport_desc;
|
||||
gpbdev->dev.parent = &bundle->dev;
|
||||
gpbdev->dev.bus = &gpbridge_bus_type;
|
||||
gpbdev->dev.release = gpbdev_release;
|
||||
gpbdev->dev.groups = NULL;
|
||||
gpbdev->dev.dma_mask = bundle->dev.dma_mask;
|
||||
dev_set_name(&gpbdev->dev, "gpb%d", id);
|
||||
|
||||
retval = device_register(&gpbdev->dev);
|
||||
if (retval) {
|
||||
put_device(&gpbdev->dev);
|
||||
return ERR_PTR(retval);
|
||||
}
|
||||
|
||||
return gpbdev;
|
||||
}
|
||||
|
||||
static void gb_gpbridge_disconnect(struct gb_bundle *bundle)
|
||||
{
|
||||
struct gpbridge_host *gpb_host = greybus_get_drvdata(bundle);
|
||||
struct gpbridge_device *gpbdev, *temp;
|
||||
|
||||
list_for_each_entry_safe(gpbdev, temp, &gpb_host->devices, list) {
|
||||
list_del(&gpbdev->list);
|
||||
device_unregister(&gpbdev->dev);
|
||||
}
|
||||
|
||||
kfree(gpb_host);
|
||||
}
|
||||
|
||||
static int gb_gpbridge_probe(struct gb_bundle *bundle,
|
||||
const struct greybus_bundle_id *id)
|
||||
{
|
||||
struct gpbridge_host *gpb_host;
|
||||
struct gpbridge_device *gpbdev;
|
||||
int i;
|
||||
|
||||
if (bundle->num_cports == 0)
|
||||
return -ENODEV;
|
||||
|
||||
gpb_host = kzalloc(sizeof(*gpb_host), GFP_KERNEL);
|
||||
if (!gpb_host)
|
||||
return -ENOMEM;
|
||||
|
||||
gpb_host->bundle = bundle;
|
||||
INIT_LIST_HEAD(&gpb_host->devices);
|
||||
greybus_set_drvdata(bundle, gpb_host);
|
||||
|
||||
/*
|
||||
* Create a bunch of children devices, one per cport, and bind the
|
||||
* bridged phy drivers to them.
|
||||
*/
|
||||
for (i = 0; i < bundle->num_cports; ++i) {
|
||||
gpbdev = gb_gpbridge_create_dev(bundle, &bundle->cport_desc[i]);
|
||||
if (IS_ERR(gpbdev)) {
|
||||
gb_gpbridge_disconnect(bundle);
|
||||
return PTR_ERR(gpbdev);
|
||||
}
|
||||
list_add(&gpbdev->list, &gpb_host->devices);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct greybus_bundle_id gb_gpbridge_id_table[] = {
|
||||
{ GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_BRIDGED_PHY) },
|
||||
{ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(greybus, gb_gpbridge_id_table);
|
||||
|
||||
static struct greybus_driver gb_gpbridge_driver = {
|
||||
.name = "gpbridge",
|
||||
.probe = gb_gpbridge_probe,
|
||||
.disconnect = gb_gpbridge_disconnect,
|
||||
.id_table = gb_gpbridge_id_table,
|
||||
};
|
||||
|
||||
static int __init gpbridge_init(void)
|
||||
{
|
||||
int retval;
|
||||
|
||||
retval = bus_register(&gpbridge_bus_type);
|
||||
if (retval) {
|
||||
pr_err("gpbridge bus register failed (%d)\n", retval);
|
||||
return retval;
|
||||
}
|
||||
|
||||
retval = greybus_register(&gb_gpbridge_driver);
|
||||
if (retval) {
|
||||
pr_err("error registering greybus driver\n");
|
||||
goto error_gpbridge;
|
||||
}
|
||||
|
||||
if (gb_gpio_protocol_init()) {
|
||||
pr_err("error initializing gpio protocol\n");
|
||||
goto error_gpio;
|
||||
|
@ -65,6 +323,10 @@ static int __init gpbridge_init(void)
|
|||
error_pwm:
|
||||
gb_gpio_protocol_exit();
|
||||
error_gpio:
|
||||
greybus_deregister(&gb_gpbridge_driver);
|
||||
error_gpbridge:
|
||||
bus_unregister(&gpbridge_bus_type);
|
||||
ida_destroy(&gpbridge_id);
|
||||
return -EPROTO;
|
||||
}
|
||||
module_init(gpbridge_init);
|
||||
|
@ -78,19 +340,11 @@ static void __exit gpbridge_exit(void)
|
|||
gb_uart_protocol_exit();
|
||||
gb_pwm_protocol_exit();
|
||||
gb_gpio_protocol_exit();
|
||||
|
||||
greybus_deregister(&gb_gpbridge_driver);
|
||||
bus_unregister(&gpbridge_bus_type);
|
||||
ida_destroy(&gpbridge_id);
|
||||
}
|
||||
module_exit(gpbridge_exit);
|
||||
|
||||
/*
|
||||
* One large list of all classes we support in the gpbridge.ko module.
|
||||
*
|
||||
* Due to limitations in older kernels, the different phy .c files can not
|
||||
* contain their own MODULE_DEVICE_TABLE(), so put them all here for now.
|
||||
*/
|
||||
static const struct greybus_bundle_id bridged_phy_id_table[] = {
|
||||
{ GREYBUS_DEVICE_CLASS(GREYBUS_CLASS_BRIDGED_PHY) },
|
||||
{ },
|
||||
};
|
||||
MODULE_DEVICE_TABLE(greybus, bridged_phy_id_table);
|
||||
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
|
@ -9,6 +9,53 @@
|
|||
#ifndef __GPBRIDGE_H
|
||||
#define __GPBRIDGE_H
|
||||
|
||||
struct gpbridge_device {
|
||||
u32 id;
|
||||
struct greybus_descriptor_cport *cport_desc;
|
||||
struct gb_bundle *bundle;
|
||||
struct list_head list;
|
||||
struct device dev;
|
||||
};
|
||||
#define to_gpbridge_dev(d) container_of(d, struct gpbridge_device, dev)
|
||||
|
||||
static inline void *gb_gpbridge_get_data(struct gpbridge_device *gdev)
|
||||
{
|
||||
return dev_get_drvdata(&gdev->dev);
|
||||
}
|
||||
|
||||
static inline void gb_gpbridge_set_data(struct gpbridge_device *gdev, void *data)
|
||||
{
|
||||
dev_set_drvdata(&gdev->dev, data);
|
||||
}
|
||||
|
||||
struct gpbridge_device_id {
|
||||
__u8 protocol_id;
|
||||
};
|
||||
|
||||
#define GPBRIDGE_PROTOCOL(p) \
|
||||
.protocol_id = (p),
|
||||
|
||||
struct gpbridge_driver {
|
||||
const char *name;
|
||||
int (*probe)(struct gpbridge_device *,
|
||||
const struct gpbridge_device_id *id);
|
||||
void (*remove)(struct gpbridge_device *);
|
||||
const struct gpbridge_device_id *id_table;
|
||||
|
||||
struct device_driver driver;
|
||||
};
|
||||
#define to_gpbridge_driver(d) container_of(d, struct gpbridge_driver, driver)
|
||||
|
||||
int gb_gpbridge_get_version(struct gb_connection *connection);
|
||||
int gb_gpbridge_register_driver(struct gpbridge_driver *driver,
|
||||
struct module *owner, const char *mod_name);
|
||||
void gb_gpbridge_deregister_driver(struct gpbridge_driver *driver);
|
||||
|
||||
#define gb_gpbridge_register(driver) \
|
||||
gb_gpbridge_register_driver(driver, THIS_MODULE, KBUILD_MODNAME)
|
||||
#define gb_gpbridge_deregister(driver) \
|
||||
gb_gpbridge_deregister_driver(driver)
|
||||
|
||||
extern int gb_gpio_protocol_init(void);
|
||||
extern void gb_gpio_protocol_exit(void);
|
||||
|
||||
|
|
Loading…
Reference in a new issue