Commit Graph

596 Commits

Author SHA1 Message Date
Alex Elder
81f4e22732 greybus: embed the i2c adapter struct
We don't need to dynamically allocate the i2c adapter structure, we
can just embed it right in struct gb_i2c_device.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-27 16:53:10 +08:00
Alex Elder
81d631cae8 greybus: gpio: kill gpio_controller->gpio
This field is never used (and not needed) so get rid of it.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-27 16:53:10 +08:00
Greg Kroah-Hartman
708971e43c greybus: operation: make the timeout a per-operation thing, not per-connection
An operation is what can timeout, not a connection itself.  So notify
the operation timedout, and the connection can then do with it as it
sees fit, if necessary.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-27 15:40:09 +08:00
Greg Kroah-Hartman
4afbba0703 greybus: core: make greybus_kill_gbuf not return a value
We can't do anything if killing a gbuf fails, so just make this function
"always" be successful.

At the same time, make the host controller function also be called
"kill_gbuf" to keep the terminology in sync.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2014-10-27 15:05:03 +08:00
Greg Kroah-Hartman
724b619dfb greybus: core: check for valid hcd callbacks
When registering a host controller, verify that all of the needed
callbacks are present, so we don't have to do the testing on any "hot"
paths when we want to send real data.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org.
2014-10-27 13:45:24 +08:00
Greg Kroah-Hartman
d81448849a greybus: gbuf: implement gbuf_kill_gbuf()
Hook up gbuf_kill_gbuf() by implementing yet-another-host-controller
callback and a gbuf-specific pointer to hold the tracking data the hcd
needs in order to be able to abort a transfer.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2014-10-27 13:45:24 +08:00
Greg Kroah-Hartman
d4c8247b56 greybus: gpio-gb: fix some endian sparse warnings that were real.
Not like we are ever going to use a BE cpu, but it's good to be
"correct"...

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-27 12:33:47 +08:00
Greg Kroah-Hartman
f9624ded90 greybus: operation: fix some sparse warnings
One of which was "real".

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-27 12:30:15 +08:00
Greg Kroah-Hartman
066799c18f greybus: module: don't create duplicate module ids
If we somehow get a hotplug event for a module id that we already have
created[1], don't try to create it again, or sysfs will complain loudly.
Instead, abort the creation properly.

[1] If, for example, you happened to run a script on a greybus emulator
twice in a row...

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Reviewed-by: Alex Elder <elder@linaro.org>
2014-10-24 19:00:21 +08:00
Greg Kroah-Hartman
3e6d5f3a61 greybus: i2c: point to the proper parent device
Use the connection, not the host controller, as the parent device of the
i2c device.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-24 18:36:24 +08:00
Greg Kroah-Hartman
44dd970be9 greybus: module: enable all sysfs attributes
We were thinking that module attributes were known at the time the
device was created in the system, so we could query them to know if the
sysfs file was present or not.  Unfortunatly that's not the case, we
create the device before we parse the values, so just always show the
sysfs attributes.  If there is no such attribute, the sysfs file will be
empty (i.e. for the string attributes.)

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-24 18:36:24 +08:00
Alex Elder
c4a432d3db greybus: fix repeated input errors
I screwed up the error handling in a patch the other day.  If we get
an error on an input URB we should not re-submit it.

Signed-off-by: Alex Elder <elder@linaro.org>
2014-10-24 18:36:24 +08:00
Greg Kroah-Hartman
f0f61b9042 greybus: hook up greybus to the driver model
This patch hooks up modules, interfaces, and connections to the driver
model.  Now we have a correct hierarchy, and drivers can be correctly
bound to the proper portions in the future.  Devices are correctly
reference counted and torn down in the proper order on removal of a
module.

Some basic sysfs attributes have been created for interfaces and
connections.  Module attributes are not working properly, but that will
be fixed in future changes.

This has been tested on Alex's machine, with multiple hotplug and unplug
operations of a module working correctly.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-24 17:40:59 +08:00
Alex Elder
2d5e4fa9dc greybus: update AP id service message
Rename and renumber the values for the AP ID service message
and related symbols to match the recently-updated spec.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-22 18:46:21 +08:00
Alex Elder
65e50f95f1 greybus: set route before sending packets
The route for a connection needs to be set *before* we initialize
the connection.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-22 18:46:21 +08:00
Matt Porter
8a9bf8a996 greybus: svc: remove the DDB function message support
We removed the DDB function messages from the spec as they are
not needed. Now remove it from the code.

Signed-off-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-22 18:29:35 +08:00
Alex Elder
c41b4f1212 greybus: only initialize interfaces when up
Rather than bringing up all interfaces described in the manifest,
wait until we get a link up message, and at that time go initialize
the link.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-22 17:22:22 +08:00
Alex Elder
525f1467bc greybus: make svc_set_route_send() public
Give svc_set_route_send() non-private scope so it can be used by a
function outside "ap.c" in the next patch.  Change its type so it
can tell its caller if an error occurs.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-22 17:20:28 +08:00
Alex Elder
36561f23a8 greybus: define connection state
Define the state of a connection.  A connection will not be
enabled until it has been successfully set up.  Once it starts
getting torn down its state will move to "being destroyed".

Don't send any operation request messages unless the connection is
enabled.  And drop any incoming messages if if the connection is
not enabled.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-22 17:20:28 +08:00
Alex Elder
e1158df063 greybus: define operation_cancel()
Define a new function operation_cancel() that cancels an
outstanding operation.  Use it to clear out any operations that
might be pending at the time a connection is torn down.

Note:  This code isn't really functional yet, partially because
greybus_kill_gbuf() is not implemented.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-22 17:20:28 +08:00
Alex Elder
e816e37419 greybus: time out operation requests
Arrange for operation requests that takke too long to time out.
At the moment, nothing happens when that occurs (other than a silly
message getting printed).  When the connection and operation and
interface and module code are cleaned up properly, this event should
most likely cause the affected module to get torn down.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-22 17:20:28 +08:00
Greg Kroah-Hartman
63e4a8ee8f greybus: module: fix double free of module
Also properly clean up all modules when you remove a host driver

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-10-22 16:38:07 +08:00
Matt Porter
060b93ddbb greybus: ap: add svc_set_route_send() command and use it on a link up event
When the AP receives a link up event, request that the SVC set a
route to the interface's device id (this device id has been
previously reported to the AP). In the future, we may not always
immediately set a route upon receiving a link up event but this
is sufficient for the known use cases at this time.

Signed-off-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-22 14:12:17 +08:00
Matt Porter
e390b193d6 greybus: svc: remove unneeded fields from the unipro set route message payload
CPort connections are being handled in the application layer connection
protocol and the layer 3 switch doesn't care about them. Also, the
switch doesn't care about a source device id when setting up the route
table. Reduce the message to just the necessary destination device ID.

As the SVC is aware of which switch port it found the module/interface
and assigned the device ID, we can simply tell the SVC to set a route
to the device ID it has reported to the AP as being active.

Signed-off-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-22 14:12:17 +08:00
Matt Porter
6232b073d4 greybus: ap: process the UniPro link up message
The link up message is the event that tells the AP what device ID
has been assigned to a particular interface on a module during
enumeration. The link up is sent *only* after the hotplug event
for a particular module has been sent to the AP.

The link up payload must carry the Module ID and Interface ID
to uniquely identify the struct gb_interface to which the
Device ID has been assigned.

After processing of the link up message, the interface's device_id
field will contain the assigned Device ID so that the AP has the
information necessary to issue network route commands.

Signed-off-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-22 13:57:49 +08:00
Matt Porter
1a4c013a44 greybus: interface: add gb_interface_find()
Add support for getting a struct gb_interface from an
Interface ID.

Signed-off-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-22 13:57:49 +08:00
Matt Porter
6271b5bac9 greybus: module: add gb_module_find()
Add support for getting a struct gb_module from a
Module ID.

Signed-off-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-22 13:57:49 +08:00
Greg Kroah-Hartman
0369a45998 greybus: battery-gb: Allow kernel values to get out of sync with greybus spec
We can't know that the greybus values and the kernel values for a number
of battery enumerated types will remain in sync.  And as theses are sent
by an external device from the kernel, we have to explicitly check these
values.

Reported-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 16:25:13 +08:00
Greg Kroah-Hartman
c9346e19b2 greybus: battery-gb.c: fix memory leak found by Viresh
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 15:51:53 +08:00
Greg Kroah-Hartman
cc662399dc greybus: Merge branch 'gregkh_work' into master
This pulls in the battery driver work I did there.
2014-10-21 14:37:44 +08:00
Matt Porter
98f4ab2df9 greybus: ap: add support for the AP Device ID unipro management function message
The AP needs to know its assigned Device ID in order to establish
Greybus connections between CPorts. We could have pulled the Device
ID from the controller hardware in a driver specific manner, but
instead we define one generic message from the SVC to let the
AP know this information. Add this additional unipro management
message and handle it by setting the supplied Device ID in the
struct greybus_host_device. The greybus core will use this to
populate the source Device ID when establishing a connection
between the AP and another module's CPort.

Signed-off-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 14:37:21 +08:00
Alex Elder
697e55d35d greybus: improve module cleanup code
When a module gets destroyed all of its state and the state of its
interfaces and connections (etc.) need to be torn down.  This is
not now being done properly.  Add this teardown code.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 14:36:11 +08:00
Alex Elder
fb305c335c greybus: stash power supply pointer in connection
The battery code was not stashing a copy of its private data
pointer.  It'll be needed in the next patch.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 14:36:11 +08:00
Alex Elder
03130a77d5 greybus: fix op_cycle logic
The function that computes the operation id for a connection is
wrongly using MOD rather than AND.  Fix that.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 14:36:11 +08:00
Greg Kroah-Hartman
c0855bfdd6 greybus: battery-gb: Add battery communication with the module
This adds support to talk to the battery to get the various requests
made to it, based on the battery protocol defined in the Greybus
Specification.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 14:31:24 +08:00
Alex Elder
1ec1d6dd35 greybus: leverage ap_disconnect() in ap_probe()
With a few minor changes, ap_disconnect() can correctly handle
cleaning up even a partially initialized USB interface.  Make those
changes, and then use ap_disconnect() to simplify cleanup for all
the error paths in ap_probe().  Reset all fields as they're cleaned
up to facilitate debugging.

Signed-off-by: Alex Elder <elder@linaro.org>
2014-10-21 06:32:01 +08:00
Alex Elder
6892537f61 greybus: move ap_disconnect()
The next patch has ap_probe() reference ap_disconnect().  To prepare
for that, move ap_disconnect() up in the file.

This is done as a separate commit to make it easier to see this move
involves no other change to that function.  This and the next commit
can be squashed if desired.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 06:28:24 +08:00
Alex Elder
6ff5e00a17 greybus: remove cports and strings from gb_module
We no longer keep copies of strings found in the manifuest in
a module's strings array, so we can get rid of the strings array.
Similarly, the new manifest parsing code sets up connections for
each cport id advertised for a module, so the cport array is
no longer needed either.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 06:28:23 +08:00
Alex Elder
09c521dc0a greybus: drop gb_* device fields from gb_module
A struct gb_module has a bunch of fields from the earlier skeleton
code, where a module was assumed to possibly have one of every
type of device available on the GP Bridge.  The manifest parsing
code changed it so these things will be related to connection
endpoints, so these gb_module fields are no longer needed.

A few of these (battery and sdio) haven't been implemented the "new
way" yet, so just leave a bit of the code that was there commented
out for now.

Also, gb_tty seems to be partially implemented and I don't want to
remove that without knowing where it's headed, so that one stays.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 06:27:37 +08:00
Alex Elder
5b3db0ddaa greybus: create a slab cache for operations
Everything we do on greybus will involve an operation, so create a
slab cache for that frequently-allocated data structure.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 06:25:54 +08:00
Alex Elder
599dc6aa8e greybus: properly drop device reference
Drop the USB device reference taken at the top of ap_probe() in the
event greybus_create_hd() fails.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 06:25:54 +08:00
Viresh Kumar
6813e35a0e greybus: .gitignore: minor updates
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 06:22:32 +08:00
Viresh Kumar
8597e6b2b9 greybus: Fix parameters of core_param()
core_param() takes four parameters instead of three and so results in this
compilation error:

greybus/core.c:25:33: error: macro "core_param" requires 4 arguments, but only 3 given
 core_param(nogreybus, bool, 0444);
                                 ^

Fix this by adding proper arguments to it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 06:22:32 +08:00
Matt Porter
ff6e0b9c2f greybus: gpio-gb: fix offset error checking and usage
Offset (or hwgpio num) is the offset within a gpiochip, not the
unique gpio namespace number. Adjust the error checking and use
of offset in our operation calls to fix this.

Signed-off-by: Matt Porter <mporter@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-21 06:22:32 +08:00
Greg Kroah-Hartman
42d4a22d6b greybus: add LED protocol numbers 2014-10-20 16:02:56 +08:00
Greg Kroah-Hartman
2bb7eae8be greybus: battery: some hooking up to the greybus core
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-20 15:24:57 +08:00
Matt Porter
47ee0d135e greybus: gpio-gb: remove unused status field from struct gb_gpio_get_value_request
probably a cut and paste error got this unused status field. remove it.

Signed-off-by: Matt Porter <mporter@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-20 15:11:25 +08:00
Greg Kroah-Hartman
43789c319e greybus: battery-gb: provide accessors for a few more functions
Put the hard coded values in a function to make it easier to see what
needs to be done here.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-20 15:09:49 +08:00
Greg Kroah-Hartman
213aefe206 greybus: gpio-gb: allow it to build properly for all current kernel versions.
GPIO remove changed the api for 3.17 to try to make up for some
previously foolish design decisions.  Handle that in kernel_ver.h to
make the code simple.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-20 13:40:02 +08:00
Greg Kroah-Hartman
6ce3e03f71 greybus: greybus_manifest.h: fix up class protocol numbers to match the spec.
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
2014-10-20 13:27:42 +08:00