Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce80d713 authored by Antti Palosaari's avatar Antti Palosaari Committed by Mauro Carvalho Chehab
Browse files

[media] m88ds3103: implement DVBv5 BER 



Implement DVBv5 BER statistics.
Wrap legacy DVBv3 BER to DVBv5 BER.

Signed-off-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent c1daf651

drivers/media/dvb-frontends/m88ds3103.c

+91 −74
Original line number Original line Diff line number Diff line
@@ -305,6 +305,92 @@ static int m88ds3103_read_status(struct dvb_frontend *fe, fe_status_t *status) 
		c->cnr.stat[0].scale = FE_SCALE_NOT_AVAILABLE;

		c->cnr.stat[0].scale = FE_SCALE_NOT_AVAILABLE;

	}

	}





	/* BER */

	if (priv->fe_status & FE_HAS_LOCK) {

		unsigned int utmp, post_bit_error, post_bit_count;



		switch (c->delivery_system) {

		case SYS_DVBS:

			ret = m88ds3103_wr_reg(priv, 0xf9, 0x04);

			if (ret)

				goto err;



			ret = m88ds3103_rd_reg(priv, 0xf8, &u8tmp);

			if (ret)

				goto err;



			/* measurement ready? */

			if (!(u8tmp & 0x10)) {

				ret = m88ds3103_rd_regs(priv, 0xf6, buf, 2);

				if (ret)

					goto err;



				post_bit_error = buf[1] << 8 | buf[0] << 0;

				post_bit_count = 0x800000;

				priv->post_bit_error += post_bit_error;

				priv->post_bit_count += post_bit_count;

				priv->dvbv3_ber = post_bit_error;



				/* restart measurement */

				u8tmp |= 0x10;

				ret = m88ds3103_wr_reg(priv, 0xf8, u8tmp);

				if (ret)

					goto err;

			}

			break;

		case SYS_DVBS2:

			ret = m88ds3103_rd_regs(priv, 0xd5, buf, 3);

			if (ret)

				goto err;



			utmp = buf[2] << 16 | buf[1] << 8 | buf[0] << 0;



			/* enough data? */

			if (utmp > 4000) {

				ret = m88ds3103_rd_regs(priv, 0xf7, buf, 2);

				if (ret)

					goto err;



				post_bit_error = buf[1] << 8 | buf[0] << 0;

				post_bit_count = 32 * utmp; /* TODO: FEC */

				priv->post_bit_error += post_bit_error;

				priv->post_bit_count += post_bit_count;

				priv->dvbv3_ber = post_bit_error;



				/* restart measurement */

				ret = m88ds3103_wr_reg(priv, 0xd1, 0x01);

				if (ret)

					goto err;



				ret = m88ds3103_wr_reg(priv, 0xf9, 0x01);

				if (ret)

					goto err;



				ret = m88ds3103_wr_reg(priv, 0xf9, 0x00);

				if (ret)

					goto err;



				ret = m88ds3103_wr_reg(priv, 0xd1, 0x00);

				if (ret)

					goto err;

			}

			break;

		default:

			dev_dbg(&priv->i2c->dev,

				"%s: invalid delivery_system\n", __func__);

			ret = -EINVAL;

			goto err;

		}



		c->post_bit_error.stat[0].scale = FE_SCALE_COUNTER;

		c->post_bit_error.stat[0].uvalue = priv->post_bit_error;

		c->post_bit_count.stat[0].scale = FE_SCALE_COUNTER;

		c->post_bit_count.stat[0].uvalue = priv->post_bit_count;

	} else {

		c->post_bit_error.stat[0].scale = FE_SCALE_NOT_AVAILABLE;

		c->post_bit_count.stat[0].scale = FE_SCALE_NOT_AVAILABLE;

	}



	return 0;

	return 0;

err:

err:

	dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);

	dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
@@ -760,6 +846,10 @@ static int m88ds3103_init(struct dvb_frontend *fe) 
	/* init stats here in order signal app which stats are supported */

	/* init stats here in order signal app which stats are supported */

	c->cnr.len = 1;

	c->cnr.len = 1;

	c->cnr.stat[0].scale = FE_SCALE_NOT_AVAILABLE;

	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->post_bit_count.len = 1;

	c->post_bit_count.stat[0].scale = FE_SCALE_NOT_AVAILABLE;

	return 0;

	return 0;





error_fw_release:

error_fw_release:
@@ -997,83 +1087,10 @@ static int m88ds3103_read_snr(struct dvb_frontend *fe, u16 *snr) 
static int m88ds3103_read_ber(struct dvb_frontend *fe, u32 *ber)

static int m88ds3103_read_ber(struct dvb_frontend *fe, u32 *ber)

{

{

	struct m88ds3103_priv *priv = fe->demodulator_priv;

	struct m88ds3103_priv *priv = fe->demodulator_priv;

	struct dtv_frontend_properties *c = &fe->dtv_property_cache;

	int ret;

	unsigned int utmp;

	u8 buf[3], u8tmp;





	dev_dbg(&priv->i2c->dev, "%s:\n", __func__);

	*ber = priv->dvbv3_ber;



	switch (c->delivery_system) {

	case SYS_DVBS:

		ret = m88ds3103_wr_reg(priv, 0xf9, 0x04);

		if (ret)

			goto err;



		ret = m88ds3103_rd_reg(priv, 0xf8, &u8tmp);

		if (ret)

			goto err;



		if (!(u8tmp & 0x10)) {

			u8tmp |= 0x10;



			ret = m88ds3103_rd_regs(priv, 0xf6, buf, 2);

			if (ret)

				goto err;



			priv->ber = (buf[1] << 8) | (buf[0] << 0);



			/* restart counters */

			ret = m88ds3103_wr_reg(priv, 0xf8, u8tmp);

			if (ret)

				goto err;

		}

		break;

	case SYS_DVBS2:

		ret = m88ds3103_rd_regs(priv, 0xd5, buf, 3);

		if (ret)

			goto err;



		utmp = (buf[2] << 16) | (buf[1] << 8) | (buf[0] << 0);



		if (utmp > 3000) {

			ret = m88ds3103_rd_regs(priv, 0xf7, buf, 2);

			if (ret)

				goto err;



			priv->ber = (buf[1] << 8) | (buf[0] << 0);



			/* restart counters */

			ret = m88ds3103_wr_reg(priv, 0xd1, 0x01);

			if (ret)

				goto err;



			ret = m88ds3103_wr_reg(priv, 0xf9, 0x01);

			if (ret)

				goto err;



			ret = m88ds3103_wr_reg(priv, 0xf9, 0x00);

			if (ret)

				goto err;



			ret = m88ds3103_wr_reg(priv, 0xd1, 0x00);

			if (ret)

				goto err;

		}

		break;

	default:

		dev_dbg(&priv->i2c->dev, "%s: invalid delivery_system\n",

				__func__);

		ret = -EINVAL;

		goto err;

	}



	*ber = priv->ber;





	return 0;

	return 0;

err:

	dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);

	return ret;

}

}





static int m88ds3103_set_tone(struct dvb_frontend *fe,

static int m88ds3103_set_tone(struct dvb_frontend *fe,

drivers/media/dvb-frontends/m88ds3103_priv.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -38,13 +38,15 @@ struct m88ds3103_priv { 
	struct dvb_frontend fe;

	struct dvb_frontend fe;

	fe_delivery_system_t delivery_system;

	fe_delivery_system_t delivery_system;

	fe_status_t fe_status;

	fe_status_t fe_status;

	u32 ber;

	u32 dvbv3_ber; /* for old DVBv3 API read_ber */

	bool warm; /* FW running */

	bool warm; /* FW running */

	struct i2c_adapter *i2c_adapter;

	struct i2c_adapter *i2c_adapter;

	/* auto detect chip id to do different config */

	/* auto detect chip id to do different config */

	u8 chip_id;

	u8 chip_id;

	/* main mclk is calculated for M88RS6000 dynamically */

	/* main mclk is calculated for M88RS6000 dynamically */

	u32 mclk_khz;

	u32 mclk_khz;

	u64 post_bit_error;

	u64 post_bit_count;

};

};





struct m88ds3103_reg_val {

struct m88ds3103_reg_val {