| Message ID | 1408990024-1642-3-git-send-email-olli.salonen@iki.fi (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from <linux-media-owner@vger.kernel.org>) id 1XLyg2-0000Mw-K7; Mon, 25 Aug 2014 20:07:34 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1XLyg0-0003tR-2J; Mon, 25 Aug 2014 20:07:34 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933238AbaHYSHa (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Mon, 25 Aug 2014 14:07:30 -0400 Received: from mta-out1.inet.fi ([62.71.2.228]:36031 "EHLO kirsi1.inet.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933037AbaHYSHa (ORCPT <rfc822;linux-media@vger.kernel.org>); Mon, 25 Aug 2014 14:07:30 -0400 Received: from devlin.trsqr.net (84.249.202.144) by kirsi1.inet.fi (8.5.142.08) id 53D0A9E802D5A59F; Mon, 25 Aug 2014 21:07:29 +0300 From: Olli Salonen <olli.salonen@iki.fi> To: linux-media@vger.kernel.org Cc: Olli Salonen <olli.salonen@iki.fi> Subject: [PATCH 3/3] si2168: avoid firmware loading if it has been loaded previously Date: Mon, 25 Aug 2014 21:07:04 +0300 Message-Id: <1408990024-1642-3-git-send-email-olli.salonen@iki.fi> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1408990024-1642-1-git-send-email-olli.salonen@iki.fi> References: <1408990024-1642-1-git-send-email-olli.salonen@iki.fi> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.8.25.175719 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __DATE_TZ_RU 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __URI_NS_NXDOMAIN ' |
Commit Message
Olli Salonen
Aug. 25, 2014, 6:07 p.m. UTC
Add a variable to keep track if firmware is loaded or not and skip parts of the
initialization if fw is already loaded. Resume from sleep with a different
command compared to initial power up and run command 85 after resume command.
This behaviour is observed when using manufacturer provided binary-only si2168
driver for TechnoTrend CT2-4400.
Signed-off-by: Olli Salonen <olli.salonen@iki.fi>
---
drivers/media/dvb-frontends/si2168.c | 31 ++++++++++++++++++++++++++++---
drivers/media/dvb-frontends/si2168_priv.h | 1 +
2 files changed, 29 insertions(+), 3 deletions(-)
Comments
Moikka Did you really need command 85 here? It will be given later in any case. For my Si2168 B40 there was no need for it. regards Antti On 08/25/2014 09:07 PM, Olli Salonen wrote: > Add a variable to keep track if firmware is loaded or not and skip parts of the > initialization if fw is already loaded. Resume from sleep with a different > command compared to initial power up and run command 85 after resume command. > This behaviour is observed when using manufacturer provided binary-only si2168 > driver for TechnoTrend CT2-4400. > > Signed-off-by: Olli Salonen <olli.salonen@iki.fi> > --- > drivers/media/dvb-frontends/si2168.c | 31 ++++++++++++++++++++++++++++--- > drivers/media/dvb-frontends/si2168_priv.h | 1 + > 2 files changed, 29 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c > index 55a4212..a0797fd 100644 > --- a/drivers/media/dvb-frontends/si2168.c > +++ b/drivers/media/dvb-frontends/si2168.c > @@ -363,6 +363,7 @@ static int si2168_init(struct dvb_frontend *fe) > > dev_dbg(&s->client->dev, "\n"); > > + /* initialize */ > memcpy(cmd.args, "\xc0\x12\x00\x0c\x00\x0d\x16\x00\x00\x00\x00\x00\x00", 13); > cmd.wlen = 13; > cmd.rlen = 0; > @@ -370,6 +371,26 @@ static int si2168_init(struct dvb_frontend *fe) > if (ret) > goto err; > > + if (s->fw_loaded) { > + /* resume */ > + memcpy(cmd.args, "\xc0\x06\x08\x0f\x00\x20\x21\x01", 8); > + cmd.wlen = 8; > + cmd.rlen = 1; > + ret = si2168_cmd_execute(s, &cmd); > + if (ret) > + goto err; > + > + memcpy(cmd.args, "\x85", 1); > + cmd.wlen = 1; > + cmd.rlen = 1; > + ret = si2168_cmd_execute(s, &cmd); > + if (ret) > + goto err; > + > + goto warm; > + } > + > + /* power up */ > memcpy(cmd.args, "\xc0\x06\x01\x0f\x00\x20\x20\x01", 8); > cmd.wlen = 8; > cmd.rlen = 1; > @@ -466,9 +487,6 @@ static int si2168_init(struct dvb_frontend *fe) > if (ret) > goto err; > > - dev_info(&s->client->dev, "found a '%s' in warm state\n", > - si2168_ops.info.name); > - > /* set ts mode */ > memcpy(cmd.args, "\x14\x00\x01\x10\x10\x00", 6); > cmd.args[4] |= s->ts_mode; > @@ -478,6 +496,12 @@ static int si2168_init(struct dvb_frontend *fe) > if (ret) > goto err; > > + s->fw_loaded = true; > + > +warm: > + dev_info(&s->client->dev, "found a '%s' in warm state\n", > + si2168_ops.info.name); > + > s->active = true; > > return 0; > @@ -645,6 +669,7 @@ static int si2168_probe(struct i2c_client *client, > *config->i2c_adapter = s->adapter; > *config->fe = &s->fe; > s->ts_mode = config->ts_mode; > + s->fw_loaded = false; > > i2c_set_clientdata(client, s); > > diff --git a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h > index 0f83284..e13983e 100644 > --- a/drivers/media/dvb-frontends/si2168_priv.h > +++ b/drivers/media/dvb-frontends/si2168_priv.h > @@ -36,6 +36,7 @@ struct si2168 { > fe_delivery_system_t delivery_system; > fe_status_t fe_status; > bool active; > + bool fw_loaded; > u8 ts_mode; > }; > >
Moro, I'll test it once more when testing the "si2157 sleep hack" you posted. Though I remember that the command 85 seemed to be the magic trick that finally made it work - I agree it sounds a bit strange considering it's run later on anyway. The proprietary driver seems to do a command 85 after wake up, but of course that's not a guarantee of anything. My sniff using the proprietary driver is here: http://trsqr.net/olli/ct2-4400/ct2-4400-wakeup-tune-sleep.txt Cheers, -olli On 5 September 2014 11:36, Antti Palosaari <crope@iki.fi> wrote: > Moikka > Did you really need command 85 here? It will be given later in any case. For > my Si2168 B40 there was no need for it. > > regards > Antti > > On 08/25/2014 09:07 PM, Olli Salonen wrote: >> >> Add a variable to keep track if firmware is loaded or not and skip parts >> of the >> initialization if fw is already loaded. Resume from sleep with a different >> command compared to initial power up and run command 85 after resume >> command. >> This behaviour is observed when using manufacturer provided binary-only >> si2168 >> driver for TechnoTrend CT2-4400. >> >> Signed-off-by: Olli Salonen <olli.salonen@iki.fi> >> --- >> drivers/media/dvb-frontends/si2168.c | 31 >> ++++++++++++++++++++++++++++--- >> drivers/media/dvb-frontends/si2168_priv.h | 1 + >> 2 files changed, 29 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/media/dvb-frontends/si2168.c >> b/drivers/media/dvb-frontends/si2168.c >> index 55a4212..a0797fd 100644 >> --- a/drivers/media/dvb-frontends/si2168.c >> +++ b/drivers/media/dvb-frontends/si2168.c >> @@ -363,6 +363,7 @@ static int si2168_init(struct dvb_frontend *fe) >> >> dev_dbg(&s->client->dev, "\n"); >> >> + /* initialize */ >> memcpy(cmd.args, >> "\xc0\x12\x00\x0c\x00\x0d\x16\x00\x00\x00\x00\x00\x00", 13); >> cmd.wlen = 13; >> cmd.rlen = 0; >> @@ -370,6 +371,26 @@ static int si2168_init(struct dvb_frontend *fe) >> if (ret) >> goto err; >> >> + if (s->fw_loaded) { >> + /* resume */ >> + memcpy(cmd.args, "\xc0\x06\x08\x0f\x00\x20\x21\x01", 8); >> + cmd.wlen = 8; >> + cmd.rlen = 1; >> + ret = si2168_cmd_execute(s, &cmd); >> + if (ret) >> + goto err; >> + >> + memcpy(cmd.args, "\x85", 1); >> + cmd.wlen = 1; >> + cmd.rlen = 1; >> + ret = si2168_cmd_execute(s, &cmd); >> + if (ret) >> + goto err; >> + >> + goto warm; >> + } >> + >> + /* power up */ >> memcpy(cmd.args, "\xc0\x06\x01\x0f\x00\x20\x20\x01", 8); >> cmd.wlen = 8; >> cmd.rlen = 1; >> @@ -466,9 +487,6 @@ static int si2168_init(struct dvb_frontend *fe) >> if (ret) >> goto err; >> >> - dev_info(&s->client->dev, "found a '%s' in warm state\n", >> - si2168_ops.info.name); >> - >> /* set ts mode */ >> memcpy(cmd.args, "\x14\x00\x01\x10\x10\x00", 6); >> cmd.args[4] |= s->ts_mode; >> @@ -478,6 +496,12 @@ static int si2168_init(struct dvb_frontend *fe) >> if (ret) >> goto err; >> >> + s->fw_loaded = true; >> + >> +warm: >> + dev_info(&s->client->dev, "found a '%s' in warm state\n", >> + si2168_ops.info.name); >> + >> s->active = true; >> >> return 0; >> @@ -645,6 +669,7 @@ static int si2168_probe(struct i2c_client *client, >> *config->i2c_adapter = s->adapter; >> *config->fe = &s->fe; >> s->ts_mode = config->ts_mode; >> + s->fw_loaded = false; >> >> i2c_set_clientdata(client, s); >> >> diff --git a/drivers/media/dvb-frontends/si2168_priv.h >> b/drivers/media/dvb-frontends/si2168_priv.h >> index 0f83284..e13983e 100644 >> --- a/drivers/media/dvb-frontends/si2168_priv.h >> +++ b/drivers/media/dvb-frontends/si2168_priv.h >> @@ -36,6 +36,7 @@ struct si2168 { >> fe_delivery_system_t delivery_system; >> fe_status_t fe_status; >> bool active; >> + bool fw_loaded; >> u8 ts_mode; >> }; >> >> > > -- > http://palosaari.fi/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Moro Antti, Tried removing the command 85 after resume, but the result is that the demod doesn't lock after sleep. Curiously this only impacts HD or DVB-T2 channels. DVB-T SD channels are fine even after resume. Log of the testing here: http://paste.ubuntu.com/8271949/ Same thing happens after applying the "si2157: sleep hack" patch: my TT CT2-4400 does not lock on the second tune, ie. after sleep. Log of the testing of that patch is here: http://paste.ubuntu.com/8271869/ Cheers, -olli On 5 September 2014 21:54, Olli Salonen <olli.salonen@iki.fi> wrote: > Moro, > > I'll test it once more when testing the "si2157 sleep hack" you > posted. Though I remember that the command 85 seemed to be the magic > trick that finally made it work - I agree it sounds a bit strange > considering it's run later on anyway. The proprietary driver seems to > do a command 85 after wake up, but of course that's not a guarantee of > anything. > > My sniff using the proprietary driver is here: > http://trsqr.net/olli/ct2-4400/ct2-4400-wakeup-tune-sleep.txt > > Cheers, > -olli > > On 5 September 2014 11:36, Antti Palosaari <crope@iki.fi> wrote: >> Moikka >> Did you really need command 85 here? It will be given later in any case. For >> my Si2168 B40 there was no need for it. >> >> regards >> Antti >> >> On 08/25/2014 09:07 PM, Olli Salonen wrote: >>> >>> Add a variable to keep track if firmware is loaded or not and skip parts >>> of the >>> initialization if fw is already loaded. Resume from sleep with a different >>> command compared to initial power up and run command 85 after resume >>> command. >>> This behaviour is observed when using manufacturer provided binary-only >>> si2168 >>> driver for TechnoTrend CT2-4400. >>> >>> Signed-off-by: Olli Salonen <olli.salonen@iki.fi> >>> --- >>> drivers/media/dvb-frontends/si2168.c | 31 >>> ++++++++++++++++++++++++++++--- >>> drivers/media/dvb-frontends/si2168_priv.h | 1 + >>> 2 files changed, 29 insertions(+), 3 deletions(-) >>> >>> diff --git a/drivers/media/dvb-frontends/si2168.c >>> b/drivers/media/dvb-frontends/si2168.c >>> index 55a4212..a0797fd 100644 >>> --- a/drivers/media/dvb-frontends/si2168.c >>> +++ b/drivers/media/dvb-frontends/si2168.c >>> @@ -363,6 +363,7 @@ static int si2168_init(struct dvb_frontend *fe) >>> >>> dev_dbg(&s->client->dev, "\n"); >>> >>> + /* initialize */ >>> memcpy(cmd.args, >>> "\xc0\x12\x00\x0c\x00\x0d\x16\x00\x00\x00\x00\x00\x00", 13); >>> cmd.wlen = 13; >>> cmd.rlen = 0; >>> @@ -370,6 +371,26 @@ static int si2168_init(struct dvb_frontend *fe) >>> if (ret) >>> goto err; >>> >>> + if (s->fw_loaded) { >>> + /* resume */ >>> + memcpy(cmd.args, "\xc0\x06\x08\x0f\x00\x20\x21\x01", 8); >>> + cmd.wlen = 8; >>> + cmd.rlen = 1; >>> + ret = si2168_cmd_execute(s, &cmd); >>> + if (ret) >>> + goto err; >>> + >>> + memcpy(cmd.args, "\x85", 1); >>> + cmd.wlen = 1; >>> + cmd.rlen = 1; >>> + ret = si2168_cmd_execute(s, &cmd); >>> + if (ret) >>> + goto err; >>> + >>> + goto warm; >>> + } >>> + >>> + /* power up */ >>> memcpy(cmd.args, "\xc0\x06\x01\x0f\x00\x20\x20\x01", 8); >>> cmd.wlen = 8; >>> cmd.rlen = 1; >>> @@ -466,9 +487,6 @@ static int si2168_init(struct dvb_frontend *fe) >>> if (ret) >>> goto err; >>> >>> - dev_info(&s->client->dev, "found a '%s' in warm state\n", >>> - si2168_ops.info.name); >>> - >>> /* set ts mode */ >>> memcpy(cmd.args, "\x14\x00\x01\x10\x10\x00", 6); >>> cmd.args[4] |= s->ts_mode; >>> @@ -478,6 +496,12 @@ static int si2168_init(struct dvb_frontend *fe) >>> if (ret) >>> goto err; >>> >>> + s->fw_loaded = true; >>> + >>> +warm: >>> + dev_info(&s->client->dev, "found a '%s' in warm state\n", >>> + si2168_ops.info.name); >>> + >>> s->active = true; >>> >>> return 0; >>> @@ -645,6 +669,7 @@ static int si2168_probe(struct i2c_client *client, >>> *config->i2c_adapter = s->adapter; >>> *config->fe = &s->fe; >>> s->ts_mode = config->ts_mode; >>> + s->fw_loaded = false; >>> >>> i2c_set_clientdata(client, s); >>> >>> diff --git a/drivers/media/dvb-frontends/si2168_priv.h >>> b/drivers/media/dvb-frontends/si2168_priv.h >>> index 0f83284..e13983e 100644 >>> --- a/drivers/media/dvb-frontends/si2168_priv.h >>> +++ b/drivers/media/dvb-frontends/si2168_priv.h >>> @@ -36,6 +36,7 @@ struct si2168 { >>> fe_delivery_system_t delivery_system; >>> fe_status_t fe_status; >>> bool active; >>> + bool fw_loaded; >>> u8 ts_mode; >>> }; >>> >>> >> >> -- >> http://palosaari.fi/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Moro! Removing 85 causes lose of DVB-T2 lock, but DVB-T works for me too (Si2168 B40). So you were correct. I will apply that patch as it is. That tuner sleep/firmware download patch is another thing. Maybe I will apply it too as it prevents unnecessary firmware downloading for Si2158 (my Si2157 does not need fw upgrade at all). It harms me a little bit to lose 18mA @5V idle power consumption, but 18mA is still not too much. Reality is that most of these Linux DVB drivers are so broken that USB device consumes more than 100mA on sleep. I am only person who has done these measurements and tried to fix all leakages, and many times done it even better than Windows drivers :) If Linux DVB power management is almost always broken, it is still not very successful on windows I have noticed. It is annoying though maintain these drivers without a hardware... regards Antti On 09/06/2014 08:36 PM, Olli Salonen wrote: > Moro Antti, > > Tried removing the command 85 after resume, but the result is that the > demod doesn't lock after sleep. Curiously this only impacts HD or > DVB-T2 channels. DVB-T SD channels are fine even after resume. > > Log of the testing here: > http://paste.ubuntu.com/8271949/ > > Same thing happens after applying the "si2157: sleep hack" patch: my > TT CT2-4400 does not lock on the second tune, ie. after sleep. > > Log of the testing of that patch is here: > http://paste.ubuntu.com/8271869/ > > Cheers, > -olli > > On 5 September 2014 21:54, Olli Salonen <olli.salonen@iki.fi> wrote: >> Moro, >> >> I'll test it once more when testing the "si2157 sleep hack" you >> posted. Though I remember that the command 85 seemed to be the magic >> trick that finally made it work - I agree it sounds a bit strange >> considering it's run later on anyway. The proprietary driver seems to >> do a command 85 after wake up, but of course that's not a guarantee of >> anything. >> >> My sniff using the proprietary driver is here: >> http://trsqr.net/olli/ct2-4400/ct2-4400-wakeup-tune-sleep.txt >> >> Cheers, >> -olli >> >> On 5 September 2014 11:36, Antti Palosaari <crope@iki.fi> wrote: >>> Moikka >>> Did you really need command 85 here? It will be given later in any case. For >>> my Si2168 B40 there was no need for it. >>> >>> regards >>> Antti >>> >>> On 08/25/2014 09:07 PM, Olli Salonen wrote: >>>> >>>> Add a variable to keep track if firmware is loaded or not and skip parts >>>> of the >>>> initialization if fw is already loaded. Resume from sleep with a different >>>> command compared to initial power up and run command 85 after resume >>>> command. >>>> This behaviour is observed when using manufacturer provided binary-only >>>> si2168 >>>> driver for TechnoTrend CT2-4400. >>>> >>>> Signed-off-by: Olli Salonen <olli.salonen@iki.fi> >>>> --- >>>> drivers/media/dvb-frontends/si2168.c | 31 >>>> ++++++++++++++++++++++++++++--- >>>> drivers/media/dvb-frontends/si2168_priv.h | 1 + >>>> 2 files changed, 29 insertions(+), 3 deletions(-) >>>> >>>> diff --git a/drivers/media/dvb-frontends/si2168.c >>>> b/drivers/media/dvb-frontends/si2168.c >>>> index 55a4212..a0797fd 100644 >>>> --- a/drivers/media/dvb-frontends/si2168.c >>>> +++ b/drivers/media/dvb-frontends/si2168.c >>>> @@ -363,6 +363,7 @@ static int si2168_init(struct dvb_frontend *fe) >>>> >>>> dev_dbg(&s->client->dev, "\n"); >>>> >>>> + /* initialize */ >>>> memcpy(cmd.args, >>>> "\xc0\x12\x00\x0c\x00\x0d\x16\x00\x00\x00\x00\x00\x00", 13); >>>> cmd.wlen = 13; >>>> cmd.rlen = 0; >>>> @@ -370,6 +371,26 @@ static int si2168_init(struct dvb_frontend *fe) >>>> if (ret) >>>> goto err; >>>> >>>> + if (s->fw_loaded) { >>>> + /* resume */ >>>> + memcpy(cmd.args, "\xc0\x06\x08\x0f\x00\x20\x21\x01", 8); >>>> + cmd.wlen = 8; >>>> + cmd.rlen = 1; >>>> + ret = si2168_cmd_execute(s, &cmd); >>>> + if (ret) >>>> + goto err; >>>> + >>>> + memcpy(cmd.args, "\x85", 1); >>>> + cmd.wlen = 1; >>>> + cmd.rlen = 1; >>>> + ret = si2168_cmd_execute(s, &cmd); >>>> + if (ret) >>>> + goto err; >>>> + >>>> + goto warm; >>>> + } >>>> + >>>> + /* power up */ >>>> memcpy(cmd.args, "\xc0\x06\x01\x0f\x00\x20\x20\x01", 8); >>>> cmd.wlen = 8; >>>> cmd.rlen = 1; >>>> @@ -466,9 +487,6 @@ static int si2168_init(struct dvb_frontend *fe) >>>> if (ret) >>>> goto err; >>>> >>>> - dev_info(&s->client->dev, "found a '%s' in warm state\n", >>>> - si2168_ops.info.name); >>>> - >>>> /* set ts mode */ >>>> memcpy(cmd.args, "\x14\x00\x01\x10\x10\x00", 6); >>>> cmd.args[4] |= s->ts_mode; >>>> @@ -478,6 +496,12 @@ static int si2168_init(struct dvb_frontend *fe) >>>> if (ret) >>>> goto err; >>>> >>>> + s->fw_loaded = true; >>>> + >>>> +warm: >>>> + dev_info(&s->client->dev, "found a '%s' in warm state\n", >>>> + si2168_ops.info.name); >>>> + >>>> s->active = true; >>>> >>>> return 0; >>>> @@ -645,6 +669,7 @@ static int si2168_probe(struct i2c_client *client, >>>> *config->i2c_adapter = s->adapter; >>>> *config->fe = &s->fe; >>>> s->ts_mode = config->ts_mode; >>>> + s->fw_loaded = false; >>>> >>>> i2c_set_clientdata(client, s); >>>> >>>> diff --git a/drivers/media/dvb-frontends/si2168_priv.h >>>> b/drivers/media/dvb-frontends/si2168_priv.h >>>> index 0f83284..e13983e 100644 >>>> --- a/drivers/media/dvb-frontends/si2168_priv.h >>>> +++ b/drivers/media/dvb-frontends/si2168_priv.h >>>> @@ -36,6 +36,7 @@ struct si2168 { >>>> fe_delivery_system_t delivery_system; >>>> fe_status_t fe_status; >>>> bool active; >>>> + bool fw_loaded; >>>> u8 ts_mode; >>>> }; >>>> >>>> >>> >>> -- >>> http://palosaari.fi/
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c index 55a4212..a0797fd 100644 --- a/drivers/media/dvb-frontends/si2168.c +++ b/drivers/media/dvb-frontends/si2168.c @@ -363,6 +363,7 @@ static int si2168_init(struct dvb_frontend *fe) dev_dbg(&s->client->dev, "\n"); + /* initialize */ memcpy(cmd.args, "\xc0\x12\x00\x0c\x00\x0d\x16\x00\x00\x00\x00\x00\x00", 13); cmd.wlen = 13; cmd.rlen = 0; @@ -370,6 +371,26 @@ static int si2168_init(struct dvb_frontend *fe) if (ret) goto err; + if (s->fw_loaded) { + /* resume */ + memcpy(cmd.args, "\xc0\x06\x08\x0f\x00\x20\x21\x01", 8); + cmd.wlen = 8; + cmd.rlen = 1; + ret = si2168_cmd_execute(s, &cmd); + if (ret) + goto err; + + memcpy(cmd.args, "\x85", 1); + cmd.wlen = 1; + cmd.rlen = 1; + ret = si2168_cmd_execute(s, &cmd); + if (ret) + goto err; + + goto warm; + } + + /* power up */ memcpy(cmd.args, "\xc0\x06\x01\x0f\x00\x20\x20\x01", 8); cmd.wlen = 8; cmd.rlen = 1; @@ -466,9 +487,6 @@ static int si2168_init(struct dvb_frontend *fe) if (ret) goto err; - dev_info(&s->client->dev, "found a '%s' in warm state\n", - si2168_ops.info.name); - /* set ts mode */ memcpy(cmd.args, "\x14\x00\x01\x10\x10\x00", 6); cmd.args[4] |= s->ts_mode; @@ -478,6 +496,12 @@ static int si2168_init(struct dvb_frontend *fe) if (ret) goto err; + s->fw_loaded = true; + +warm: + dev_info(&s->client->dev, "found a '%s' in warm state\n", + si2168_ops.info.name); + s->active = true; return 0; @@ -645,6 +669,7 @@ static int si2168_probe(struct i2c_client *client, *config->i2c_adapter = s->adapter; *config->fe = &s->fe; s->ts_mode = config->ts_mode; + s->fw_loaded = false; i2c_set_clientdata(client, s); diff --git a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h index 0f83284..e13983e 100644 --- a/drivers/media/dvb-frontends/si2168_priv.h +++ b/drivers/media/dvb-frontends/si2168_priv.h @@ -36,6 +36,7 @@ struct si2168 { fe_delivery_system_t delivery_system; fe_status_t fe_status; bool active; + bool fw_loaded; u8 ts_mode; };