2016-12-05 10:12:04

by Javi Merino

Subject: [PATCH v2] v4l: async: make v4l2 coexist with devicetree nodes in a dt overlay

In asds configured with V4L2_ASYNC_MATCH_OF, the v4l2 subdev can be
part of a devicetree overlay, for example:

&media_bridge {
...
my_port: port@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
ep: endpoint@0 {
remote-endpoint = <&camera0>;
};
};
};

/ {
fragment@0 {
target = <&i2c0>;
__overlay__ {
my_cam {
compatible = "foo,bar";
port {
camera0: endpoint {
remote-endpoint = <&my_port>;
...
};
};
};
};
};
};

Each time the overlay is applied, its of_node pointer will be
different. We are not interested in matching the pointer, what we
want to match is that the path is the one we are expecting. Change to
use of_node_cmp() so that we continue matching after the overlay has
been removed and reapplied.

Cc: Mauro Carvalho Chehab <[email protected]>
Cc: Javier Martinez Canillas <[email protected]>
Cc: Sakari Ailus <[email protected]>
Signed-off-by: Javi Merino <[email protected]>
---
drivers/media/v4l2-core/v4l2-async.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
index 5bada20..d33a17c 100644
--- a/drivers/media/v4l2-core/v4l2-async.c
+++ b/drivers/media/v4l2-core/v4l2-async.c
@@ -42,7 +42,8 @@ static bool match_devname(struct v4l2_subdev *sd,

static bool match_of(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
{
- return sd->of_node == asd->match.of.node;
+ return !of_node_cmp(of_node_full_name(sd->of_node),
+ of_node_full_name(asd->match.of.node));
}

static bool match_custom(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
--
2.1.4

2016-12-05 13:16:01

by Javier Martinez Canillas

Subject: Re: [PATCH v2] v4l: async: make v4l2 coexist with devicetree nodes in a dt overlay

Hello Javi,

On 12/05/2016 07:09 AM, Javi Merino wrote:
> In asds configured with V4L2_ASYNC_MATCH_OF, the v4l2 subdev can be
> part of a devicetree overlay, for example:
>
> &media_bridge {
> ...
> my_port: port@0 {
> #address-cells = <1>;
> #size-cells = <0>;
> reg = <0>;
> ep: endpoint@0 {
> remote-endpoint = <&camera0>;
> };
> };
> };
>
> / {
> fragment@0 {
> target = <&i2c0>;
> __overlay__ {
> my_cam {
> compatible = "foo,bar";
> port {
> camera0: endpoint {
> remote-endpoint = <&my_port>;
> ...
> };
> };
> };
> };
> };
> };
>
> Each time the overlay is applied, its of_node pointer will be
> different. We are not interested in matching the pointer, what we
> want to match is that the path is the one we are expecting. Change to
> use of_node_cmp() so that we continue matching after the overlay has
> been removed and reapplied.
>
> Cc: Mauro Carvalho Chehab <[email protected]>
> Cc: Javier Martinez Canillas <[email protected]>
> Cc: Sakari Ailus <[email protected]>
> Signed-off-by: Javi Merino <[email protected]>
> ---

I already reviewed v1 but you didn't carry the tag. So again:

Reviewed-by: Javier Martinez Canillas <[email protected]>

Best regards,
--
Javier Martinez Canillas
Open Source Group
Samsung Research America

2016-12-06 09:09:30

by Javi Merino

Subject: Re: [PATCH v2] v4l: async: make v4l2 coexist with devicetree nodes in a dt overlay

On Mon, Dec 05, 2016 at 10:13:38AM -0300, Javier Martinez Canillas wrote:
> Hello Javi,
>
> On 12/05/2016 07:09 AM, Javi Merino wrote:
> > In asds configured with V4L2_ASYNC_MATCH_OF, the v4l2 subdev can be
> > part of a devicetree overlay, for example:
> >
> > &media_bridge {
> > ...
> > my_port: port@0 {
> > #address-cells = <1>;
> > #size-cells = <0>;
> > reg = <0>;
> > ep: endpoint@0 {
> > remote-endpoint = <&camera0>;
> > };
> > };
> > };
> >
> > / {
> > fragment@0 {
> > target = <&i2c0>;
> > __overlay__ {
> > my_cam {
> > compatible = "foo,bar";
> > port {
> > camera0: endpoint {
> > remote-endpoint = <&my_port>;
> > ...
> > };
> > };
> > };
> > };
> > };
> > };
> >
> > Each time the overlay is applied, its of_node pointer will be
> > different. We are not interested in matching the pointer, what we
> > want to match is that the path is the one we are expecting. Change to
> > use of_node_cmp() so that we continue matching after the overlay has
> > been removed and reapplied.
> >
> > Cc: Mauro Carvalho Chehab <[email protected]>
> > Cc: Javier Martinez Canillas <[email protected]>
> > Cc: Sakari Ailus <[email protected]>
> > Signed-off-by: Javi Merino <[email protected]>
> > ---
>
> I already reviewed v1 but you didn't carry the tag. So again:

I forgot to add it :(

> Reviewed-by: Javier Martinez Canillas <[email protected]>

Thanks!
Javi

2016-12-06 11:15:47

by Sylwester Nawrocki

Subject: Re: [PATCH v2] v4l: async: make v4l2 coexist with devicetree nodes in a dt overlay

(resending, hopefully now it reaches the mailing lists)

On 12/05/2016 11:09 AM, Javi Merino wrote:

> Each time the overlay is applied, its of_node pointer will be
> different. We are not interested in matching the pointer, what we
> want to match is that the path is the one we are expecting. Change to
> use of_node_cmp() so that we continue matching after the overlay has
> been removed and reapplied.
>
> Signed-off-by: Javi Merino <[email protected]>

Thanks, there is clearly a bug in current code as it assumed static
representation of DT in the kernel.

Reviewed-by: Sylwester Nawrocki <[email protected]>

> ---
> drivers/media/v4l2-core/v4l2-async.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/v4l2-core/v4l2-async.c b/drivers/media/v4l2-core/v4l2-async.c
> index 5bada20..d33a17c 100644
> --- a/drivers/media/v4l2-core/v4l2-async.c
> +++ b/drivers/media/v4l2-core/v4l2-async.c
> @@ -42,7 +42,8 @@ static bool match_devname(struct v4l2_subdev *sd,
>
> static bool match_of(struct v4l2_subdev *sd, struct v4l2_async_subdev *asd)
> {
> - return sd->of_node == asd->match.of.node;
> + return !of_node_cmp(of_node_full_name(sd->of_node),
> + of_node_full_name(asd->match.of.node));
> }