diff mbox

[10/10] mn88473: implement lock for all delivery systems

Message ID 1426460275-3766-10-git-send-email-benjamin@southpole.se (mailing list archive)
State New, archived
Headers show

Commit Message

Benjamin Larsson March 15, 2015, 10:57 p.m. UTC 
Signed-off-by: Benjamin Larsson <benjamin@southpole.se>
---
 drivers/staging/media/mn88473/mn88473.c | 50 +++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

Comments

Antti Palosaari March 16, 2015, 9:47 p.m. UTC | #1 
On 03/16/2015 12:57 AM, Benjamin Larsson wrote:
> Signed-off-by: Benjamin Larsson <benjamin@southpole.se>

Applied.

Antti

> ---
>   drivers/staging/media/mn88473/mn88473.c | 50 +++++++++++++++++++++++++++++++--
>   1 file changed, 48 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/media/mn88473/mn88473.c b/drivers/staging/media/mn88473/mn88473.c
> index a23e59e..ba39614 100644
> --- a/drivers/staging/media/mn88473/mn88473.c
> +++ b/drivers/staging/media/mn88473/mn88473.c
> @@ -167,7 +167,10 @@ static int mn88473_read_status(struct dvb_frontend *fe, fe_status_t *status)
>   {
>   	struct i2c_client *client = fe->demodulator_priv;
>   	struct mn88473_dev *dev = i2c_get_clientdata(client);
> +	struct dtv_frontend_properties *c = &fe->dtv_property_cache;
>   	int ret;
> +	unsigned int utmp;
> +	int lock = 0;
>
>   	*status = 0;
>
> @@ -176,8 +179,51 @@ static int mn88473_read_status(struct dvb_frontend *fe, fe_status_t *status)
>   		goto err;
>   	}
>
> -	*status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI |
> -			FE_HAS_SYNC | FE_HAS_LOCK;
> +	switch (c->delivery_system) {
> +	case SYS_DVBT:
> +		ret = regmap_read(dev->regmap[0], 0x62, &utmp);
> +		if (ret)
> +			goto err;
> +		if (utmp & 0xA0) {
> +			if ((utmp & 0xF) >= 0x03)
> +				*status |= FE_HAS_SIGNAL;
> +			if ((utmp & 0xF) >= 0x09)
> +				lock = 1;
> +		}
> +		break;
> +	case SYS_DVBT2:
> +		ret = regmap_read(dev->regmap[2], 0x8B, &utmp);
> +		if (ret)
> +			goto err;
> +		if (utmp & 0x40) {
> +			if ((utmp & 0xF) >= 0x07)
> +				*status |= FE_HAS_SIGNAL;
> +			if ((utmp & 0xF) >= 0x0a)
> +				*status |= FE_HAS_CARRIER;
> +			if ((utmp & 0xF) >= 0x0d)
> +				*status |= FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
> +		}
> +		break;
> +	case SYS_DVBC_ANNEX_A:
> +		ret = regmap_read(dev->regmap[1], 0x85, &utmp);
> +		if (ret)
> +			goto err;
> +		if (utmp & 0x40) {
> +			ret = regmap_read(dev->regmap[1], 0x89, &utmp);
> +			if (ret)
> +				goto err;
> +			if (utmp & 0x01)
> +				lock = 1;
> +		}
> +		break;
> +	default:
> +		ret = -EINVAL;
> +		goto err;
> +	}
> +
> +	if (lock)
> +		*status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI |
> +				FE_HAS_SYNC | FE_HAS_LOCK;
>
>   	return 0;
>   err:
>
Antti Palosaari March 16, 2015, 10:44 p.m. UTC | #2 
On 03/16/2015 11:47 PM, Antti Palosaari wrote:
> On 03/16/2015 12:57 AM, Benjamin Larsson wrote:
>> Signed-off-by: Benjamin Larsson <benjamin@southpole.se>
>
> Applied.

I found this does not work at least for DVB-C. After playing with 
modulator I find reg 0x85 on bank 1 is likely AGC. Its value is changed 
according to RF level even modulation itself is turned off.

I will likely remove that patch... It is a bit hard to find out lock 
bits and it comes even harder without a modulator. Using typical tricks 
to plug and unplug antenna, while dumping register values out is error 
prone as you could not adjust signal strength nor change modulation 
parameters causing wrong decision easily.

regards
Antti


>
> Antti
>
>> ---
>>   drivers/staging/media/mn88473/mn88473.c | 50
>> +++++++++++++++++++++++++++++++--
>>   1 file changed, 48 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/staging/media/mn88473/mn88473.c
>> b/drivers/staging/media/mn88473/mn88473.c
>> index a23e59e..ba39614 100644
>> --- a/drivers/staging/media/mn88473/mn88473.c
>> +++ b/drivers/staging/media/mn88473/mn88473.c
>> @@ -167,7 +167,10 @@ static int mn88473_read_status(struct
>> dvb_frontend *fe, fe_status_t *status)
>>   {
>>       struct i2c_client *client = fe->demodulator_priv;
>>       struct mn88473_dev *dev = i2c_get_clientdata(client);
>> +    struct dtv_frontend_properties *c = &fe->dtv_property_cache;
>>       int ret;
>> +    unsigned int utmp;
>> +    int lock = 0;
>>
>>       *status = 0;
>>
>> @@ -176,8 +179,51 @@ static int mn88473_read_status(struct
>> dvb_frontend *fe, fe_status_t *status)
>>           goto err;
>>       }
>>
>> -    *status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI |
>> -            FE_HAS_SYNC | FE_HAS_LOCK;
>> +    switch (c->delivery_system) {
>> +    case SYS_DVBT:
>> +        ret = regmap_read(dev->regmap[0], 0x62, &utmp);
>> +        if (ret)
>> +            goto err;
>> +        if (utmp & 0xA0) {
>> +            if ((utmp & 0xF) >= 0x03)
>> +                *status |= FE_HAS_SIGNAL;
>> +            if ((utmp & 0xF) >= 0x09)
>> +                lock = 1;
>> +        }
>> +        break;
>> +    case SYS_DVBT2:
>> +        ret = regmap_read(dev->regmap[2], 0x8B, &utmp);
>> +        if (ret)
>> +            goto err;
>> +        if (utmp & 0x40) {
>> +            if ((utmp & 0xF) >= 0x07)
>> +                *status |= FE_HAS_SIGNAL;
>> +            if ((utmp & 0xF) >= 0x0a)
>> +                *status |= FE_HAS_CARRIER;
>> +            if ((utmp & 0xF) >= 0x0d)
>> +                *status |= FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
>> +        }
>> +        break;
>> +    case SYS_DVBC_ANNEX_A:
>> +        ret = regmap_read(dev->regmap[1], 0x85, &utmp);
>> +        if (ret)
>> +            goto err;
>> +        if (utmp & 0x40) {
>> +            ret = regmap_read(dev->regmap[1], 0x89, &utmp);
>> +            if (ret)
>> +                goto err;
>> +            if (utmp & 0x01)
>> +                lock = 1;
>> +        }
>> +        break;
>> +    default:
>> +        ret = -EINVAL;
>> +        goto err;
>> +    }
>> +
>> +    if (lock)
>> +        *status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI |
>> +                FE_HAS_SYNC | FE_HAS_LOCK;
>>
>>       return 0;
>>   err:
>>
>
Benjamin Larsson March 16, 2015, 11:10 p.m. UTC | #3 
On 03/16/2015 11:44 PM, Antti Palosaari wrote:
> On 03/16/2015 11:47 PM, Antti Palosaari wrote:
>> On 03/16/2015 12:57 AM, Benjamin Larsson wrote:
>>> Signed-off-by: Benjamin Larsson <benjamin@southpole.se>
>>
>> Applied.
>
> I found this does not work at least for DVB-C. After playing with
> modulator I find reg 0x85 on bank 1 is likely AGC. Its value is changed
> according to RF level even modulation itself is turned off.
>
> I will likely remove that patch... It is a bit hard to find out lock
> bits and it comes even harder without a modulator. Using typical tricks
> to plug and unplug antenna, while dumping register values out is error
> prone as you could not adjust signal strength nor change modulation
> parameters causing wrong decision easily.
>
> regards
> Antti
>

Indeed the logic was inverted. Will respin the patch.

MvH
Benjamin Larsson

--
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
Antti Palosaari March 18, 2015, 9:13 p.m. UTC | #4 
On 03/17/2015 01:10 AM, Benjamin Larsson wrote:
> On 03/16/2015 11:44 PM, Antti Palosaari wrote:
>> On 03/16/2015 11:47 PM, Antti Palosaari wrote:
>>> On 03/16/2015 12:57 AM, Benjamin Larsson wrote:
>>>> Signed-off-by: Benjamin Larsson <benjamin@southpole.se>
>>>
>>> Applied.
>>
>> I found this does not work at least for DVB-C. After playing with
>> modulator I find reg 0x85 on bank 1 is likely AGC. Its value is changed
>> according to RF level even modulation itself is turned off.
>>
>> I will likely remove that patch... It is a bit hard to find out lock
>> bits and it comes even harder without a modulator. Using typical tricks
>> to plug and unplug antenna, while dumping register values out is error
>> prone as you could not adjust signal strength nor change modulation
>> parameters causing wrong decision easily.
>>
>> regards
>> Antti
>>
>
> Indeed the logic was inverted. Will respin the patch.

Any ETA for the new patch?

regards
Antti
Benjamin Larsson March 18, 2015, 9:40 p.m. UTC | #5 
On 03/18/2015 10:13 PM, Antti Palosaari wrote:
> On 03/17/2015 01:10 AM, Benjamin Larsson wrote:
>> On 03/16/2015 11:44 PM, Antti Palosaari wrote:
>>> On 03/16/2015 11:47 PM, Antti Palosaari wrote:
>>>> On 03/16/2015 12:57 AM, Benjamin Larsson wrote:
>>>>> Signed-off-by: Benjamin Larsson <benjamin@southpole.se>
>>>>
>>>> Applied.
>>>
>>> I found this does not work at least for DVB-C. After playing with
>>> modulator I find reg 0x85 on bank 1 is likely AGC. Its value is changed
>>> according to RF level even modulation itself is turned off.
>>>
>>> I will likely remove that patch... It is a bit hard to find out lock
>>> bits and it comes even harder without a modulator. Using typical tricks
>>> to plug and unplug antenna, while dumping register values out is error
>>> prone as you could not adjust signal strength nor change modulation
>>> parameters causing wrong decision easily.
>>>
>>> regards
>>> Antti
>>>
>>
>> Indeed the logic was inverted. Will respin the patch.
>
> Any ETA for the new patch?
>
> regards
> Antti
>

Sent and I tested DVB-C yesterday, it worked fine.

MvH
Benjamin Larsson
--
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
diff mbox

Patch

diff --git a/drivers/staging/media/mn88473/mn88473.c b/drivers/staging/media/mn88473/mn88473.c
index a23e59e..ba39614 100644
--- a/drivers/staging/media/mn88473/mn88473.c
+++ b/drivers/staging/media/mn88473/mn88473.c
@@ -167,7 +167,10 @@  static int mn88473_read_status(struct dvb_frontend *fe, fe_status_t *status)
 {
 	struct i2c_client *client = fe->demodulator_priv;
 	struct mn88473_dev *dev = i2c_get_clientdata(client);
+	struct dtv_frontend_properties *c = &fe->dtv_property_cache;
 	int ret;
+	unsigned int utmp;
+	int lock = 0;
 
 	*status = 0;
 
@@ -176,8 +179,51 @@  static int mn88473_read_status(struct dvb_frontend *fe, fe_status_t *status)
 		goto err;
 	}
 
-	*status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI |
-			FE_HAS_SYNC | FE_HAS_LOCK;
+	switch (c->delivery_system) {
+	case SYS_DVBT:
+		ret = regmap_read(dev->regmap[0], 0x62, &utmp);
+		if (ret)
+			goto err;
+		if (utmp & 0xA0) {
+			if ((utmp & 0xF) >= 0x03)
+				*status |= FE_HAS_SIGNAL;
+			if ((utmp & 0xF) >= 0x09)
+				lock = 1;
+		}
+		break;
+	case SYS_DVBT2:
+		ret = regmap_read(dev->regmap[2], 0x8B, &utmp);
+		if (ret)
+			goto err;
+		if (utmp & 0x40) {
+			if ((utmp & 0xF) >= 0x07)
+				*status |= FE_HAS_SIGNAL;
+			if ((utmp & 0xF) >= 0x0a)
+				*status |= FE_HAS_CARRIER;
+			if ((utmp & 0xF) >= 0x0d)
+				*status |= FE_HAS_VITERBI | FE_HAS_SYNC | FE_HAS_LOCK;
+		}
+		break;
+	case SYS_DVBC_ANNEX_A:
+		ret = regmap_read(dev->regmap[1], 0x85, &utmp);
+		if (ret)
+			goto err;
+		if (utmp & 0x40) {
+			ret = regmap_read(dev->regmap[1], 0x89, &utmp);
+			if (ret)
+				goto err;
+			if (utmp & 0x01)
+				lock = 1;
+		}
+		break;
+	default:
+		ret = -EINVAL;
+		goto err;
+	}
+
+	if (lock)
+		*status = FE_HAS_SIGNAL | FE_HAS_CARRIER | FE_HAS_VITERBI |
+				FE_HAS_SYNC | FE_HAS_LOCK;
 
 	return 0;
 err: