lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20190414124029.1f1f6084@archlinux>
Date:   Sun, 14 Apr 2019 12:40:29 +0100
From:   Jonathan Cameron <jic23@...nel.org>
To:     "H. Nikolaus Schaller" <hns@...delico.com>
Cc:     Dmitry Torokhov <dmitry.torokhov@...il.com>,
        Eric Piel <eric.piel@...mplin-utc.net>,
        linux-input@...r.kernel.org, letux-kernel@...nphoenux.org,
        kernel@...a-handheld.com, Hartmut Knaack <knaack.h@....de>,
        Lars-Peter Clausen <lars@...afoo.de>,
        Peter Meerwald-Stadler <pmeerw@...erw.net>,
        linux-kernel@...r.kernel.org, linux-iio@...r.kernel.org
Subject: Re: [RFC v2] iio: input-bridge: optionally bridge iio acceleometers
 to create a /dev/input interface

On Mon, 8 Apr 2019 15:15:56 +0200
H. Nikolaus Schaller <hns@...delico.com> wrote:

> Hi Jonathan,
> 
> > Am 07.04.2019 um 14:30 schrieb Jonathan Cameron <jic23@...nel.org>:
> > 
> > On Sun, 31 Mar 2019 12:09:46 +0200
> > "H. Nikolaus Schaller" <hns@...delico.com> wrote:
> > 
> > Hi Nikolaus,
> > 
> > I'm probably going to repeat a few things I sent for v1 as the audience has
> > expanded somewhat!
> > 
> > Good to see this moving forwards though as there has been at least some demand
> > for it going way back to the early days of IIO.
> >   
> >> Some user spaces (e.g. some Android devices) use /dev/input/event* for handling
> >> the 3D position of the device with respect to the center of gravity (earth).
> >> This can be used for gaming input, auto-rotation of screens etc.
> >> 
> >> This interface should be the standard for such use cases because it is an abstraction
> >> of how orientation data is acquired from sensor chips. Sensor chips may be connected
> >> through different interfaces and in different positions. They may also have different
> >> parameters. And, if a chip is replaced by a different one, the values reported by
> >> the device position interface should remain the same, provided the device tree reflects
> >> the changed chip.
> >> 
> >> This did initially lead to input accelerometer drivers like drivers/input/misc/bma150.c
> >> or drivers/misc/lis3lv02d/
> >> 
> >> But nowadays, new accelerometer chips mostly get iio drivers and rarely input drivers.
> >> 
> >> Therefore we need something like a protocol stack which bridges raw data and input devices.
> >> It can be seen as a similar layering like TCP/IP vs. bare Ethernet. Or keyboard
> >> input events vs. raw gpio or raw USB access.
> >> 
> >> This patch bridges the gap between raw iio data and the input device abstraction
> >> so that accelerometer measurements can additionally be presented as X/Y/Z accelerometer
> >> channels (INPUT_PROP_ACCELEROMETER) through /dev/input/event*.
> >> 
> >> There are no special requirements or changes needed for an iio driver.
> >> 
> >> There is no need to define a mapping (e.g. in device tree).  
> > This worries me, as it inherently means we end up with this interface being
> > registered in cases where it makes no sense.  A lot of generic distros get
> > used across widely differing use cases.  
> 
> I still do not fully understand what is worrying you here.

> 
> Do you worry about functionality, flexibility or resources or something else?

Two main things:
1) Lack of generality of the approach. 
   This is a single use trick for input devices. Why does it make sense for
   input devices?  There are lots of other in kernel users and potential
   ones in the future.  The ability to register additional IIO consumers like
   this is useful, lets make it useful to everyone.

2) To much generality of the specific usecase.  I don't want to put an Input
   interface on accelerometers where it makes no sense.  The rule of it has
   2-3 axis so it must make sense isn't good enough to my mind.  How
   does userspace know which accelerometer to use (more and more devices have
   multiple?)  You could do something like looking at the location info from
   DT / ACPI in your driver and pick the 'best' but that's policy. Should be
   in userspace.  Sure you can just use the right input driver, but the moment
   we do that, we need aware userspace, if that's the case why not make it
   aware from the start.

Believe me I've been round this one a good few times and thought about it
a lot.  I'll take a lot of convincing that this isn't a problem that
should be pushed into userspace.

> 
> I think having them mapped always does not need much resources (except a handful of bytes
> in memory and some µs during probing) unless the event device is opened and really used.
> Only then it starts e.g. I2C traffic to read the sensors.

The bytes don't really mater. The userspace ABI additions do.

> 
> So it is just some unused file sitting around in /dev. Or 2 or could be even 100.
> For devices which have no iio accelerometers configured, there will be no /dev/input
> file. So we are discussing the rare case of devices with more than one or two accelerometers.

Well they aren't exactly rare in IIO using systems ;)

> 
> Now, on every system there are many interfaces and files that are not used because it makes
> no sense to look at them. If I check on one of my systems, I find for example a lot of
> /dev/tty and only a very small portion is used and generic distros have no issue with it.
> 
> There is even /dev/iio:device0 to /dev/iio:device5 representing the raw iio devices.
> Not all of them are actively used, but they are simply there and can be scanned for.

Agreed, in the ideal case we wouldn't have had that either, but we are
stuck with it.  The long term plan is to allow use of IIO backends without the
front end being there at all. Lots of SoC ADC users would prefer this. We are
stuck with the legacy intertwining fo the front end and back end of IIO so
this isn't as easy to do as I would like.

> 
> So I do not see a resource problem if every accelerometer /dev/iio:device* gets
> some companion /dev/input/event* for being used on demand - but only if this bridge
> is configured at all.

That argument does not apply. If we add a config option, distros will enable it.
So the vast majority of systems will ship with this turned on.  You cannot
use a config variable to control policy and expect it to be change by anyone
but a very very small subset of users.  So please drop the 'you can just not
build it argument'.

Userspace configuration changing is a lot easier if people actually care.
Sure, many distros will ship the same script to everyone.

> 
> > I think we need some deliberate userspace interaction to instantiate
> > one of these rather than 'always doing it'.  
> 
> My gut feeling is that this additional user-space interaction needs more resources and
> adds a lot of complexity, independently of how it is done.

Trivial resources and actually fairly trivial complexity.  Key thing is
it puts the burden on the users of this functionality to configure what they
want.

> 
> And I think is even less flexible than "always doing it". Let me explain this claim.
> 
> For me, the kernel should present everything the hardware supports to user-space
> in better digestable device files or APIs (without making any assumptions about the
> user-space code).

Agreed, we just have a different view on how this should be done. I want
it to be dynamic and extremely flexible, you want the easy way of just
putting a fixed set out all the time.

> 
> Then, every user-space that will be installed can find out what the hardware supports
> by looking at standard places.
> 
> E.g. it can scan for all mice and keyboards. And for all input accelerometers.

Or, you an have the correct 'fairly trivial' userspace setup to scan for all
registered accelerometers and 'on demand' create the bindings to bring them up as
Input accelerometers if that is what makes sense for your platform.

> 
> If the kernel is hiding some chips and needs some initial user-space action before
> presenting them all, this requires that the user-space has some a-priori knowledge
> about which specific devices it should ask for.

No more that it needs to know which accelerometer to use?

> So it does not really need to scan
> for them. Because it must already know. Obviously in some mapping table stored at
> a well known location inside the rootfs image.

No. Let me give some more details of how this would work.  It's really just
a more flexible version of what you have.

A distro, or individual user decides to put the relevant script in place for the
following:

1. Userspace detects a new accelerometer driver, via the standard methods (uevent)
2. Userspace looks to see if it has the required properties. Now this includes things
like detecting that it is the accelerometer in the lid of a laptop - if so do not
register it as an input device.  If it's in the keyboard then do register it.
3. Userspace script then creates the files in configfs
/sys/kernel/config/iio/maps/
(this interface needs appropriate definition)
Maybe...
/sys/kernel/config/iio/maps/iio_input/iio_device:X/accel_x, accel_y, etc
When done it writes to the bind file
/sys/kernel/config/iio/maps/iio_input/iio_device:X/bind
which instantiates the input driver.

This moves all of the policy decision into userspace, where it belongs.  If
we want to enable a particular accelerometer on a particular board because it
actually works better than the one the default policy says to use, then we can
do so.

The resulting infrastructure is much more general, because it lets us do the
same for any IIO consumer.  This input bridge is not a special case. It works
equally well for the existing hwmon bridge any would even let us do things
like provide the information from userspace that we have an analog accelerometer
wired up to an ADC on some hacker board.


> 
> This seems to make it impossible to develop a generic distro rootfs image - without
> asking the user for manual configuration. And that where the kernel already knows
> this (which iio accelerometers do exist for a specific piece of hardware).
> 
> This is why I believe a mechanism to instantiate only on demand isn't adding but
> removing flexibility because it prevents copying a rootfs from one device to another.

I disagree, see above.

> 
> > 
> > As I mentioned in V1, look at the possibility of a configfs based method
> > to build the map.  It's easy for userspace to work out what makes sense to
> > map in principle.  There may be some missing info that we also need to
> > look to expose.  
> 
> With a "may be missing" it is impossible to write code for it...
> Can you please name which information is missing on the input accelerometer
> API?

See above. It's not the input accelerometer ABI, it's the missing ability
to instantiate IIO maps from user space.

> 
> > 
> > In general, userspace created channel maps would be very useful for
> > other things such as maker type boards where they can plug all sorts
> > of odd things into ADC channels for example.  
> 
> Ok, I understand, but this is a different problem where this iio-input-bridge is not
> intended to be a solution. Generic ADCs are not input devices. Like SD cards are not
> keyboards.
> 
> So we should not try to mix the idea of general mapping with this input-bridge for
> input accelerometers.
Yes we should. You are proposing a solution that is a subset of the larger
problem set.  Why introduce a stop gap like this when we can do it correctly
and provide something useful for all those other use cases.

The only difference here is the uevent triggered script that creates those maps
for your particular usecase.


> 
> BTW, there is a way to define additional mapping using udev rules which symlink the
> /dev/input/event* paths to stable names like /dev/input/accelerometer.
> 
> This comes without additional code and is already provided by udev and the input system.
> 
> So in summary, I have not yet seen a convincing scenario where being able to dynamically
> map iio channels to input devices seems beneficial.

That is true for the narrow case you are talking about. I don't want to see that
narrow case solved in a fashion that effectively breaks solving it properly.
If we add this, we have to export all accelerometers for ever under all circumstances
to userspace, because to remove it will break existing userspace.

If we stand back and work out if we can do the general solution now, we avoid
this problem.

> 
> >   
> >> 
> >> This driver simply collects the first 3 accelerometer channels as X, Y and Z.
> >> If only 1 or 2 channels are available, they are used for X and Y only. Additional
> >> channels are ignored.
> >> 
> >> Scaling is done automatically so that 1g is represented by value 256 and
> >> range is assumed to be -511 .. +511 which gives a reasonable precision as an
> >> input device.  
> > 
> > Why do we do this, rather than letting input deal with it?  Input is used
> > to widely differing scales IIRC  
> 
> Well, it can't be done differently... And what I call scale here is nothing more than
> defining ABSMIN_ACC_VAL and ABSMAX_ACC_VAL.
> 
> We need to apply some scale since iio reports in (fractional) units of 1g, i.e. values
> of magnitude 1.

m/s^2 not g, but doesn't matter for the point of view of this discussion.

> These are not adaequate for input events which use integers. So we must
> define some factor for iio_convert_raw_to_processed() to scale from raw value range
> to int value range. We could report raw values but this would be an improper abstraction
> from chip specific differences.

Hmm. I can see we perhaps need some mapping, but is there a concept of standard scale
for existing input accelerometers?  How is this done to give for other input devices
such as touch screens?  I'd expect to see a separation between scale, and range.


> 
> BTW: the range (and therefore the factor) is reported through the evdev driver to user-space
> (evtest reports Min and Max as you can see in the example).
> 
> The most important thing is that this is a hardware independent definition. Every accelerometer
> chip will report this range. So you can easily upgrade hardware or switch accelerometers
> without touching user-space calibration. Like you can replace ethernet controller chips but
> networking works the same with all of them.

Agreed, it needs to be hardware independent by the time it hits userspace, but I would
have thought that scaling would be done in input, rather than IIO. It's hardly
a problem unique to our usecase!

Perhaps Dmitry can give some advice on this.

> 
> >   
> >> 
> >> If a mount-matrix is provided by the iio driver, it is also taken into account
> >> so that the input event automatically gets the correct orientation with respect
> >> to the device.
> >> 
> >> If this extension is not configured into the kernel it takes no resources (except
> >> source code).
> >> 
> >> If it is configured, but there is no accelerometer, there is only a tiny penalty
> >> for scanning for accelerometer channels once during probe of each iio device.
> >> 
> >> If it runs, the driver polls the device(s) once every 100 ms. A mode where the
> >> iio device defines the update rate is not implemented and for further study.
> >> 
> >> If there is no user-space client, polling is not running.
> >> 
> >> The driver is capable to handle multiple iio accelerometers and they are
> >> presented by unique /dev/input/event* files. The iio chip name is used to define
> >> the input device name so that it can be identified (e.g. by udev rules or evtest).
> >> 
> >> Here is some example what you can expect from the driver (device:
> >> arch/arm/boot/dts/omap3-gta04a5.dts):
> >> 
> >> root@...ux:~# dmesg|fgrep iio
> >> [    6.324584] input: iio-bridge: bmc150_accel as /devices/platform/68000000.ocp/48072000.i2c/i2c-1/1-0010/iio:device1/input/input5
> >> [    6.516632] input: iio-bridge: bno055 as /devices/platform/68000000.ocp/48072000.i2c/i2c-1/1-0029/iio:device3/input/input7
> >> root@...ux:~# evtest /dev/input/event5 | head -19
> >> Input driver version is 1.0.1
> >> Input device ID: bus 0x0 vendor 0x0 product 0x0 version 0x0
> >> Input device name: "iio-bridge: bmc150_accel"
> >> Supported events:
> >>   Event type 0 (EV_SYN)
> >>   Event type 3 (EV_ABS)
> >>     Event code 0 (ABS_X)
> >>       Value      8
> >>       Min     -511
> >>       Max      511
> >>     Event code 1 (ABS_Y)
> >>       Value    -44
> >>       Min     -511
> >>       Max      511
> >>     Event code 2 (ABS_Z)
> >>       Value   -265
> >>       Min     -511
> >>       Max      511
> >> Properties:
> >> root@...ux:~# evtest /dev/input/event7 | head -19
> >> Input driver version is 1.0.1
> >> Input device ID: bus 0x0 vendor 0x0 product 0x0 version 0x0
> >> Input device name: "iio-bridge: bno055"
> >> Supported events:
> >>   Event type 0 (EV_SYN)
> >>   Event type 3 (EV_ABS)
> >>     Event code 0 (ABS_X)
> >>       Value     -6
> >>       Min     -511
> >>       Max      511
> >>     Event code 1 (ABS_Y)
> >>       Value     17
> >>       Min     -511
> >>       Max      511
> >>     Event code 2 (ABS_Z)
> >>       Value   -250
> >>       Min     -511
> >>       Max      511
> >> Properties:
> >> root@...ux:~# 
> >> 
> >> Although the sensor chips are mounted with different axis orientation,
> >> the application of the mount matrix provides equivalent (despite noise
> >> and precision) information on device orientation.
> >> 
> >> Signed-off-by: H. Nikolaus Schaller <hns@...delico.com>
> >> ---
> >> drivers/iio/Kconfig                    |   7 +
> >> drivers/iio/Makefile                   |   1 +
> >> drivers/iio/industrialio-core.c        |  12 +
> >> drivers/iio/industrialio-inputbridge.c | 295 +++++++++++++++++++++++++
> >> drivers/iio/industrialio-inputbridge.h |  28 +++
> >> 5 files changed, 343 insertions(+)
> >> create mode 100644 drivers/iio/industrialio-inputbridge.c
> >> create mode 100644 drivers/iio/industrialio-inputbridge.h
> >> 
> >> diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig
> >> index d08aeb41cd07..d85afe002613 100644
> >> --- a/drivers/iio/Kconfig
> >> +++ b/drivers/iio/Kconfig
> >> @@ -68,6 +68,13 @@ config IIO_TRIGGERED_EVENT
> >> 	help
> >> 	  Provides helper functions for setting up triggered events.
> >> 
> >> +config IIO_INPUT_BRIDGE
> >> +	bool "Enable accelerometer bridge to input driver"  
> > 
> > Dependency on input?  
> 
> Yes, should be added.
> 
> >   
> >> +	help
> >> +	  Provides a /dev/input/event* device for accelerometers
> >> +	  to use as a 3D input device, e.g. for gaming or auto-rotation
> >> +	  of screen contents.
> >> +
> >> source "drivers/iio/accel/Kconfig"
> >> source "drivers/iio/adc/Kconfig"
> >> source "drivers/iio/afe/Kconfig"
> >> diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile
> >> index cb5993251381..d695e5a27da5 100644
> >> --- a/drivers/iio/Makefile
> >> +++ b/drivers/iio/Makefile
> >> @@ -7,6 +7,7 @@ obj-$(CONFIG_IIO) += industrialio.o
> >> industrialio-y := industrialio-core.o industrialio-event.o inkern.o
> >> industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o
> >> industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o
> >> +industrialio-$(CONFIG_IIO_INPUT_BRIDGE) += industrialio-inputbridge.o
> >> 
> >> obj-$(CONFIG_IIO_CONFIGFS) += industrialio-configfs.o
> >> obj-$(CONFIG_IIO_SW_DEVICE) += industrialio-sw-device.o
> >> diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
> >> index 4700fd5d8c90..81f412b41a78 100644
> >> --- a/drivers/iio/industrialio-core.c
> >> +++ b/drivers/iio/industrialio-core.c
> >> @@ -29,6 +29,7 @@
> >> #include <linux/iio/iio.h>
> >> #include "iio_core.h"
> >> #include "iio_core_trigger.h"
> >> +#include "industrialio-inputbridge.h"
> >> #include <linux/iio/sysfs.h>
> >> #include <linux/iio/events.h>
> >> #include <linux/iio/buffer.h>
> >> @@ -1723,6 +1724,15 @@ int __iio_device_register(struct iio_dev *indio_dev, struct module *this_mod)
> >> 	if (ret < 0)
> >> 		goto error_unreg_eventset;
> >> 
> >> +	ret = iio_device_register_inputbridge(indio_dev);
> >> +	if (ret) {
> >> +		dev_err(indio_dev->dev.parent,
> >> +			"Failed to register as input driver\n");
> >> +		device_del(&indio_dev->dev);
> >> +  
> > This doesn't look like balanced error handling given the goto in the previous
> > case.  If we are treating this as an error we need to unwind the whole
> > of this function properly.  
> 
> Will to check.
> 
> >   
> >> +		return ret;
> >> +	}
> >> +
> >> 	return 0;
> >> 
> >> error_unreg_eventset:
> >> @@ -1745,6 +1755,8 @@ void iio_device_unregister(struct iio_dev *indio_dev)
> >> {
> >> 	mutex_lock(&indio_dev->info_exist_lock);
> >> 
> >> +	iio_device_unregister_inputbridge(indio_dev);
> >> +
> >> 	cdev_device_del(&indio_dev->chrdev, &indio_dev->dev);
> >> 
> >> 	iio_device_unregister_debugfs(indio_dev);
> >> diff --git a/drivers/iio/industrialio-inputbridge.c b/drivers/iio/industrialio-inputbridge.c
> >> new file mode 100644
> >> index 000000000000..dd672e25bc70
> >> --- /dev/null
> >> +++ b/drivers/iio/industrialio-inputbridge.c
> >> @@ -0,0 +1,295 @@
> >> +// SPDX-License-Identifier: GPL-2.0
> >> +/*
> >> + * The Industrial I/O core, bridge to input devices
> >> + *
> >> + * Copyright (c) 2016-2019 Golden Delicious Computers GmbH&Co. KG
> >> + *
> >> + * This program is free software; you can redistribute it and/or modify it
> >> + * under the terms of the GNU General Public License version 2 as published by
> >> + * the Free Software Foundation.  
> > No need for the boiler plate if you have SPDX.  That is one of the
> > advantages!  
> 
> Ok.
> 
> >   
> >> + */
> >> +
> >> +#include <linux/iio/consumer.h>
> >> +#include <linux/iio/iio.h>
> >> +#include <linux/iio/types.h>
> >> +#include <linux/input.h>
> >> +#include <linux/input-polldev.h>
> >> +#include <linux/module.h>
> >> +#include <linux/slab.h>
> >> +
> >> +#include "industrialio-inputbridge.h"
> >> +
> >> +/* currently, only polling is implemented */
> >> +#define POLLING_MSEC	100
> >> +
> >> +struct iio_input_map {
> >> +	struct input_polled_dev *poll_dev;	/* the input device */
> >> +	struct iio_channel channels[3];		/* x, y, z channels */
> >> +	struct matrix {
> >> +		int mxx, myx, mzx;	/* fixed point mount-matrix */
> >> +		int mxy, myy, mzy;
> >> +		int mxz, myz, mzz;
> >> +	} matrix;
> >> +};
> >> +
> >> +static inline struct iio_input_map *to_iio_input_map(
> >> +		struct iio_channel *channel)
> >> +{
> >> +	return (struct iio_input_map *) channel->data;
> >> +}
> >> +
> >> +/* minimum and maximum range we want to report */
> >> +#define ABSMAX_ACC_VAL		(512 - 1)
> >> +#define ABSMIN_ACC_VAL		-(ABSMAX_ACC_VAL)
> >> +
> >> +/* scale processed iio values so that 1g maps to ABSMAX_ACC_VAL / 2 */
> >> +#define SCALE			((100 * ABSMAX_ACC_VAL) / (2 * 981))
> >> +
> >> +/*
> >> + * convert float string to scaled fixed point format, e.g.
> >> + *   1		-> 1000		(value passed as unit)
> >> + *   1.23	-> 1230
> >> + *   0.1234	->  123
> >> + *   -.01234	->  -12
> >> + */
> >> +
> >> +static int32_t atofix(const char *str, uint32_t unit)
> >> +{
> >> +	int32_t mantissa = 0;
> >> +	bool sign = false;
> >> +	bool decimal = false;
> >> +	int32_t divisor = 1;
> >> +
> >> +	if (*str == '-')
> >> +		sign = true, str++;
> >> +	while (*str && divisor < unit) {
> >> +		if (*str >= '0' && *str <= '9') {
> >> +			mantissa = 10 * mantissa + (*str - '0');
> >> +			if (decimal)
> >> +				divisor *= 10;
> >> +		} else if (*str == '.')
> >> +			decimal = true;
> >> +		else
> >> +			return 0;	/* error */
> >> +		str++;
> >> +	}
> >> +
> >> +	mantissa = (mantissa * unit) / divisor;
> >> +	if (sign)
> >> +		mantissa = -mantissa;
> >> +
> >> +	return mantissa;
> >> +}
> >> +
> >> +static void iio_apply_matrix(struct matrix *m, int *in, int *out, uint32_t unit)
> >> +{
> >> +	/* apply mount matrix */
> >> +	out[0] = (m->mxx * in[0] + m->myx * in[1] + m->mzx * in[2]) / unit;
> >> +	out[1] = (m->mxy * in[0] + m->myy * in[1] + m->mzy * in[2]) / unit;
> >> +	out[2] = (m->mxz * in[0] + m->myz * in[1] + m->mzz * in[2]) / unit;
> >> +}
> >> +
> >> +#define FIXED_POINT_UNIT	1000	/* seems reasonable for accelerometer input */
> >> +
> >> +static void iio_accel_poll(struct input_polled_dev *dev)
> >> +{
> >> +	struct iio_input_map *map = dev->private;
> >> +	struct input_dev *input = dev->input;
> >> +
> >> +	int values[3];		/* values while processing */
> >> +	int aligned_values[3];	/* mount matrix applied */
> >> +
> >> +	int cindex = 0;
> >> +
> >> +printk("%s: map=%px input=%px\n", __func__, map, input);  
> > Remember to tidy these debug statements up at some point.  
> 
> Oops... Shouldn't be there. Maybe I did squash in some commit from my debugging branch.
> 
> >   
> >> +
> >> +	while (cindex < ARRAY_SIZE(values)) {
> >> +		struct iio_channel *channel =
> >> +			&map->channels[cindex];
> >> +		int val;
> >> +		int ret;
> >> +
> >> +		if (!channel->indio_dev) {
> >> +			values[cindex] = 0;
> >> +			continue;
> >> +		}
> >> +
> >> +		ret = iio_read_channel_raw(channel, &val);
> >> +
> >> +		if (ret < 0) {
> >> +			pr_err("%s(): channel read error %d\n",
> >> +				__func__, cindex);
> >> +			return;
> >> +		}
> >> +
> >> +		ret = iio_convert_raw_to_processed(channel, val,
> >> +				 &values[cindex], SCALE);
> >> +
> >> +		if (ret < 0) {
> >> +			pr_err("%s(): channel processing error\n",
> >> +				__func__);
> >> +			return;
> >> +		}
> >> +
> >> +		cindex++;
> >> +	}
> >> +
> >> +	iio_apply_matrix(&map->matrix, values, aligned_values, FIXED_POINT_UNIT);
> >> +
> >> +	input_report_abs(input, ABS_X, aligned_values[0]);
> >> +	input_report_abs(input, ABS_Y, aligned_values[1]);
> >> +	input_report_abs(input, ABS_Z, aligned_values[2]);
> >> +	input_sync(input);
> >> +}
> >> +
> >> +static int dindex=0;	/* assign unique names to accel/input devices */  
> > Build something from the iio device IDA perhaps?  Those are unique
> > as well.  Useful to know which one this is linked to.  
> 
> We just use this unique number in the poll_dev->input->phys name.
> Mainly this number gives them unique names in /sys/class/input/input*/phys
>  
> Using the iio device IDA seems to be a very good replacement.
> 
> >   
> >> +
> >> +static int iio_input_register_accel_channel(struct iio_dev *indio_dev,
> >> +		 const struct iio_chan_spec *chan)
> >> +{ /* we found some accelerometer channel */
> >> +	int ret;
> >> +	int cindex;
> >> +	struct iio_input_map *map = iio_device_get_drvdata(indio_dev);  
> > 
> > Don't do that.   That is in the domain of the device driver and so
> > will sometimes already be in use.   
> 
> Hm. Is there an alternative to attach such private data to an struct iio_dev
> allocated by someone else? I have not found one yet.
> 
> Or can I add some void *input_mapping; to struct iio_dev? Depending on
> #if defined(CONFIG_IIO_INPUT_BRIDGE)?

Yes, add a new element.

> 
> >   
> >> +
> >> +printk("%s: map=%px\n", __func__, map);
> >> +
> >> +	if (!map) {
> >> +		struct input_polled_dev *poll_dev;
> >> +		const struct iio_chan_spec_ext_info *ext_info;
> >> +
> >> +		map = devm_kzalloc(&indio_dev->dev, sizeof(struct iio_input_map), GFP_KERNEL);
> >> +		if (!map)
> >> +			return -ENOMEM;
> >> +
> >> +		iio_device_set_drvdata(indio_dev, map);
> >> +
> >> +		poll_dev = devm_input_allocate_polled_device(&indio_dev->dev);
> >> +		if (!poll_dev)
> >> +			return -ENOMEM;
> >> +
> >> +		poll_dev->private = map;
> >> +		poll_dev->poll = iio_accel_poll;
> >> +		poll_dev->poll_interval = POLLING_MSEC;
> >> +
> >> +		poll_dev->input->name = kasprintf(GFP_KERNEL, "iio-bridge: %s",
> >> +						    indio_dev->name);
> >> +		poll_dev->input->phys = kasprintf(GFP_KERNEL, "accel/input%d",  
> 
> If we use the IDA, we can define phys as "iio:device%d", indio_dev->id)
> which makes it easy to locate the associated iio device file name (although
> there are other mechanisms in sysfs tree).
> 
> >> +						    dindex++);
> >> +
> >> +// do we need something like this?
> >> +//		poll_dev->input->id.bustype = BUS_IIO;
> >> +//		poll_dev->input->id.vendor = 0x0001;
> >> +//		poll_dev->input->id.product = 0x0001;
> >> +//		poll_dev->input->id.version = 0x0001;
> >> +
> >> +		set_bit(INPUT_PROP_ACCELEROMETER, poll_dev->input->propbit);
> >> +		poll_dev->input->evbit[0] = BIT_MASK(EV_ABS);
> >> +		input_alloc_absinfo(poll_dev->input);
> >> +		input_set_abs_params(poll_dev->input, ABS_X, ABSMIN_ACC_VAL,
> >> +					ABSMAX_ACC_VAL, 0, 0);
> >> +		input_set_abs_params(poll_dev->input, ABS_Y, ABSMIN_ACC_VAL,
> >> +					ABSMAX_ACC_VAL, 0, 0);
> >> +		input_set_abs_params(poll_dev->input, ABS_Z, ABSMIN_ACC_VAL,
> >> +					ABSMAX_ACC_VAL, 0, 0);
> >> +
> >> +		map->poll_dev = poll_dev;
> >> +
> >> +		ret = input_register_polled_device(poll_dev);
> >> +
> >> +		if (ret < 0) {
> >> +			kfree(poll_dev->input->name);
> >> +			kfree(poll_dev->input->phys);
> >> +			return ret;
> >> +		}
> >> +
> >> +		/* assume all channels of a device share the same matrix */
> >> +
> >> +		ext_info = chan->ext_info;
> >> +		for (; ext_info && ext_info->name; ext_info++) {
> >> +			if (strcmp(ext_info->name, "mount_matrix") == 0)
> >> +				break;
> >> +		}
> >> +
> >> +		if (ext_info && ext_info->name) {
> >> +			/* matrix found */
> >> +			uintptr_t priv = ext_info->private;
> >> +			const struct iio_mount_matrix *mtx;
> >> +
> >> +			mtx = ((iio_get_mount_matrix_t *) priv)(indio_dev,
> >> +								chan);
> >> +
> >> +			map->matrix.mxx = atofix(mtx->rotation[0], FIXED_POINT_UNIT);
> >> +			map->matrix.myx = atofix(mtx->rotation[1], FIXED_POINT_UNIT);
> >> +			map->matrix.mzx = atofix(mtx->rotation[2], FIXED_POINT_UNIT);
> >> +			map->matrix.mxy = atofix(mtx->rotation[3], FIXED_POINT_UNIT);
> >> +			map->matrix.myy = atofix(mtx->rotation[4], FIXED_POINT_UNIT);
> >> +			map->matrix.mzy = atofix(mtx->rotation[5], FIXED_POINT_UNIT);
> >> +			map->matrix.mxz = atofix(mtx->rotation[6], FIXED_POINT_UNIT);
> >> +			map->matrix.myz = atofix(mtx->rotation[7], FIXED_POINT_UNIT);
> >> +			map->matrix.mzz = atofix(mtx->rotation[8], FIXED_POINT_UNIT);
> >> +		} else {
> >> +			map->matrix.mxx = FIXED_POINT_UNIT;
> >> +			map->matrix.myx = 0;
> >> +			map->matrix.mzx = 0;
> >> +			map->matrix.mxy = 0;
> >> +			map->matrix.myy = FIXED_POINT_UNIT;
> >> +			map->matrix.mzy = 0;
> >> +			map->matrix.mxz = 0;
> >> +			map->matrix.myz = 0;
> >> +			map->matrix.mzz = FIXED_POINT_UNIT;
> >> +		}
> >> +	}
> >> +
> >> +// brauchen wir das noch? Oder nehmen wir einfach an dass es 3 Kanäle gibt?
> >> +
> >> +	/* find free channel within this device */
> >> +
> >> +	for (cindex = 0; cindex < ARRAY_SIZE(map->channels); cindex++) {
> >> +		if (!map->channels[cindex].indio_dev)
> >> +			break;
> >> +	}
> >> +
> >> +	/* check if we already have collected enough channels */
> >> +	if (cindex == ARRAY_SIZE(map->channels))
> >> +		return 0;	/* silently ignore */
> >> +
> >> +	map->channels[cindex].indio_dev = indio_dev;
> >> +	map->channels[cindex].channel = chan;
> >> +	map->channels[cindex].data = map;
> >> +
> >> +	return 0;
> >> +}
> >> +
> >> +int iio_device_register_inputbridge(struct iio_dev *indio_dev)
> >> +{
> >> +	int i;
> >> +
> >> +	for (i = 0; i < indio_dev->num_channels; i++) {
> >> +		const struct iio_chan_spec *chan =
> >> +				&indio_dev->channels[i];
> >> +
> >> +		if (chan->type == IIO_ACCEL) {
> >> +			int r = iio_input_register_accel_channel(indio_dev,
> >> +								 chan);  
> > It would be cleaner (and safer) to go find all the necessary channels then
> > set up the map in one go, rather that iterating and trying to build it
> > in a sequential fashion.
> > 
> > So move the search loop inside and have something like.
> > 
> > iio_input_find_accel_channel(indio_dev, chan, &numchans);
> > iio_input_register_device(indio_dev, chan, numchans);  
> 
> Well, that looks like it needs some temporary storage of dynamic size
> and loop twice over channels for no functional benefit.

Use fixed size. The worst that happens is we end up with it being
an entry larger that it needs to be.

> And handle the
> special case of numchans == 0 (the proposed code simply does not call
> iio_input_register_accel_channel and does not register anything).
> 
> So I'd prefer to follow the "KISS" principle and register single channels
> instead of a set of channels.

Well we disagree on this.  A singleton approach like used here
is to my mind not KISS.  I would rather see what is there then
act as two simple steps, rather than interleave two different
actions with a totally different path for the first channel found.
If there is only one channel you just built a load of infrastructure
that makes no sense.  If you scan first then you can know that
before building anything.


> 
> >   
> >> +
> >> +			if (r < 0)
> >> +				return r;
> >> +		}
> >> +	}
> >> +
> >> +	return 0;
> >> +}
> >> +
> >> +void iio_device_unregister_inputbridge(struct iio_dev *indio_dev)
> >> +{
> >> +	struct iio_input_map *map = iio_device_get_drvdata(indio_dev);
> >> +	struct input_dev *input = map->poll_dev->input;
> >> +
> >> +	kfree(input->name);
> >> +	kfree(input->phys);
> >> +	input_unregister_polled_device(map->poll_dev);
> >> +}
> >> +
> >> +MODULE_AUTHOR("H. Nikolaus Schaller <hns@...delico.com>");
> >> +MODULE_DESCRIPTION("Bridge to present Industrial I/O accelerometers as properly oriented Input devices");
> >> +MODULE_LICENSE("GPL v2");
> >> diff --git a/drivers/iio/industrialio-inputbridge.h b/drivers/iio/industrialio-inputbridge.h
> >> new file mode 100644
> >> index 000000000000..1363b10ab3f7
> >> --- /dev/null
> >> +++ b/drivers/iio/industrialio-inputbridge.h
> >> @@ -0,0 +1,28 @@
> >> +/* SPDX-License-Identifier: GPL-2.0 */
> >> +/*
> >> + * The Industrial I/O core, bridge to input devices
> >> + *
> >> + * Copyright (c) 2016-2019 Golden Delicious Computers GmbH&Co. KG
> >> + *
> >> + * This program is free software; you can redistribute it and/or modify it
> >> + * under the terms of the GNU General Public License version 2 as published by
> >> + * the Free Software Foundation.
> >> + */
> >> +
> >> +#if defined(CONFIG_IIO_INPUT_BRIDGE)
> >> +
> >> +extern int iio_device_register_inputbridge(struct iio_dev *indio_dev);
> >> +extern void iio_device_unregister_inputbridge(struct iio_dev *indio_dev);
> >> +
> >> +#else
> >> +
> >> +static inline int iio_device_register_inputbridge(struct iio_dev *indio_dev)
> >> +{
> >> +	return 0;
> >> +}
> >> +
> >> +static inline void iio_device_unregister_inputbridge(struct iio_dev *indio_dev)
> >> +{
> >> +}
> >> +
> >> +#endif  
> >   
> 
> BR and thanks,
> Nikolaus
> 
Thanks,

Jonathan

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ