Skip to content

L
linux
Commit 267897a4 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files
Options

[media] tda10071: implement DVBv5 statistics 

Implement DVBv5 CNR, signal strength, BER and block errors.

Wrap legacy DVBv3 statistics to DVBv5 internally.
Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 4c4acb7a
Show whitespace changes
Inline Side-by-side
Showing with 135 additions and 130 deletions
drivers/media/dvb-frontends/tda10071.c
View file @ 267897a4
......@@ -377,8 +377,11 @@ static int tda10071_read_status(struct dvb_frontend *fe, enum fe_status *status)
{
struct tda10071_dev *dev = fe->demodulator_priv;
struct i2c_client *client = dev->client;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct tda10071_cmd cmd;
int ret;
unsigned int uitmp;
u8 buf[8];
*status = 0;
......@@ -401,52 +404,8 @@ static int tda10071_read_status(struct dvb_frontend *fe, enum fe_status *status)
dev->fe_status = *status;
return ret;
error:
dev_dbg(&client->dev, "failed=%d\n", ret);
return ret;
}
static int tda10071_read_snr(struct dvb_frontend *fe, u16 *snr)
{
struct tda10071_dev *dev = fe->demodulator_priv;
struct i2c_client *client = dev->client;
int ret;
u8 buf[2];
if (!dev->warm || !(dev->fe_status & FE_HAS_LOCK)) {
*snr = 0;
ret = 0;
goto error;
}
ret = regmap_bulk_read(dev->regmap, 0x3a, buf, 2);
if (ret)
goto error;
/* Es/No dBx10 */
*snr = buf[0] << 8 | buf[1];
return ret;
error:
dev_dbg(&client->dev, "failed=%d\n", ret);
return ret;
}
static int tda10071_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
{
struct tda10071_dev *dev = fe->demodulator_priv;
struct i2c_client *client = dev->client;
struct tda10071_cmd cmd;
int ret;
unsigned int uitmp;
if (!dev->warm || !(dev->fe_status & FE_HAS_LOCK)) {
*strength = 0;
ret = 0;
goto error;
}
/* signal strength */
if (dev->fe_status & FE_HAS_SIGNAL) {
cmd.args[0] = CMD_GET_AGCACC;
cmd.args[1] = 0;
cmd.len = 2;
......@@ -459,66 +418,61 @@ static int tda10071_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
if (ret)
goto error;
if (uitmp < 181)
uitmp = 181; /* -75 dBm */
else if (uitmp > 236)
uitmp = 236; /* -20 dBm */
/* scale value to 0x0000-0xffff */
*strength = (uitmp-181) * 0xffff / (236-181);
return ret;
error:
dev_dbg(&client->dev, "failed=%d\n", ret);
return ret;
}
static int tda10071_read_ber(struct dvb_frontend *fe, u32 *ber)
{
struct tda10071_dev *dev = fe->demodulator_priv;
struct i2c_client *client = dev->client;
struct tda10071_cmd cmd;
int ret, i, len;
unsigned int uitmp;
u8 reg, buf[8];
c->strength.stat[0].scale = FE_SCALE_DECIBEL;
c->strength.stat[0].svalue = (int) (uitmp - 256) * 1000;
} else {
c->strength.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
}
if (!dev->warm || !(dev->fe_status & FE_HAS_LOCK)) {
*ber = dev->ber = 0;
ret = 0;
/* CNR */
if (dev->fe_status & FE_HAS_VITERBI) {
/* Es/No */
ret = regmap_bulk_read(dev->regmap, 0x3a, buf, 2);
if (ret)
goto error;
c->cnr.stat[0].scale = FE_SCALE_DECIBEL;
c->cnr.stat[0].svalue = (buf[0] << 8 | buf[1] << 0) * 100;
} else {
c->cnr.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
}
/* UCB/PER/BER */
if (dev->fe_status & FE_HAS_LOCK) {
/* TODO: report total bits/packets */
u8 delivery_system, reg, len;
switch (dev->delivery_system) {
case SYS_DVBS:
reg = 0x4c;
len = 8;
i = 1;
delivery_system = 1;
break;
case SYS_DVBS2:
reg = 0x4d;
len = 4;
i = 0;
delivery_system = 0;
break;
default:
*ber = dev->ber = 0;
return 0;
ret = -EINVAL;
goto error;
}
ret = regmap_read(dev->regmap, reg, &uitmp);
if (ret)
goto error;
if (dev->meas_count[i] == uitmp) {
if (dev->meas_count == uitmp) {
dev_dbg(&client->dev, "meas not ready=%02x\n", uitmp);
*ber = dev->ber;
return 0;
ret = 0;
goto error;
} else {
dev->meas_count[i] = uitmp;
dev->meas_count = uitmp;
}
cmd.args[0] = CMD_BER_UPDATE_COUNTERS;
cmd.args[1] = 0;
cmd.args[2] = i;
cmd.args[2] = delivery_system;
cmd.len = 3;
ret = tda10071_cmd_execute(dev, &cmd);
if (ret)
......@@ -529,12 +483,26 @@ static int tda10071_read_ber(struct dvb_frontend *fe, u32 *ber)
goto error;
if (dev->delivery_system == SYS_DVBS) {
*ber = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
dev->ucb += (buf[4] << 8) | buf[5];
dev->dvbv3_ber = buf[0] << 24 | buf[1] << 16 |
buf[2] << 8 | buf[3] << 0;
dev->post_bit_error += buf[0] << 24 | buf[1] << 16 |
buf[2] << 8 | buf[3] << 0;
c->post_bit_error.stat[0].scale = FE_SCALE_COUNTER;
c->post_bit_error.stat[0].uvalue = dev->post_bit_error;
dev->block_error += buf[4] << 8 | buf[5] << 0;
c->block_error.stat[0].scale = FE_SCALE_COUNTER;
c->block_error.stat[0].uvalue = dev->block_error;
} else {
dev->dvbv3_ber = buf[0] << 8 | buf[1] << 0;
dev->post_bit_error += buf[0] << 8 | buf[1] << 0;
c->post_bit_error.stat[0].scale = FE_SCALE_COUNTER;
c->post_bit_error.stat[0].uvalue = dev->post_bit_error;
c->block_error.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
}
} else {
*ber = (buf[0] << 8) | buf[1];
c->post_bit_error.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
c->block_error.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
}
dev->ber = *ber;
return ret;
error:
......@@ -542,25 +510,50 @@ static int tda10071_read_ber(struct dvb_frontend *fe, u32 *ber)
return ret;
}
static int tda10071_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
static int tda10071_read_snr(struct dvb_frontend *fe, u16 *snr)
{
struct tda10071_dev *dev = fe->demodulator_priv;
struct i2c_client *client = dev->client;
int ret = 0;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
if (!dev->warm || !(dev->fe_status & FE_HAS_LOCK)) {
*ucblocks = 0;
goto error;
if (c->cnr.stat[0].scale == FE_SCALE_DECIBEL)
*snr = div_s64(c->cnr.stat[0].svalue, 100);
else
*snr = 0;
return 0;
}
static int tda10071_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
unsigned int uitmp;
if (c->strength.stat[0].scale == FE_SCALE_DECIBEL) {
uitmp = c->strength.stat[0].svalue / 1000 + 256;
uitmp = clamp(uitmp, 181U, 236U); /* -75dBm - -20dBm */
/* scale value to 0x0000-0xffff */
*strength = (uitmp-181) * 0xffff / (236-181);
} else {
*strength = 0;
}
return 0;
}
static int tda10071_read_ber(struct dvb_frontend *fe, u32 *ber)
{
struct tda10071_dev *dev = fe->demodulator_priv;
/* UCB is updated when BER is read. Assume BER is read anyway. */
*ber = dev->dvbv3_ber;
return 0;
}
*ucblocks = dev->ucb;
static int tda10071_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
return ret;
error:
dev_dbg(&client->dev, "failed=%d\n", ret);
return ret;
if (c->block_error.stat[0].scale == FE_SCALE_COUNTER)
*ucblocks = c->block_error.stat[0].uvalue;
else
*ucblocks = 0;
return 0;
}
static int tda10071_set_frontend(struct dvb_frontend *fe)
......@@ -770,6 +763,7 @@ static int tda10071_init(struct dvb_frontend *fe)
{
struct tda10071_dev *dev = fe->demodulator_priv;
struct i2c_client *client = dev->client;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct tda10071_cmd cmd;
int ret, i, len, remaining, fw_size;
unsigned int uitmp;
......@@ -1035,6 +1029,16 @@ static int tda10071_init(struct dvb_frontend *fe)
goto error;
}
/* init stats here in order signal app which stats are supported */
c->strength.len = 1;
c->strength.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
c->cnr.len = 1;
c->cnr.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
c->post_bit_error.len = 1;
c->post_bit_error.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
c->block_error.len = 1;
c->block_error.stat[0].scale = FE_SCALE_NOT_AVAILABLE;
return ret;
error_release_firmware:
release_firmware(fw);
......
drivers/media/dvb-frontends/tda10071_priv.h
View file @ 267897a4
......@@ -38,12 +38,13 @@ struct tda10071_dev {
u8 pll_multiplier;
u8 tuner_i2c_addr;
u8 meas_count[2];
u32 ber;
u32 ucb;
u8 meas_count;
u32 dvbv3_ber;
enum fe_status fe_status;
enum fe_delivery_system delivery_system;
bool warm; /* FW running */
u64 post_bit_error;
u64 block_error;
};
static struct tda10071_modcod {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7