Hi,
On Mon, 2014-08-25 at 09:54 -0700, Guenter Roeck wrote:
> On Mon, Aug 25, 2014 at 05:10:31PM +0100, Jonathan Cameron wrote:
> > On 25/08/14 13:57, Ivan T. Ivanov wrote:
> > > Do not overwrite error codes returned from of_iio_channel_get().
> > > Error codes are used to distinguish between "io-channel-names"
> > > not present in DT bindings, property is optional, and IIO channel
> > > provider driver still not being loaded, defer probe.
> > >
> > > Signed-off-by: Ivan T. Ivanov <iivanov@xxxxxxxxxx>
> > Cc'd Guenter who often takes an interest in this code (and wrote it ;)
> >
> > Mostly seems logical to me, though I don't like the change of
> > priority in the last bit. I've also just taken a fix for this
> > code so there may be some fuzz from that once it's propogated
> > through to mainline and back to the togreg tree of iio.git
It is propagated, but exactly this patch [1] is causing the troubles :-)
> >
> > Thanks,
> >
> > Jonathan
> > > ---
> > > drivers/iio/inkern.c | 24 ++++++++++++------------
> > > 1 file changed, 12 insertions(+), 12 deletions(-)
> > >
> > > diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
> > > index c749700..66a6cde 100644
> > > --- a/drivers/iio/inkern.c
> > > +++ b/drivers/iio/inkern.c
> > > @@ -162,7 +162,7 @@ err_free_channel:
> > > static struct iio_channel *of_iio_channel_get_by_name(struct device_node *np,
> > > const char *name)
> > > {
> > > - struct iio_channel *chan = NULL;
> > > + struct iio_channel *chan = ERR_PTR(-ENODEV);
> > >
> > > /* Walk up the tree of devices looking for a matching iio channel */
> > > while (np) {
> > > @@ -183,7 +183,7 @@ static struct iio_channel *of_iio_channel_get_by_name(struct device_node *np,
> > > else if (name && index >= 0) {
> > > pr_err("ERROR: could not get IIO channel %s:%s(%i)\n",
> > > np->full_name, name ? name : "", index);
> > > - return NULL;
> > > + break;
> > > }
> > >
> > > /*
> > > @@ -193,7 +193,7 @@ static struct iio_channel *of_iio_channel_get_by_name(struct device_node *np,
> > > */
> > > np = np->parent;
> > > if (np && !of_get_property(np, "io-channel-ranges", NULL))
> > > - return NULL;
> > > + break;
> > > }
> > >
> > > return chan;
> > > @@ -243,12 +243,12 @@ error_free_chans:
> > > static inline struct iio_channel *
> > > of_iio_channel_get_by_name(struct device_node *np, const char *name)
> > > {
> > > - return NULL;
> > > + return ERR_PTR(-ENODEV);
> > > }
> > >
> > > static inline struct iio_channel *of_iio_channel_get_all(struct device *dev)
> > > {
> > > - return NULL;
> > > + return ERR_PTR(-ENODEV);
> > > }
> > >
> > > #endif /* CONFIG_OF */
> > > @@ -312,14 +312,14 @@ struct iio_channel *iio_channel_get(struct device *dev,
> > > const char *name = dev ? dev_name(dev) : NULL;
> > > struct iio_channel *channel;
> > >
> > > - if (dev) {
> > > - channel = of_iio_channel_get_by_name(dev->of_node,
> > > - channel_name);
> > > - if (channel != NULL)
> > > - return channel;
> > > - }
> > > + channel = iio_channel_get_sys(name, channel_name);
> > > + if (!IS_ERR(channel))
> > > + return channel;
> > > +
> > > + if (!dev)
> > > + return channel;
> > >
> > > - return iio_channel_get_sys(name, channel_name);
> > > + return of_iio_channel_get_by_name(dev->of_node, channel_name);
> > > }
> > Why reorder the logic? This makes this patch less obviously
> > correct for limited obvious gain?
I would like to avoid white listing EPROBE_DEFER error code on return of
of_get() function.
> >
> > Previously the priority was clearly given to device tree bindings
> > wherease now it is given to board file provided map elements. It
> > would be interesting to see boards with both provided, but it is
> > possible.
I see.
>
> I am not entirely sure I understand what problem this patch is supposed
> to fix on top of the patch you just applied,
Patch [1], Guenter please fix you date, introduce regression. It
breaks deferred probe mechanism.
> and I am also a bit concerned
> about reversing the logic. Also, iio_channel_get_sys can return -ENOMEM
> and -EINVAL besides -ENODEV, all of which is now being ignored
Yes, and thats why we continue with trying to find channel using OF.
> unless dev is set, and then it is returned unconditionally.
If dev is not valid there is no point to go and ask OF layer for
channel, so jut go out with error code from get_sys()
> So instead of ignoring error
> codes from of_iio_channel_get_by_name, the code now ignores error codes
> from iio_channel_get_sys under some circumstances (which, coincidentially,
> does not return -EPROBE_DEFER), and in other circumstances may return an error
> even if devicetree data exists. Why and how is that better than before ?
> Seems to me it just introduces a whole number of new failure conditions.
We should not mask error codes from OF layer. EPROBE_DEFER is one of
them. So instead of checking for them explicitly on return from of_iio_get(),
I decided that will be future proof if I just reverse the order of functions.
Another, less intrusive, solution will be if we revert last patch and explicitly
check for EPROBE_DEFER on of_ by_name() return. How this sounds?
Regards,
Ivan
[1] commit a2c12493ed7e63a18cef33a71686d12ffcd6600e
Author: Adam Thomson <Adam.Thomson.Opensource@xxxxxxxxxxx>
Date: Thu Nov 6 12:11:00 2014 +0000
iio: of_iio_channel_get_by_name() returns non-null pointers for error legs
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
