| Message ID | 06ad8080-255f-b770-40b7-e6bc98b6ce60@cisco.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Hans, Thank you for the patch. On Tuesday, 20 February 2018 11:44:20 EET Hans Verkuil wrote: > The v4l2_subdev core s_power op was used for two different things: power > on/off sensors or video decoders/encoders and to put a tuner in standby > (and only the tuner!). There is no 'tuner wakeup' op, that's done > automatically when the tuner is accessed. > > The danger with calling (s_power, 0) to put a tuner into standby is that it > is usually broadcast for all subdevs. So a video receiver subdev that > supports s_power will also be powered off, and since there is no > corresponding (s_power, 1) they will never be powered on again. > > In addition, this is specifically meant for tuners only since they draw the > most current. > > This patch adds a new tuner op called 'standby' and replaces all calls to > (core, s_power, 0) by (tuner, standby). This prevents confusion between the > two uses of s_power. Note that there is no overlap: bridge drivers either > just want to put the tuner into standby, or they deal with powering on/off > sensors. Never both. > > This also makes it easier to replace s_power for the remaining bridge > drivers with some PM code later. > > Whether we want something cleaner for tuners in the future is a separate > topic. There is a lot of legacy code surrounding tuners, and I am very > hesitant about making changes there. > > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> > --- > Changes since v1: > - move the standby op to the tuner_ops, which makes much more sense. > --- [snip] > diff --git a/drivers/media/v4l2-core/tuner-core.c > b/drivers/media/v4l2-core/tuner-core.c index 82852f23a3b6..cb126baf8771 > 100644 > --- a/drivers/media/v4l2-core/tuner-core.c > +++ b/drivers/media/v4l2-core/tuner-core.c > @@ -1099,23 +1099,15 @@ static int tuner_s_radio(struct v4l2_subdev *sd) > */ > > /** > - * tuner_s_power - controls the power state of the tuner > + * tuner_standby - controls the power state of the tuner I'd update the description too. > * @sd: pointer to struct v4l2_subdev > * @on: a zero value puts the tuner to sleep, non-zero wakes it up And this parameter doesn't exist anymore. You could have caught that by compiling the documentation. > */ > -static int tuner_s_power(struct v4l2_subdev *sd, int on) > +static int tuner_standby(struct v4l2_subdev *sd) > { > struct tuner *t = to_tuner(sd); > struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops; > > - if (on) { > - if (t->standby && set_mode(t, t->mode) == 0) { > - dprintk("Waking up tuner\n"); > - set_freq(t, 0); > - } > - return 0; > - } > - Interesting how this code was not used. I've had a look at tuner-core driver out of curiosity, it clearly shows its age :/ I2C address probing belongs to another century. > dprintk("Putting tuner to sleep\n"); > t->standby = true; > if (analog_ops->standby) > @@ -1328,10 +1320,10 @@ static int tuner_command(struct i2c_client *client, > unsigned cmd, void *arg) > > static const struct v4l2_subdev_core_ops tuner_core_ops = { > .log_status = tuner_log_status, > - .s_power = tuner_s_power, > }; > > static const struct v4l2_subdev_tuner_ops tuner_tuner_ops = { > + .standby = tuner_standby, > .s_radio = tuner_s_radio, > .g_tuner = tuner_g_tuner, > .s_tuner = tuner_s_tuner, > diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h > index 980a86c08fce..62429cd89620 100644 > --- a/include/media/v4l2-subdev.h > +++ b/include/media/v4l2-subdev.h > @@ -224,6 +224,9 @@ struct v4l2_subdev_core_ops { > * struct v4l2_subdev_tuner_ops - Callbacks used when v4l device was opened > * in radio mode. > * > + * @standby: puts the tuner in standby mode. It will be woken up > + * automatically the next time it is used. > + * I wouldn't have dared making such a statement as I don't trust myself as being able to give such a guarantee after reading the code :-) > * @s_radio: callback that switches the tuner to radio mode. > * drivers should explicitly call it when a tuner ops should > * operate on radio mode, before being able to handle it. > @@ -268,6 +271,7 @@ struct v4l2_subdev_core_ops { > * } > */ > struct v4l2_subdev_tuner_ops { > + int (*standby)(struct v4l2_subdev *sd); > int (*s_radio)(struct v4l2_subdev *sd); > int (*s_frequency)(struct v4l2_subdev *sd, const struct v4l2_frequency > *freq); > int (*g_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq);
On 02/21/2018 01:02 AM, Laurent Pinchart wrote: > Hi Hans, > > Thank you for the patch. > > On Tuesday, 20 February 2018 11:44:20 EET Hans Verkuil wrote: >> The v4l2_subdev core s_power op was used for two different things: power >> on/off sensors or video decoders/encoders and to put a tuner in standby >> (and only the tuner!). There is no 'tuner wakeup' op, that's done >> automatically when the tuner is accessed. >> >> The danger with calling (s_power, 0) to put a tuner into standby is that it >> is usually broadcast for all subdevs. So a video receiver subdev that >> supports s_power will also be powered off, and since there is no >> corresponding (s_power, 1) they will never be powered on again. >> >> In addition, this is specifically meant for tuners only since they draw the >> most current. >> >> This patch adds a new tuner op called 'standby' and replaces all calls to >> (core, s_power, 0) by (tuner, standby). This prevents confusion between the >> two uses of s_power. Note that there is no overlap: bridge drivers either >> just want to put the tuner into standby, or they deal with powering on/off >> sensors. Never both. >> >> This also makes it easier to replace s_power for the remaining bridge >> drivers with some PM code later. >> >> Whether we want something cleaner for tuners in the future is a separate >> topic. There is a lot of legacy code surrounding tuners, and I am very >> hesitant about making changes there. >> >> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> >> --- >> Changes since v1: >> - move the standby op to the tuner_ops, which makes much more sense. >> --- > > [snip] > >> diff --git a/drivers/media/v4l2-core/tuner-core.c >> b/drivers/media/v4l2-core/tuner-core.c index 82852f23a3b6..cb126baf8771 >> 100644 >> --- a/drivers/media/v4l2-core/tuner-core.c >> +++ b/drivers/media/v4l2-core/tuner-core.c >> @@ -1099,23 +1099,15 @@ static int tuner_s_radio(struct v4l2_subdev *sd) >> */ >> >> /** >> - * tuner_s_power - controls the power state of the tuner >> + * tuner_standby - controls the power state of the tuner > > I'd update the description too. > >> * @sd: pointer to struct v4l2_subdev >> * @on: a zero value puts the tuner to sleep, non-zero wakes it up > > And this parameter doesn't exist anymore. You could have caught that by > compiling the documentation. Oops! I'll make a v3. Thanks for catching this. > >> */ >> -static int tuner_s_power(struct v4l2_subdev *sd, int on) >> +static int tuner_standby(struct v4l2_subdev *sd) >> { >> struct tuner *t = to_tuner(sd); >> struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops; >> >> - if (on) { >> - if (t->standby && set_mode(t, t->mode) == 0) { >> - dprintk("Waking up tuner\n"); >> - set_freq(t, 0); >> - } >> - return 0; >> - } >> - > > Interesting how this code was not used. I've had a look at tuner-core driver > out of curiosity, it clearly shows its age :/ I2C address probing belongs to > another century. Not really. It's still needed for USB/PCI devices. I was also surprised that it wasn't used. I expected to see some internal calls to tuner_s_power(sd, 1) to turn things on, but that's not what happened. Regards, Hans > >> dprintk("Putting tuner to sleep\n"); >> t->standby = true; >> if (analog_ops->standby) >> @@ -1328,10 +1320,10 @@ static int tuner_command(struct i2c_client *client, >> unsigned cmd, void *arg) >> >> static const struct v4l2_subdev_core_ops tuner_core_ops = { >> .log_status = tuner_log_status, >> - .s_power = tuner_s_power, >> }; >> >> static const struct v4l2_subdev_tuner_ops tuner_tuner_ops = { >> + .standby = tuner_standby, >> .s_radio = tuner_s_radio, >> .g_tuner = tuner_g_tuner, >> .s_tuner = tuner_s_tuner, >> diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h >> index 980a86c08fce..62429cd89620 100644 >> --- a/include/media/v4l2-subdev.h >> +++ b/include/media/v4l2-subdev.h >> @@ -224,6 +224,9 @@ struct v4l2_subdev_core_ops { >> * struct v4l2_subdev_tuner_ops - Callbacks used when v4l device was opened >> * in radio mode. >> * >> + * @standby: puts the tuner in standby mode. It will be woken up >> + * automatically the next time it is used. >> + * > > I wouldn't have dared making such a statement as I don't trust myself as being > able to give such a guarantee after reading the code :-) > >> * @s_radio: callback that switches the tuner to radio mode. >> * drivers should explicitly call it when a tuner ops should >> * operate on radio mode, before being able to handle it. >> @@ -268,6 +271,7 @@ struct v4l2_subdev_core_ops { >> * } >> */ >> struct v4l2_subdev_tuner_ops { >> + int (*standby)(struct v4l2_subdev *sd); >> int (*s_radio)(struct v4l2_subdev *sd); >> int (*s_frequency)(struct v4l2_subdev *sd, const struct v4l2_frequency >> *freq); >> int (*g_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq); >
Hi Hans, On Wednesday, 21 February 2018 09:40:29 EET Hans Verkuil wrote: > On 02/21/2018 01:02 AM, Laurent Pinchart wrote: > > On Tuesday, 20 February 2018 11:44:20 EET Hans Verkuil wrote: > >> The v4l2_subdev core s_power op was used for two different things: power > >> on/off sensors or video decoders/encoders and to put a tuner in standby > >> (and only the tuner!). There is no 'tuner wakeup' op, that's done > >> automatically when the tuner is accessed. > >> > >> The danger with calling (s_power, 0) to put a tuner into standby is that > >> it is usually broadcast for all subdevs. So a video receiver subdev that > >> supports s_power will also be powered off, and since there is no > >> corresponding (s_power, 1) they will never be powered on again. > >> > >> In addition, this is specifically meant for tuners only since they draw > >> the most current. > >> > >> This patch adds a new tuner op called 'standby' and replaces all calls to > >> (core, s_power, 0) by (tuner, standby). This prevents confusion between > >> the two uses of s_power. Note that there is no overlap: bridge drivers > >> either just want to put the tuner into standby, or they deal with > >> powering on/off sensors. Never both. > >> > >> This also makes it easier to replace s_power for the remaining bridge > >> drivers with some PM code later. > >> > >> Whether we want something cleaner for tuners in the future is a separate > >> topic. There is a lot of legacy code surrounding tuners, and I am very > >> hesitant about making changes there. > >> > >> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> > >> --- > >> Changes since v1: > >> - move the standby op to the tuner_ops, which makes much more sense. > >> --- > > > > [snip] > > > >> diff --git a/drivers/media/v4l2-core/tuner-core.c > >> b/drivers/media/v4l2-core/tuner-core.c index 82852f23a3b6..cb126baf8771 > >> 100644 > >> --- a/drivers/media/v4l2-core/tuner-core.c > >> +++ b/drivers/media/v4l2-core/tuner-core.c > >> @@ -1099,23 +1099,15 @@ static int tuner_s_radio(struct v4l2_subdev *sd) > >> */ > >> > >> /** > >> - * tuner_s_power - controls the power state of the tuner > >> + * tuner_standby - controls the power state of the tuner > > > > I'd update the description too. > > > >> * @sd: pointer to struct v4l2_subdev > >> * @on: a zero value puts the tuner to sleep, non-zero wakes it up > > > > And this parameter doesn't exist anymore. You could have caught that by > > compiling the documentation. > > Oops! I'll make a v3. Thanks for catching this. > > >> */ > >> -static int tuner_s_power(struct v4l2_subdev *sd, int on) > >> +static int tuner_standby(struct v4l2_subdev *sd) > >> { > >> struct tuner *t = to_tuner(sd); > >> struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops; > >> > >> - if (on) { > >> - if (t->standby && set_mode(t, t->mode) == 0) { > >> - dprintk("Waking up tuner\n"); > >> - set_freq(t, 0); > >> - } > >> - return 0; > >> - } > >> - > > > > Interesting how this code was not used. I've had a look at tuner-core > > driver out of curiosity, it clearly shows its age :/ I2C address probing > > belongs to another century. > > Not really. It's still needed for USB/PCI devices. Why is that ? > I was also surprised that it wasn't used. I expected to see some internal > calls to tuner_s_power(sd, 1) to turn things on, but that's not what > happened. > > >> dprintk("Putting tuner to sleep\n"); > >> t->standby = true; > >> if (analog_ops->standby) [snip]
On 02/21/18 13:37, Laurent Pinchart wrote: > Hi Hans, > > On Wednesday, 21 February 2018 09:40:29 EET Hans Verkuil wrote: >> On 02/21/2018 01:02 AM, Laurent Pinchart wrote: >>> On Tuesday, 20 February 2018 11:44:20 EET Hans Verkuil wrote: >>>> The v4l2_subdev core s_power op was used for two different things: power >>>> on/off sensors or video decoders/encoders and to put a tuner in standby >>>> (and only the tuner!). There is no 'tuner wakeup' op, that's done >>>> automatically when the tuner is accessed. >>>> >>>> The danger with calling (s_power, 0) to put a tuner into standby is that >>>> it is usually broadcast for all subdevs. So a video receiver subdev that >>>> supports s_power will also be powered off, and since there is no >>>> corresponding (s_power, 1) they will never be powered on again. >>>> >>>> In addition, this is specifically meant for tuners only since they draw >>>> the most current. >>>> >>>> This patch adds a new tuner op called 'standby' and replaces all calls to >>>> (core, s_power, 0) by (tuner, standby). This prevents confusion between >>>> the two uses of s_power. Note that there is no overlap: bridge drivers >>>> either just want to put the tuner into standby, or they deal with >>>> powering on/off sensors. Never both. >>>> >>>> This also makes it easier to replace s_power for the remaining bridge >>>> drivers with some PM code later. >>>> >>>> Whether we want something cleaner for tuners in the future is a separate >>>> topic. There is a lot of legacy code surrounding tuners, and I am very >>>> hesitant about making changes there. >>>> >>>> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> >>>> --- >>>> Changes since v1: >>>> - move the standby op to the tuner_ops, which makes much more sense. >>>> --- >>> >>> [snip] >>> >>>> diff --git a/drivers/media/v4l2-core/tuner-core.c >>>> b/drivers/media/v4l2-core/tuner-core.c index 82852f23a3b6..cb126baf8771 >>>> 100644 >>>> --- a/drivers/media/v4l2-core/tuner-core.c >>>> +++ b/drivers/media/v4l2-core/tuner-core.c >>>> @@ -1099,23 +1099,15 @@ static int tuner_s_radio(struct v4l2_subdev *sd) >>>> */ >>>> >>>> /** >>>> - * tuner_s_power - controls the power state of the tuner >>>> + * tuner_standby - controls the power state of the tuner >>> >>> I'd update the description too. >>> >>>> * @sd: pointer to struct v4l2_subdev >>>> * @on: a zero value puts the tuner to sleep, non-zero wakes it up >>> >>> And this parameter doesn't exist anymore. You could have caught that by >>> compiling the documentation. >> >> Oops! I'll make a v3. Thanks for catching this. >> >>>> */ >>>> -static int tuner_s_power(struct v4l2_subdev *sd, int on) >>>> +static int tuner_standby(struct v4l2_subdev *sd) >>>> { >>>> struct tuner *t = to_tuner(sd); >>>> struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops; >>>> >>>> - if (on) { >>>> - if (t->standby && set_mode(t, t->mode) == 0) { >>>> - dprintk("Waking up tuner\n"); >>>> - set_freq(t, 0); >>>> - } >>>> - return 0; >>>> - } >>>> - >>> >>> Interesting how this code was not used. I've had a look at tuner-core >>> driver out of curiosity, it clearly shows its age :/ I2C address probing >>> belongs to another century. >> >> Not really. It's still needed for USB/PCI devices. > > Why is that ? 1) Historical: in the past we never kept track of e.g. i2c addresses but always relied on probing. We're stuck with that. 2) You can have different devices with the same IDs. And no way of knowing what's on there except by probing. Quite often they swap the tuner for another tuner with a different i2c address without changing the IDs. Most tuner devices use the same Philips-based registers so they can be handled by the same driver (tuner-simple), but the i2c addresses are all over the place. But also other devices can be changed, or two vendors used the same reference design, each made changes but never updated the IDs from the original design. Basically it's much less structured than a proper device tree for a board. Regards, Hans > >> I was also surprised that it wasn't used. I expected to see some internal >> calls to tuner_s_power(sd, 1) to turn things on, but that's not what >> happened. >> >>>> dprintk("Putting tuner to sleep\n"); >>>> t->standby = true; >>>> if (analog_ops->standby) > > [snip] >
Hi Hans, On Wednesday, 21 February 2018 15:11:36 EET Hans Verkuil wrote: > On 02/21/18 13:37, Laurent Pinchart wrote: > > On Wednesday, 21 February 2018 09:40:29 EET Hans Verkuil wrote: > >> On 02/21/2018 01:02 AM, Laurent Pinchart wrote: > >>> On Tuesday, 20 February 2018 11:44:20 EET Hans Verkuil wrote: > >>>> The v4l2_subdev core s_power op was used for two different things: > >>>> power on/off sensors or video decoders/encoders and to put a tuner in > >>>> standby (and only the tuner!). There is no 'tuner wakeup' op, that's > >>>> done automatically when the tuner is accessed. > >>>> > >>>> The danger with calling (s_power, 0) to put a tuner into standby is > >>>> that it is usually broadcast for all subdevs. So a video receiver > >>>> subdev that supports s_power will also be powered off, and since there > >>>> is no corresponding (s_power, 1) they will never be powered on again. > >>>> > >>>> In addition, this is specifically meant for tuners only since they draw > >>>> the most current. > >>>> > >>>> This patch adds a new tuner op called 'standby' and replaces all calls > >>>> to (core, s_power, 0) by (tuner, standby). This prevents confusion > >>>> between the two uses of s_power. Note that there is no overlap: bridge > >>>> drivers either just want to put the tuner into standby, or they deal > >>>> with powering on/off sensors. Never both. > >>>> > >>>> This also makes it easier to replace s_power for the remaining bridge > >>>> drivers with some PM code later. > >>>> > >>>> Whether we want something cleaner for tuners in the future is a > >>>> separate topic. There is a lot of legacy code surrounding tuners, and I > >>>> am very hesitant about making changes there. > >>>> > >>>> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> > >>>> --- > >>>> Changes since v1: > >>>> - move the standby op to the tuner_ops, which makes much more sense. > >>>> --- > >>> > >>> [snip] > >>> > >>>> diff --git a/drivers/media/v4l2-core/tuner-core.c > >>>> b/drivers/media/v4l2-core/tuner-core.c index 82852f23a3b6..cb126baf8771 > >>>> 100644 > >>>> --- a/drivers/media/v4l2-core/tuner-core.c > >>>> +++ b/drivers/media/v4l2-core/tuner-core.c > >>>> @@ -1099,23 +1099,15 @@ static int tuner_s_radio(struct v4l2_subdev > >>>> *sd) > >>>> */ > >>>> > >>>> /** > >>>> - * tuner_s_power - controls the power state of the tuner > >>>> + * tuner_standby - controls the power state of the tuner > >>> > >>> I'd update the description too. > >>> > >>>> * @sd: pointer to struct v4l2_subdev > >>>> * @on: a zero value puts the tuner to sleep, non-zero wakes it up > >>> > >>> And this parameter doesn't exist anymore. You could have caught that by > >>> compiling the documentation. > >> > >> Oops! I'll make a v3. Thanks for catching this. > >> > >>>> */ > >>>> > >>>> -static int tuner_s_power(struct v4l2_subdev *sd, int on) > >>>> +static int tuner_standby(struct v4l2_subdev *sd) > >>>> { > >>>> struct tuner *t = to_tuner(sd); > >>>> struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops; > >>>> > >>>> - if (on) { > >>>> - if (t->standby && set_mode(t, t->mode) == 0) { > >>>> - dprintk("Waking up tuner\n"); > >>>> - set_freq(t, 0); > >>>> - } > >>>> - return 0; > >>>> - } > >>>> - > >>> > >>> Interesting how this code was not used. I've had a look at tuner-core > >>> driver out of curiosity, it clearly shows its age :/ I2C address probing > >>> belongs to another century. > >> > >> Not really. It's still needed for USB/PCI devices. > > > > Why is that ? > > 1) Historical: in the past we never kept track of e.g. i2c addresses but > always relied on probing. We're stuck with that. Are we ? Couldn't we move away from it provided someone was interested in doing the work (for devices that do not fall in the category of your second point below) ? > 2) You can have different devices with the same IDs. And no way of knowing > what's on there except by probing. Quite often they swap the tuner for > another tuner with a different i2c address without changing the IDs. > Most tuner devices use the same Philips-based registers so they can be > handled by the same driver (tuner-simple), but the i2c addresses are > all over the place. > > But also other devices can be changed, or two vendors used the same > reference design, each made changes but never updated the IDs from the > original design. That's what I thought was the real issue, coupled with the fact that, with probing in place, driver have relied on it even when the I2C address and tuner model don't vary across devices with the same ID. If this were to be designed again I'd want a helper function to probe an explicitly given set of tuners at an explicitly given list of addresses, and then create the right I2C client for that. The tuner-core driver should not be an I2C driver. Of course nobody will convert it, but that doesn't stop the current implementation from really showing its age. > Basically it's much less structured than a proper device tree for a board. > > >> I was also surprised that it wasn't used. I expected to see some internal > >> calls to tuner_s_power(sd, 1) to turn things on, but that's not what > >> happened. > >> > >>>> dprintk("Putting tuner to sleep\n"); > >>>> t->standby = true; > >>>> if (analog_ops->standby) > > > > [snip]
On 02/21/2018 08:21 PM, Laurent Pinchart wrote: > Hi Hans, > > On Wednesday, 21 February 2018 15:11:36 EET Hans Verkuil wrote: >> On 02/21/18 13:37, Laurent Pinchart wrote: >>> On Wednesday, 21 February 2018 09:40:29 EET Hans Verkuil wrote: >>>> On 02/21/2018 01:02 AM, Laurent Pinchart wrote: >>>>> On Tuesday, 20 February 2018 11:44:20 EET Hans Verkuil wrote: >>>>>> The v4l2_subdev core s_power op was used for two different things: >>>>>> power on/off sensors or video decoders/encoders and to put a tuner in >>>>>> standby (and only the tuner!). There is no 'tuner wakeup' op, that's >>>>>> done automatically when the tuner is accessed. >>>>>> >>>>>> The danger with calling (s_power, 0) to put a tuner into standby is >>>>>> that it is usually broadcast for all subdevs. So a video receiver >>>>>> subdev that supports s_power will also be powered off, and since there >>>>>> is no corresponding (s_power, 1) they will never be powered on again. >>>>>> >>>>>> In addition, this is specifically meant for tuners only since they draw >>>>>> the most current. >>>>>> >>>>>> This patch adds a new tuner op called 'standby' and replaces all calls >>>>>> to (core, s_power, 0) by (tuner, standby). This prevents confusion >>>>>> between the two uses of s_power. Note that there is no overlap: bridge >>>>>> drivers either just want to put the tuner into standby, or they deal >>>>>> with powering on/off sensors. Never both. >>>>>> >>>>>> This also makes it easier to replace s_power for the remaining bridge >>>>>> drivers with some PM code later. >>>>>> >>>>>> Whether we want something cleaner for tuners in the future is a >>>>>> separate topic. There is a lot of legacy code surrounding tuners, and I >>>>>> am very hesitant about making changes there. >>>>>> >>>>>> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> >>>>>> --- >>>>>> Changes since v1: >>>>>> - move the standby op to the tuner_ops, which makes much more sense. >>>>>> --- >>>>> >>>>> [snip] >>>>> >>>>>> diff --git a/drivers/media/v4l2-core/tuner-core.c >>>>>> b/drivers/media/v4l2-core/tuner-core.c index 82852f23a3b6..cb126baf8771 >>>>>> 100644 >>>>>> --- a/drivers/media/v4l2-core/tuner-core.c >>>>>> +++ b/drivers/media/v4l2-core/tuner-core.c >>>>>> @@ -1099,23 +1099,15 @@ static int tuner_s_radio(struct v4l2_subdev >>>>>> *sd) >>>>>> */ >>>>>> >>>>>> /** >>>>>> - * tuner_s_power - controls the power state of the tuner >>>>>> + * tuner_standby - controls the power state of the tuner >>>>> >>>>> I'd update the description too. >>>>> >>>>>> * @sd: pointer to struct v4l2_subdev >>>>>> * @on: a zero value puts the tuner to sleep, non-zero wakes it up >>>>> >>>>> And this parameter doesn't exist anymore. You could have caught that by >>>>> compiling the documentation. >>>> >>>> Oops! I'll make a v3. Thanks for catching this. >>>> >>>>>> */ >>>>>> >>>>>> -static int tuner_s_power(struct v4l2_subdev *sd, int on) >>>>>> +static int tuner_standby(struct v4l2_subdev *sd) >>>>>> { >>>>>> struct tuner *t = to_tuner(sd); >>>>>> struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops; >>>>>> >>>>>> - if (on) { >>>>>> - if (t->standby && set_mode(t, t->mode) == 0) { >>>>>> - dprintk("Waking up tuner\n"); >>>>>> - set_freq(t, 0); >>>>>> - } >>>>>> - return 0; >>>>>> - } >>>>>> - >>>>> >>>>> Interesting how this code was not used. I've had a look at tuner-core >>>>> driver out of curiosity, it clearly shows its age :/ I2C address probing >>>>> belongs to another century. >>>> >>>> Not really. It's still needed for USB/PCI devices. >>> >>> Why is that ? >> >> 1) Historical: in the past we never kept track of e.g. i2c addresses but >> always relied on probing. We're stuck with that. > > Are we ? Couldn't we move away from it provided someone was interested in > doing the work (for devices that do not fall in the category of your second > point below) ? There are over 160 different bttv cards. And over a 100 em28xx devices. And we didn't keep track of things like i2c addresses. And that's just two drivers. So yes, we're stuck. But frankly, it's been working fine for over 15 years, so why change it? Sure, we'd do it differently today, but there is really no need to start messing around with it. Regards, Hans > >> 2) You can have different devices with the same IDs. And no way of knowing >> what's on there except by probing. Quite often they swap the tuner for >> another tuner with a different i2c address without changing the IDs. >> Most tuner devices use the same Philips-based registers so they can be >> handled by the same driver (tuner-simple), but the i2c addresses are >> all over the place. >> >> But also other devices can be changed, or two vendors used the same >> reference design, each made changes but never updated the IDs from the >> original design. > > That's what I thought was the real issue, coupled with the fact that, with > probing in place, driver have relied on it even when the I2C address and tuner > model don't vary across devices with the same ID. > > If this were to be designed again I'd want a helper function to probe an > explicitly given set of tuners at an explicitly given list of addresses, and > then create the right I2C client for that. The tuner-core driver should not be > an I2C driver. Of course nobody will convert it, but that doesn't stop the > current implementation from really showing its age. > >> Basically it's much less structured than a proper device tree for a board. >> >>>> I was also surprised that it wasn't used. I expected to see some internal >>>> calls to tuner_s_power(sd, 1) to turn things on, but that's not what >>>> happened. >>>> >>>>>> dprintk("Putting tuner to sleep\n"); >>>>>> t->standby = true; >>>>>> if (analog_ops->standby) >>> >>> [snip] >
diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c index 8f63df1cb418..b8394cdf030b 100644 --- a/drivers/media/pci/cx23885/cx23885-core.c +++ b/drivers/media/pci/cx23885/cx23885-core.c @@ -965,7 +965,7 @@ static int cx23885_dev_setup(struct cx23885_dev *dev) cx23885_i2c_register(&dev->i2c_bus[1]); cx23885_i2c_register(&dev->i2c_bus[2]); cx23885_card_setup(dev); - call_all(dev, core, s_power, 0); + call_all(dev, tuner, standby); cx23885_ir_init(dev); if (dev->board == CX23885_BOARD_VIEWCAST_460E) { diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c index 700422b538c0..ba5429877d1f 100644 --- a/drivers/media/pci/cx23885/cx23885-dvb.c +++ b/drivers/media/pci/cx23885/cx23885-dvb.c @@ -2514,8 +2514,8 @@ static int dvb_register(struct cx23885_tsport *port) fe1->dvb.frontend->ops.ts_bus_ctrl = cx23885_dvb_bus_ctrl; #endif - /* Put the analog decoder in standby to keep it quiet */ - call_all(dev, core, s_power, 0); + /* Put the tuner in standby to keep it quiet */ + call_all(dev, tuner, standby); if (fe0->dvb.frontend->ops.analog_ops.standby) fe0->dvb.frontend->ops.analog_ops.standby(fe0->dvb.frontend); diff --git a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-cards.c index 6df21b29ea17..4c92d2388c26 100644 --- a/drivers/media/pci/cx88/cx88-cards.c +++ b/drivers/media/pci/cx88/cx88-cards.c @@ -3592,7 +3592,7 @@ static void cx88_card_setup(struct cx88_core *core) ctl.fname); call_all(core, tuner, s_config, &xc2028_cfg); } - call_all(core, core, s_power, 0); + call_all(core, tuner, standby); } /* ------------------------------------------------------------------ */ diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c index 49a335f4603e..3abef0b106be 100644 --- a/drivers/media/pci/cx88/cx88-dvb.c +++ b/drivers/media/pci/cx88/cx88-dvb.c @@ -1631,8 +1631,8 @@ static int dvb_register(struct cx8802_dev *dev) if (fe1) fe1->dvb.frontend->ops.ts_bus_ctrl = cx88_dvb_bus_ctrl; - /* Put the analog decoder in standby to keep it quiet */ - call_all(core, core, s_power, 0); + /* Put the tuner in standby to keep it quiet */ + call_all(core, tuner, standby); /* register everything */ res = vb2_dvb_register_bus(&dev->frontends, THIS_MODULE, dev, diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c index 1ca6a32ad10e..4f1091a11e91 100644 --- a/drivers/media/pci/saa7134/saa7134-video.c +++ b/drivers/media/pci/saa7134/saa7134-video.c @@ -1200,7 +1200,7 @@ static int video_release(struct file *file) saa_andorb(SAA7134_OFMT_DATA_A, 0x1f, 0); saa_andorb(SAA7134_OFMT_DATA_B, 0x1f, 0); - saa_call_all(dev, core, s_power, 0); + saa_call_all(dev, tuner, standby); if (vdev->vfl_type == VFL_TYPE_RADIO) saa_call_all(dev, core, ioctl, SAA6588_CMD_CLOSE, &cmd); mutex_unlock(&dev->lock); diff --git a/drivers/media/tuners/e4000.c b/drivers/media/tuners/e4000.c index 564a000f503e..a17d4853ad40 100644 --- a/drivers/media/tuners/e4000.c +++ b/drivers/media/tuners/e4000.c @@ -293,28 +293,19 @@ static inline struct e4000_dev *e4000_subdev_to_dev(struct v4l2_subdev *sd) return container_of(sd, struct e4000_dev, sd); } -static int e4000_s_power(struct v4l2_subdev *sd, int on) +static int e4000_standby(struct v4l2_subdev *sd) { struct e4000_dev *dev = e4000_subdev_to_dev(sd); struct i2c_client *client = dev->client; int ret; - dev_dbg(&client->dev, "on=%d\n", on); - - if (on) - ret = e4000_init(dev); - else - ret = e4000_sleep(dev); + ret = e4000_sleep(dev); if (ret) return ret; return e4000_set_params(dev); } -static const struct v4l2_subdev_core_ops e4000_subdev_core_ops = { - .s_power = e4000_s_power, -}; - static int e4000_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *v) { struct e4000_dev *dev = e4000_subdev_to_dev(sd); @@ -382,6 +373,7 @@ static int e4000_enum_freq_bands(struct v4l2_subdev *sd, } static const struct v4l2_subdev_tuner_ops e4000_subdev_tuner_ops = { + .standby = e4000_standby, .g_tuner = e4000_g_tuner, .s_tuner = e4000_s_tuner, .g_frequency = e4000_g_frequency, @@ -390,7 +382,6 @@ static const struct v4l2_subdev_tuner_ops e4000_subdev_tuner_ops = { }; static const struct v4l2_subdev_ops e4000_subdev_ops = { - .core = &e4000_subdev_core_ops, .tuner = &e4000_subdev_tuner_ops, }; diff --git a/drivers/media/tuners/fc2580.c b/drivers/media/tuners/fc2580.c index f4d4665de168..743184ae0d26 100644 --- a/drivers/media/tuners/fc2580.c +++ b/drivers/media/tuners/fc2580.c @@ -386,28 +386,18 @@ static inline struct fc2580_dev *fc2580_subdev_to_dev(struct v4l2_subdev *sd) return container_of(sd, struct fc2580_dev, subdev); } -static int fc2580_s_power(struct v4l2_subdev *sd, int on) +static int fc2580_standby(struct v4l2_subdev *sd) { struct fc2580_dev *dev = fc2580_subdev_to_dev(sd); - struct i2c_client *client = dev->client; int ret; - dev_dbg(&client->dev, "on=%d\n", on); - - if (on) - ret = fc2580_init(dev); - else - ret = fc2580_sleep(dev); + ret = fc2580_sleep(dev); if (ret) return ret; return fc2580_set_params(dev); } -static const struct v4l2_subdev_core_ops fc2580_subdev_core_ops = { - .s_power = fc2580_s_power, -}; - static int fc2580_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *v) { struct fc2580_dev *dev = fc2580_subdev_to_dev(sd); @@ -475,6 +465,7 @@ static int fc2580_enum_freq_bands(struct v4l2_subdev *sd, } static const struct v4l2_subdev_tuner_ops fc2580_subdev_tuner_ops = { + .standby = fc2580_standby, .g_tuner = fc2580_g_tuner, .s_tuner = fc2580_s_tuner, .g_frequency = fc2580_g_frequency, @@ -483,7 +474,6 @@ static const struct v4l2_subdev_tuner_ops fc2580_subdev_tuner_ops = { }; static const struct v4l2_subdev_ops fc2580_subdev_ops = { - .core = &fc2580_subdev_core_ops, .tuner = &fc2580_subdev_tuner_ops, }; diff --git a/drivers/media/tuners/msi001.c b/drivers/media/tuners/msi001.c index 3a12ef35682b..5de6ed728708 100644 --- a/drivers/media/tuners/msi001.c +++ b/drivers/media/tuners/msi001.c @@ -291,26 +291,13 @@ static int msi001_set_tuner(struct msi001_dev *dev) return ret; } -static int msi001_s_power(struct v4l2_subdev *sd, int on) +static int msi001_standby(struct v4l2_subdev *sd) { struct msi001_dev *dev = sd_to_msi001_dev(sd); - struct spi_device *spi = dev->spi; - int ret; - - dev_dbg(&spi->dev, "on=%d\n", on); - - if (on) - ret = 0; - else - ret = msi001_wreg(dev, 0x000000); - return ret; + return msi001_wreg(dev, 0x000000); } -static const struct v4l2_subdev_core_ops msi001_core_ops = { - .s_power = msi001_s_power, -}; - static int msi001_g_tuner(struct v4l2_subdev *sd, struct v4l2_tuner *v) { struct msi001_dev *dev = sd_to_msi001_dev(sd); @@ -386,6 +373,7 @@ static int msi001_enum_freq_bands(struct v4l2_subdev *sd, } static const struct v4l2_subdev_tuner_ops msi001_tuner_ops = { + .standby = msi001_standby, .g_tuner = msi001_g_tuner, .s_tuner = msi001_s_tuner, .g_frequency = msi001_g_frequency, @@ -394,7 +382,6 @@ static const struct v4l2_subdev_tuner_ops msi001_tuner_ops = { }; static const struct v4l2_subdev_ops msi001_ops = { - .core = &msi001_core_ops, .tuner = &msi001_tuner_ops, }; diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c index c765d546114d..964cd7bcdd2c 100644 --- a/drivers/media/usb/au0828/au0828-video.c +++ b/drivers/media/usb/au0828/au0828-video.c @@ -1091,8 +1091,8 @@ static int au0828_v4l2_close(struct file *filp) */ ret = v4l_enable_media_source(vdev); if (ret == 0) - v4l2_device_call_all(&dev->v4l2_dev, 0, core, - s_power, 0); + v4l2_device_call_all(&dev->v4l2_dev, 0, tuner, + standby); dev->std_set_in_tuner_core = 0; /* When close the device, set the usb intf0 into alt0 to free diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c index 5b321b8ada3a..f7fcd733a2ca 100644 --- a/drivers/media/usb/cx231xx/cx231xx-video.c +++ b/drivers/media/usb/cx231xx/cx231xx-video.c @@ -1941,7 +1941,7 @@ static int cx231xx_close(struct file *filp) } /* Save some power by putting tuner to sleep */ - call_all(dev, core, s_power, 0); + call_all(dev, tuner, standby); /* do this before setting alternate! */ if (dev->USE_ISO) diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index a2ba2d905952..058162012e2d 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -2202,7 +2202,7 @@ static int em28xx_v4l2_close(struct file *filp) goto exit; /* Save some power by putting tuner to sleep */ - v4l2_device_call_all(&v4l2->v4l2_dev, 0, core, s_power, 0); + v4l2_device_call_all(&v4l2->v4l2_dev, 0, tuner, standby); /* do this before setting alternate! */ em28xx_set_mode(dev, EM28XX_SUSPEND); @@ -2749,7 +2749,7 @@ static int em28xx_v4l2_init(struct em28xx *dev) video_device_node_name(&v4l2->vbi_dev)); /* Save some power by putting tuner to sleep */ - v4l2_device_call_all(&v4l2->v4l2_dev, 0, core, s_power, 0); + v4l2_device_call_all(&v4l2->v4l2_dev, 0, tuner, standby); /* initialize videobuf2 stuff */ em28xx_vb2_setup(dev); diff --git a/drivers/media/v4l2-core/tuner-core.c b/drivers/media/v4l2-core/tuner-core.c index 82852f23a3b6..cb126baf8771 100644 --- a/drivers/media/v4l2-core/tuner-core.c +++ b/drivers/media/v4l2-core/tuner-core.c @@ -1099,23 +1099,15 @@ static int tuner_s_radio(struct v4l2_subdev *sd) */ /** - * tuner_s_power - controls the power state of the tuner + * tuner_standby - controls the power state of the tuner * @sd: pointer to struct v4l2_subdev * @on: a zero value puts the tuner to sleep, non-zero wakes it up */ -static int tuner_s_power(struct v4l2_subdev *sd, int on) +static int tuner_standby(struct v4l2_subdev *sd) { struct tuner *t = to_tuner(sd); struct analog_demod_ops *analog_ops = &t->fe.ops.analog_ops; - if (on) { - if (t->standby && set_mode(t, t->mode) == 0) { - dprintk("Waking up tuner\n"); - set_freq(t, 0); - } - return 0; - } - dprintk("Putting tuner to sleep\n"); t->standby = true; if (analog_ops->standby) @@ -1328,10 +1320,10 @@ static int tuner_command(struct i2c_client *client, unsigned cmd, void *arg) static const struct v4l2_subdev_core_ops tuner_core_ops = { .log_status = tuner_log_status, - .s_power = tuner_s_power, }; static const struct v4l2_subdev_tuner_ops tuner_tuner_ops = { + .standby = tuner_standby, .s_radio = tuner_s_radio, .g_tuner = tuner_g_tuner, .s_tuner = tuner_s_tuner, diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 980a86c08fce..62429cd89620 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -224,6 +224,9 @@ struct v4l2_subdev_core_ops { * struct v4l2_subdev_tuner_ops - Callbacks used when v4l device was opened * in radio mode. * + * @standby: puts the tuner in standby mode. It will be woken up + * automatically the next time it is used. + * * @s_radio: callback that switches the tuner to radio mode. * drivers should explicitly call it when a tuner ops should * operate on radio mode, before being able to handle it. @@ -268,6 +271,7 @@ struct v4l2_subdev_core_ops { * } */ struct v4l2_subdev_tuner_ops { + int (*standby)(struct v4l2_subdev *sd); int (*s_radio)(struct v4l2_subdev *sd); int (*s_frequency)(struct v4l2_subdev *sd, const struct v4l2_frequency *freq); int (*g_frequency)(struct v4l2_subdev *sd, struct v4l2_frequency *freq);
The v4l2_subdev core s_power op was used for two different things: power on/off sensors or video decoders/encoders and to put a tuner in standby (and only the tuner!). There is no 'tuner wakeup' op, that's done automatically when the tuner is accessed. The danger with calling (s_power, 0) to put a tuner into standby is that it is usually broadcast for all subdevs. So a video receiver subdev that supports s_power will also be powered off, and since there is no corresponding (s_power, 1) they will never be powered on again. In addition, this is specifically meant for tuners only since they draw the most current. This patch adds a new tuner op called 'standby' and replaces all calls to (core, s_power, 0) by (tuner, standby). This prevents confusion between the two uses of s_power. Note that there is no overlap: bridge drivers either just want to put the tuner into standby, or they deal with powering on/off sensors. Never both. This also makes it easier to replace s_power for the remaining bridge drivers with some PM code later. Whether we want something cleaner for tuners in the future is a separate topic. There is a lot of legacy code surrounding tuners, and I am very hesitant about making changes there. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> --- Changes since v1: - move the standby op to the tuner_ops, which makes much more sense. ---