Commit graph

534 commits

Author SHA1 Message Date
Greg Kroah-Hartman 45a706368d greybus: es1.c: wait until the last possible minute to start the svc messages
When initializing the USB device, we were starting up the svc message
queue before the cport urbs were allocated.  This might not be an issue
for "slower" machines, but not having any allocated urbs for a cport
might be an issue if we were to handle svc messages.

So wait until everything is properly initialized and allocated before
starting the svc urb.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-23 22:55:57 +08:00
Greg Kroah-Hartman e0b179ee78 greybus: ap.c: our workqueue should be ordered
SVC messages come in in an "order", so don't mess them up by processing
them out of order.  Fix this by making our work queue ordered, which
should keep everything in line.

Reported-by: Perry Hung <perry@leaflabs.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-23 22:55:57 +08:00
Michael Scott 58b978c48b greybus: build: android: add all greybus modules to the build
We now have several modules generated by the greybus build.
Let's add any *.ko files we find to the buid.

Signed-off-by: Michael Scott <michael.scott@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-23 10:18:06 +08:00
Michael Scott 65760032f5 greybus: build: android: replace hard-coded build destination with variable
Make sure destination for greybus modules is consistent and easier to maintain

Signed-off-by: Michael Scott <michael.scott@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-23 10:18:06 +08:00
Greg Kroah-Hartman 6869eb56eb greybus: Revert "protocol: dedup protocol find code"
This reverts commit 241b5fefc54eae95239b0f7dc4e2b0db49457729 as it's
wrong, we want to insert into the correct place in the list.

Reported-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-23 10:06:24 +08:00
Greg Kroah-Hartman c1a0a8fccf greybus: Revert "protocol.c: fix a kernel panic caused by __gb_protocol_register"
This reverts commit 57131bf309d34568dd3b8f8e9da7a7ba25e9495e, it isn't
going to be needed as the patch this fixes will be reverted.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-23 10:05:58 +08:00
Viresh Kumar 62aadeeafa greybus: i2c: fix name conflict between function and struct: gb_i2c_transfer_request
'gb_i2c_transfer_request' is the name given to a function and a struct. Though
we don't get any compilation errors/warnings about it, but the names should be
unique.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-22 21:15:39 +08:00
Viresh Kumar f281f2dec1 greybus: i2c: fix name conflict between function and struct: gb_i2c_transfer_response
'gb_i2c_transfer_response' is the name given to a function and a struct. Though
we don't get any compilation errors/warnings about it, but the names should be
unique.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-22 21:15:39 +08:00
Alexandre Bailon c2f792382b greybus: protocol.c: fix a kernel panic caused by __gb_protocol_register
__gb_protocol_register check if the protocol is not already registred,
and then register it. It register in existing->lists but at this point,
existing is always NULL (we exist just before if not).
Use gb_protocols instead.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-22 21:15:23 +08:00
Viresh Kumar 89210f64ba greybus: remove unused version-response structs
These aren't used anymore and so can be removed.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-22 11:29:39 +08:00
Viresh Kumar 36e79dec96 greybus: create get_version() routines with the help of a macro
This gets rid of lots of duplication of code.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-22 11:29:39 +08:00
Viresh Kumar 530430b717 greybus: uart: s/REQ/TYPE
Request type for all other protocols is defined like: GB_<protocol>_TYPE_<operation>,
but for UART is like: GB_<protocol>_REQ_<operation>.

Replace REQ with TYPE to make it consistent. It will also be useful in a later
patch that creates get_version() routines with the help of a macro.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-22 11:29:39 +08:00
Viresh Kumar 98abb4146e greybus: Remove "gb-" prefix from .c files
Some files are still prefixed with "gb-" with the reasoning that the modules
would be named so, i.e.  gb-*.ko. But this can be done by playing a bit in
Makefile instead and keep uniform naming of .c files.

Lets try it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-22 11:27:20 +08:00
Viresh Kumar 5357cf3231 greybus: Remove "-gb" suffix from .c files
Some files are prefixed with "gb-" and some are suffixed with "-gb". The
rationale behind the first one is that the modules would be named so, i.e.
gb-*.ko. But there is no reason to keep the "-gb" suffix in the second case.

Remove the unnecessary suffix.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-22 11:27:20 +08:00
Greg Kroah-Hartman f587027e79 greybus: es2: add ES2 Greybus Host driver
This is just a copy of ES1 for now, things will start to diverge soon.
Any common functionality will be factored out over time.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-21 10:24:15 +08:00
Greg Kroah-Hartman 2ec515bfff greybus: es1: no need to assign a variable we return directly
In next_free_urb(), just return usb_alloc_urb(), don't waste the time
assigning it to a local variable that we then return.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-21 09:47:21 +08:00
Rui Miguel Silva 580c47d8b4 greybus: protocol: dedup protocol find code
in protocol register replace the protocol find code with the call to the already
existing function.

Signed-off-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-21 09:45:59 +08:00
Rui Miguel Silva 0008d9d0ad greybus: es1: release urb on error path
if error is return when submiting the urb, we need to make sure to release the
urb from the pool, or from the dinamicly allocated. As in it, factor out the free
code and create the free_urb function.

Signed-off-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-21 09:45:59 +08:00
Rui Miguel Silva b976266051 greybus: es1: remove useless statement
just return the result of usb_alloc_urb up, no need to rededunt check for NULL

Signed-off-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-21 09:45:59 +08:00
Perry Hung a1f2e40b1a greybus: gb_operation: drop operation refcount on cancel
An extra reference is taken out on an operation in
gb_operation_request_send(). If the response never arrives, we need to
put back the reference.

Signed-off-by: Perry Hung <perry@leaflabs.com>
Tested-by: Mitchell Tasman <tasman@leaflabs.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-16 11:09:45 -08:00
Perry Hung 7bad4e85b8 greybus: gb_operation: replace timeout workqueue
If an operation is issued and the response never comes back,
gb_operation_timeout() cancels the operation but never wakes up the
waiter in gb_operation_request_send().

This patch removes the timeout workqueue and changes the request wait to
wait_for_completion_interruptible_timeout(), with timeout set to
OPERATION_TIMEOUT_DEFAULT.

Signed-off-by: Perry Hung <perry@leaflabs.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-16 11:09:45 -08:00
Bill Pemberton 76590b1e88 greybus: gpio-gb: remove checks for negative offset variable
offset is defined as unsigned so there is no point checking for
negative values of offset.

Signed-off-by: Bill Pemberton <wfp5p@worldbroken.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-16 11:08:15 -08:00
Bill Pemberton 9d677cf604 greybus: Add FIXME warnings for possible NULL dereferences
Signed-off-by: Bill Pemberton <wfp5p@worldbroken.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-16 11:06:19 -08:00
Bill Pemberton 4e2b07e9ab greybus: gb-vibrator: remove useless if in timeout_store()
val is an unsigned long so there is no point in checking if it is less
than zero.

Signed-off-by: Bill Pemberton <wfp5p@worldbroken.com>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-16 11:06:19 -08:00
Greg Kroah-Hartman c86117a8a8 greybus: Move the es1_ap_desc.c file to Documentation directory
This .c file isn't needed by the kernel driver, it's there for firmware
developers only, so just move it into the Documentation directory to
reduce confusion.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-14 21:10:31 -08:00
Greg Kroah-Hartman 60a7ad7cae greybus: rename es1-ap-usb.ko to gb-es1.ko
Use the "gb-" prefix for the ES1 Host controller driver.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-14 21:10:31 -08:00
Greg Kroah-Hartman 347fedb70d greybus: rename battery-gb.c to gb-battery.c
Use the "gb" prefix for module names, not a suffix.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-14 21:10:31 -08:00
Greg Kroah-Hartman 419a8cf181 greybus: rename vibrator-gb.ko to gb-vibrator.ko
Use the "gb" prefix for module names, not a suffix.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-14 21:10:31 -08:00
Greg Kroah-Hartman 71479f6c6b greybus: rename gpbridge.ko to gb-phy.ko
This module provides the Bridged PHY protocols, so name the thing
properly.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-14 21:10:31 -08:00
Greg Kroah-Hartman 025677def8 greybus: Makefile: provide install target
Provide an install Makefile target for those that want to install the
kernel modules.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

--
v3: resend to list, somehow this thread got taken private and v2 never
    made it there.

v2: add -a option to depmod, thanks to Mitchell
2015-01-14 21:09:27 -08:00
Alexandre Bailon e2ed07f1e6 greybus: i2c-gb: fix bad message size in gb_i2c
The data_in_size variable was set to 1 for the status byte.
But now, the status byte has move to header. Then, the status byte
is "allocated" twice and cause bad message size error.

Signed-off-by: Alexandre Bailon <abailon@baylibre.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-14 13:12:07 -08:00
Greg Kroah-Hartman 88e70a6846 greybus: sysfs: put a \n at the end of all sysfs files
Right now some sysfs attributes have \n and some do not, so fix that and
put \n at the end of all of them to make it easier to parse things
properly in userspace.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2015-01-02 13:08:03 -08:00
Greg Kroah-Hartman 23ad7bb96b greybus: protocol: fix oops when no protocol is assigned
When removing a connection with no protocol assigned to it, the kernel
oopses as we always thought protocols were always there.

Fix that problem, oopses are bad.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-02 13:06:48 -08:00
Greg Kroah-Hartman 7422a1ec2e greybus: protocol: name protocols.
We want to be able to "blame" a protocol for things at times, so give
them a name we can refer to them by.  Announce when they are added or
removed from the system so we have a chance to know what is going on
in the kernel logs.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-02 13:06:48 -08:00
Greg Kroah-Hartman e5646710c1 greybus: module: get rid of global list of modules
Use the list that the driver core keeps of our structure, no need to
duplicate it with a local list as well.  This gets rid of a static lock
too, always a nice thing to do.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-02 13:05:42 -08:00
Greg Kroah-Hartman 2c07817e72 greybus: i2c-gb: move i2c protocol into the gpbridge driver
The i2c protocol belongs in the gpbridge driver, so move it
there.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-02 13:05:42 -08:00
Greg Kroah-Hartman e1308c1fb6 greybus: gpb: Create a "GP Bridge" kernel module
This bundles together the existing GP Bridged PHY protocols that were
part of the Greybus core: USB, UART, SDIO, PWM, and GPIO.  This is now a
stand-alone kernel module.  More logic will be moving here in the future
to handle bridged devices.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-02 13:05:42 -08:00
Greg Kroah-Hartman 7dd2626324 greybus: battery-gb: move the battery protocol out to a stand-alone module
This moves the battery class protocol to be a stand-alone kernel module.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-02 13:05:42 -08:00
Greg Kroah-Hartman 66b676fd88 greybus: vibrator-gb: move vibrator protocol to a stand-alone module.
We can't use the gb_protocol_driver() macro here as we need to do some
init and exit logic when loading and removing, so "open code" the module
init and exit functions.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-02 13:05:42 -08:00
Greg Kroah-Hartman 12a5dfc9ac greybus: protocol: add a module owner to a protocol
Now that protocols can be in a module, we need to reference count them
to lock them into memory so they can't be removed while in use.  So add
a module owner structure, and have it automatically be assigned when
registering the protocol.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-02 13:05:42 -08:00
Greg Kroah-Hartman 1b6ea0db01 greybus: bundle: create GB_DEVICE_ID_BAD
Use a "name" for when we don't have a valid device id yet, instead of a
magic value of 0xff.

Reported-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2015-01-02 13:05:42 -08:00
Greg Kroah-Hartman 900ceba9e4 greybus: i2c-gb: split out into a stand-alone kernel module.
This splits the i2c-gb protocol into a stand-alone kernel module.

It's not going to stay in this fashion for long, this was done to test
the "can a protcol be loaded later" logic.  Future refactoring is going
to move the gpbridge protocols to a separate kernel module, where this
protocol is going to live.

But for now, split it out, it is good to test with, and shows a bug in
gbsim at the moment.

Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-12-23 21:04:02 -08:00
Greg Kroah-Hartman fb69cb506c greybus: protocol: split binding of prototcols to connections out of init
When adding a new protocol to the system, walk all bundles and try to
hook up any connections that do not have a protocol already.  This sets
the stage to allow for protocols to be loaded at any time, not just
before the device is seen in the system.

Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-12-23 21:04:02 -08:00
Greg Kroah-Hartman df469a9423 greybus: export needed symbols for protocols
Protocol handlers need some greybus symbols, so export them so that they
can be built outside of the greybus core.

Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-12-23 21:03:35 -08:00
Greg Kroah-Hartman 7c7d5b9a94 greybus: protocol: switch gb_protocol_register() to return an int
We will want to return this value as a return value for module_init()
and bool does not play well with module_init().  So make it a "real"
error value and return int and fix up all callers of the function.

Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-12-23 21:02:20 -08:00
Greg Kroah-Hartman 86cad66677 greybus: interface: remove global manifest_descs list
The list was global and had no locking.  It's not like we were ever
parsing more than one manifest at the same time right now, but we might
in the future.  And we really want this to be local to the interface
itself, for future work redoing how to bind protocols to bundles, so
move the list to the interface structure.

Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-12-23 21:00:33 -08:00
Greg Kroah-Hartman df671553cb 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: Greg Kroah-Hartman <greg@kroah.com>
2014-12-23 15:30:00 -08:00
Greg Kroah-Hartman 4901175f28 greybus: interface: rename gb_modules_lock -> gb_interfaces_lock
It's a local interface lock, not a modules lock, so rename it.

Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-12-19 15:37:50 -08:00
Greg Kroah-Hartman 1cd56a8096 greybus: greybus_host_device: rename modules -> interfaces
This is really a list of interfaces, not modules, so rename it so that
we don't get confused when we really do add modules to the whole system
later on.

Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-12-19 15:37:50 -08:00
Greg Kroah-Hartman 13e6aacf60 greybus: interface: we really are creating/destroying interfaces not modules.
rename gb_add_module     -> gb_add_interface
rename gb_remove_modules -> gb_remove_interfaces
rename gb_remove_module  -> gb_remove_interface

And move the function prototypes to interface.h, where they belong.

Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-12-19 15:37:50 -08:00