m88ds3103 fixes

README.md

@@ -5,6 +5,7 @@ It contains patches for the following drivers
 * stv091x: tbs5927
 * tas2101 (incomplete): tbs5990, tbs6904
 * si2183 based cards: tbs6504
+* m88ds3103: pctv 461e v1(B6H9)/Hauppauge wintv-nova-s2 v1.4(B9H9) 
 
 to support blindscan, to fix bugs and to make improvements.
 

drivers/media/dvb-core/dvb_frontend.c

@@ -761,7 +761,7 @@ static int dvb_frontend_thread(void *data)
 					if (fe->ops.scan)
 						fe->ops.scan(fe, fepriv->state & FESTATE_SCAN_NEXT , &fepriv->delay, &s);
 					fepriv->state = FESTATE_IDLE;
-				}	 else if (fepriv->state & FESTATE_GETTING_SPECTRUM) {
+				} else if (fepriv->state & FESTATE_GETTING_SPECTRUM) {
 					dev_dbg(fe->dvb->device, "%s: Spectrum requested, DTV_SPECTRUM\n", __func__);
 					dprintk("starting spectrum scan\n");
 					if (fe->ops.spectrum_start)
@@ -792,7 +792,31 @@ static int dvb_frontend_thread(void *data)
 				break;
 			case DVBFE_ALGO_SW:
 				dev_dbg(fe->dvb->device, "%s: Frontend ALGO = DVBFE_ALGO_SW\n", __func__);
-				dvb_frontend_swzigzag(fe);
+
+				if (fepriv->state & FESTATE_SCANNING) {
+					dev_dbg(fe->dvb->device, "%s: Sscan requested, FESTATE_SCANNING\n", __func__);
+					if (fe->ops.scan)
+						fe->ops.scan(fe, fepriv->state & FESTATE_SCAN_NEXT , &fepriv->delay, &s);
+					fepriv->state = FESTATE_IDLE;
+				} else if (fepriv->state & FESTATE_GETTING_SPECTRUM) {
+					dev_dbg(fe->dvb->device, "%s: Spectrum requested, DTV_SPECTRUM\n", __func__);
+					dprintk("starting spectrum scan\n");
+					if (fe->ops.spectrum_start)
+						fe->ops.spectrum_start(fe,  &fepriv->spectrum, &fepriv->delay, &s);
+					dprintk("spectrum scan ended s=0x%x\n", s);
+					fepriv->state = FESTATE_IDLE;
+				} else {
+					dvb_frontend_swzigzag(fe);
+					fe->ops.read_status(fe, &s);
+				}
+				if ((s != fepriv->status && !(fepriv->tune_mode_flags & FE_TUNE_MODE_ONESHOT))
+						|| (fepriv->heartbeat_interval>0)) {
+					//dprintk("Adding event val=0x%x\n", s);
+					dev_dbg(fe->dvb->device, "%s: state changed, adding current state\n", __func__);
+					dvb_frontend_add_event(fe, s);
+					fepriv->status = s;
+				}
+				atomic_set(&fe->algo_state.task_should_stop, false);
 				break;
 			case DVBFE_ALGO_CUSTOM:
 				dev_dbg(fe->dvb->device, "%s: Frontend ALGO = DVBFE_ALGO_CUSTOM, state=%d\n", __func__, fepriv->state);
@@ -983,6 +1007,7 @@ static void dvb_frontend_get_frequency_limits(struct dvb_frontend *fe,
 
 	/* If the standard is for satellite, convert frequencies to kHz */
 	switch (c->delivery_system) {
+	case SYS_AUTO:
 	case SYS_DVBS:
 	case SYS_DVBS2:
 	case SYS_TURBO:
@@ -1008,6 +1033,7 @@ static u32 dvb_frontend_get_stepsize(struct dvb_frontend *fe)
 	u32 step = max(fe_step, tuner_step);
 
 	switch (c->delivery_system) {
+	case SYS_AUTO:
 	case SYS_DVBS:
 	case SYS_DVBS2:
 	case SYS_TURBO:
@@ -1035,17 +1061,20 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe)
 		dvb_frontend_get_frequency_limits(fe, &freq_min, &freq_max, NULL);
 		if ((freq_min && c->frequency < freq_min) ||
 				(freq_max && c->frequency > freq_max)) {
-			dev_warn(fe->dvb->device, "DVB: adapter %i frontend %i frequency %u out of range (%u..%u)\n",
+			if (c->frequency != 0) {
+				dev_warn(fe->dvb->device, "DVB: adapter %i frontend %i frequency %u out of range (%u..%u)\n",
 							 fe->dvb->num, fe->id, c->frequency,
 							 freq_min, freq_max);
-			dprintk( "DVB: adapter %i frontend %i frequency %u out of range (%u..%u)\n",
+				dprintk( "DVB: adapter %i frontend %i frequency %u out of range (%u..%u)\n",
 							 fe->dvb->num, fe->id, c->frequency,
 							 freq_min, freq_max);
-			return -EINVAL;
+				return -EINVAL;
+			}
 		}
 
 		/* range check: symbol rate */
 		switch (c->delivery_system) {
+		case SYS_AUTO:
 		case SYS_DVBS:
 		case SYS_DVBS2:
 		case SYS_TURBO:
@@ -1055,15 +1084,17 @@ static int dvb_frontend_check_parameters(struct dvb_frontend *fe)
 					 c->symbol_rate < fe->ops.info.symbol_rate_min) ||
 					(fe->ops.info.symbol_rate_max &&
 					 c->symbol_rate > fe->ops.info.symbol_rate_max)) {
-				dev_warn(fe->dvb->device, "DVB: adapter %i frontend %i symbol rate %u out of range (%u..%u)\n",
+				if (c->symbol_rate != 0) {
+					dev_warn(fe->dvb->device, "DVB: adapter %i frontend %i symbol rate %u out of range (%u..%u)\n",
 								 fe->dvb->num, fe->id, c->symbol_rate,
 								 fe->ops.info.symbol_rate_min,
 								 fe->ops.info.symbol_rate_max);
-				dprintk("DVB: adapter %i frontend %i symbol rate %u out of range (%u..%u)\n",
+					dprintk("DVB: adapter %i frontend %i symbol rate %u out of range (%u..%u)\n",
 								fe->dvb->num, fe->id, c->symbol_rate,
 								fe->ops.info.symbol_rate_min,
 								fe->ops.info.symbol_rate_max);
-				return -EINVAL;
+					return -EINVAL;
+				}
 			}
 		default:
 			break;
@@ -1119,6 +1150,7 @@ static int dvb_frontend_clear_cache(struct dvb_frontend *fe)
 	c->scrambling_sequence_index = 0;/* default sequence */
 
 	switch (c->delivery_system) {
+	case SYS_AUTO:
 	case SYS_DVBS:
 	case SYS_DVBS2:
 	case SYS_TURBO:
@@ -2624,6 +2656,7 @@ static int dtv_set_frontend(struct dvb_frontend *fe)
 	case SYS_ISDBS:
 		rolloff = 135;
 		break;
+	case SYS_AUTO:
 	case SYS_DVBS2:
 		switch (c->rolloff) {
 		case ROLLOFF_20:
@@ -2663,6 +2696,7 @@ static int dtv_set_frontend(struct dvb_frontend *fe)
 	} else {
 		/* default values */
 		switch (c->delivery_system) {
+		case SYS_AUTO:
 		case SYS_DVBS:
 		case SYS_DVBS2:
 		case SYS_ISDBS:
@@ -2738,6 +2772,7 @@ static int dtv_get_pls_search_list(struct dvb_frontend *fe, struct dtv_pls_searc
 static int dtv_set_pls_search_list(struct dvb_frontend *fe, struct dtv_pls_search_list* user)
 {
 	struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+	int i;
 	c->pls_search_codes_len = sizeof(c->pls_search_codes)/sizeof(c->pls_search_codes[0]);
 	if(user->num_codes < c->pls_search_codes_len)
 		c->pls_search_codes_len = user->num_codes;
@@ -2749,7 +2784,7 @@ static int dtv_set_pls_search_list(struct dvb_frontend *fe, struct dtv_pls_searc
 		dprintk("ERROR: len=%d/%d codes=%p", c->pls_search_codes_len, user->num_codes, user->codes);
 		return -EFAULT;
 	}
-	int i;
+
 	dprintk("PLS: %d codes:\n", c->pls_search_codes_len);
 	for(i=0;i< c->pls_search_codes_len;++i)
 		dprintk("code=0x%x\n", c->pls_search_codes[i]);

drivers/media/dvb-frontends/Makefile

@@ -20,7 +20,7 @@ drxd-objs := drxd_firm.o drxd_hard.o
 cxd2820r-objs := cxd2820r_core.o cxd2820r_c.o cxd2820r_t.o cxd2820r_t2.o
 drxk-objs := drxk_hard.o
 stv091x-objs := stv091x_chip.o stv091x_drv.o
-
+m88ds3103-objs := m88ds3103_drv.o neumo-scan.o
 obj-$(CONFIG_DVB_PLL) += dvb-pll.o
 obj-$(CONFIG_DVB_STV0299) += stv0299.o
 obj-$(CONFIG_DVB_STB0899) += stb0899.o

drivers/media/dvb-frontends/a8293.c

@@ -10,17 +10,133 @@
 struct a8293_dev {
 	struct i2c_client *client;
 	u8 reg[2];
+	int volt_slew_nanos_per_mv;
 };
 
-static int a8293_set_voltage(struct dvb_frontend *fe,
-			     enum fe_sec_voltage fe_sec_voltage)
+/*
+ * When increasing voltage, do so in minimal steps over time, minimizing risk of vIN undervoltage.
+ */
+
+static int a8293_set_voltage_slew(struct a8293_dev *dev, struct i2c_client *client,
+				  enum fe_sec_voltage fe_sec_voltage, int min_nanos_per_mv)
+{
+	int ret;
+	u8 reg0, reg1;
+	int new_volt_idx;
+	const int idx_to_mv[] = {0,    12709, 13042, 13375, 14042, 15042, 18042, 18709, 19042};
+	const u8 idx_to_reg[] = {0x00, 0x20,  0x21,  0x22,  0x24,  0x27,  0x28,  0x2A,  0x2B };
+	int this_volt_idx;
+	u8 status;
+	int prev_volt_idx;
+
+	dev_dbg(&client->dev, "set_voltage_slew fe_sec_voltage=%d\n", fe_sec_voltage);
+
+	/* Read status register to clear any stale faults. */
+	ret = i2c_master_recv(client, &status, 1);
+	if (ret < 0)
+		goto err;
+
+	/* Determine previous voltage */
+	switch (dev->reg[0] & 0x2F) {
+	case 0x00:
+		prev_volt_idx = 0;
+		break;
+	case 0x20:
+		prev_volt_idx = 1;
+		break;
+	case 0x21:
+		prev_volt_idx = 2;
+		break;
+	case 0x22:
+		prev_volt_idx = 3;
+		break;
+	case 0x24:
+		prev_volt_idx = 4;
+		break;
+	case 0x27:
+		prev_volt_idx = 5;
+		break;
+	case 0x28:
+		prev_volt_idx = 6;
+		break;
+	case 0x2A:
+		prev_volt_idx = 7;
+		break;
+	case 0x2B:
+		prev_volt_idx = 8;
+		break;
+	default:
+		prev_volt_idx = 0;
+	}
+
+	/* Determine new voltage */
+	switch (fe_sec_voltage) {
+	case SEC_VOLTAGE_OFF:
+		new_volt_idx = 0;
+		break;
+	case SEC_VOLTAGE_13:
+		new_volt_idx = 2;
+		break;
+	case SEC_VOLTAGE_18:
+		new_volt_idx = 6;
+		break;
+	default:
+		ret = -EINVAL;
+		goto err;
+	}
+
+	/* Slew to new voltage if new voltage is greater than current voltage */
+	this_volt_idx = prev_volt_idx;
+	if (this_volt_idx < new_volt_idx) {
+		while (this_volt_idx < new_volt_idx) {
+			int delta_mv = idx_to_mv[this_volt_idx+1] - idx_to_mv[this_volt_idx];
+			int min_wait_time = delta_mv * min_nanos_per_mv;
+
+			reg0 = idx_to_reg[this_volt_idx+1];
+			reg0 |= A8293_FLAG_ODT;
+
+			ret = i2c_master_send(client, &reg0, 1);
+			if (ret < 0)
+				goto err;
+			dev->reg[0] = reg0;
+			this_volt_idx++;
+			usleep_range(min_wait_time, min_wait_time * 2);
+		}
+	} else { /* Else just set the voltage */
+		reg0 = idx_to_reg[new_volt_idx];
+		reg0 |= A8293_FLAG_ODT;
+		ret = i2c_master_send(client, &reg0, 1);
+		if (ret < 0)
+			goto err;
+		dev->reg[0] = reg0;
+	}
+
+	/* TMODE=0, TGATE=1 */
+	reg1 = 0x82;
+	if (reg1 != dev->reg[1]) {
+		ret = i2c_master_send(client, &reg1, 1);
+		if (ret < 0)
+			goto err;
+		dev->reg[1] = reg1;
+	}
+
+	usleep_range(1500, 5000);
+
+	return 0;
+err:
+	dev_dbg(&client->dev, "failed=%d\n", ret);
+	return ret;
+}
+
+static int a8293_set_voltage_noslew(struct dvb_frontend *fe,
+				    enum fe_sec_voltage fe_sec_voltage)
 {
 	struct a8293_dev *dev = fe->sec_priv;
 	struct i2c_client *client = dev->client;
 	int ret;
 	u8 reg0, reg1;
 
-	dev_dbg(&client->dev, "fe_sec_voltage=%d\n", fe_sec_voltage);
+	dev_dbg(&client->dev, "set_voltage_noslew fe_sec_voltage=%d\n", fe_sec_voltage);
 
 	switch (fe_sec_voltage) {
 	case SEC_VOLTAGE_OFF:
@@ -62,6 +178,24 @@ static int a8293_set_voltage(struct dvb_frontend *fe,
 	return ret;
 }
 
+static int a8293_set_voltage(struct dvb_frontend *fe,
+			     enum fe_sec_voltage fe_sec_voltage)
+{
+	struct a8293_dev *dev = fe->sec_priv;
+	struct i2c_client *client = dev->client;
+	int volt_slew_nanos_per_mv = dev->volt_slew_nanos_per_mv;
+
+	dev_dbg(&client->dev, "set_voltage volt_slew_nanos_per_mv=%d\n", volt_slew_nanos_per_mv);
+
+	/* Use slew version if slew rate is set to a sane value */
+	if (volt_slew_nanos_per_mv > 0 && volt_slew_nanos_per_mv < 1600)
+		a8293_set_voltage_slew(dev, client, fe_sec_voltage, volt_slew_nanos_per_mv);
+	else
+		a8293_set_voltage_noslew(fe, fe_sec_voltage);
+
+	return 0;
+}
+
 static int a8293_probe(struct i2c_client *client,
 		       const struct i2c_device_id *id)
 {
@@ -78,6 +212,7 @@ static int a8293_probe(struct i2c_client *client,
 	}
 
 	dev->client = client;
+	dev->volt_slew_nanos_per_mv = pdata->volt_slew_nanos_per_mv;
 
 	/* check if the SEC is there */
 	ret = i2c_master_recv(client, buf, 2);

drivers/media/dvb-frontends/a8293.h

@@ -8,6 +8,8 @@
 #ifndef A8293_H
 #define A8293_H
 
+#define A8293_FLAG_ODT			0x10
+
 #include <media/dvb_frontend.h>
 
 /*
@@ -18,9 +20,11 @@
 /**
  * struct a8293_platform_data - Platform data for the a8293 driver
  * @dvb_frontend: DVB frontend.
+ * @volt_slew_nanos_per_mv: Slew rate when increasing LNB voltage, in nanoseconds per millivolt.
  */
 struct a8293_platform_data {
 	struct dvb_frontend *dvb_frontend;
+	int volt_slew_nanos_per_mv;
 };
 
 #endif /* A8293_H */

drivers/media/dvb-frontends/m88ds3103.h

@@ -10,6 +10,11 @@
 
 #include <linux/dvb/frontend.h>
 
+bool blind;
+bool scandone;
+u16 tpcnt;
+u16 tpnum;
+
 /*
  * I2C address
  * 0x68,