diff mbox

[v2,12/12,media] ddbridge: support STV0367-based cards and modules

Message ID 20170324182408.25996-13-d.scheller.oss@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Daniel Scheller March 24, 2017, 6:24 p.m. UTC 
From: Daniel Scheller <d.scheller@gmx.net>

This adds detection and activation for STV0367-based tuner hardware (namely
CineCTv6 bridge cards and older DuoFlex CT addon modules). Utilises the
extended stv0367 demod driver.

TDA18212 i2c_client/regmap-api code was originally implemented by
Antti Palosaari <crope@iki.fi> in a variant to update the ddbridge code
from the vendor dddvb package (formal ack for these parts received).
Original patch at [1].

When boards with STV0367 are cold-started, there might be issues with the
I2C gate, causing the TDA18212 detection/probe to fail. For these demods,
a workaround is implemented to do the tuner probe again which will result
in success if no other issue arises. Other demod/port types won't be
retried.

Signed-off-by: Daniel Scheller <d.scheller@gmx.net>

[1] https://patchwork.linuxtv.org/patch/25146/
---
 drivers/media/pci/ddbridge/Kconfig         |   3 +
 drivers/media/pci/ddbridge/ddbridge-core.c | 138 +++++++++++++++++++++++++++++
 drivers/media/pci/ddbridge/ddbridge.h      |   1 +
 3 files changed, 142 insertions(+)

Comments

Daniel Scheller March 25, 2017, 6:13 p.m. UTC | #1 
Am Fri, 24 Mar 2017 19:24:08 +0100
schrieb Daniel Scheller <d.scheller.oss@gmail.com>:

> When boards with STV0367 are cold-started, there might be issues with
> the I2C gate, causing the TDA18212 detection/probe to fail. For these
> demods, a workaround is implemented to do the tuner probe again which
> will result in success if no other issue arises. Other demod/port
> types won't be retried.

That problem just hit me after cold-starting my server with such a card
installed,  and it turned out the way it's done in this patch doesn't
fully do it - scheduling a V3 series which does this properly
(unfortunately, this requires putting the I2C ping into ddbridge which
I'd rather have avoided). Sorry for the noise.

Daniel
kernel test robot March 26, 2017, 4:46 p.m. UTC | #2 
Hi Daniel,

[auto build test WARNING on linuxtv-media/master]
[also build test WARNING on v4.11-rc3 next-20170324]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Daniel-Scheller/stv0367-ddbridge-support-CTv6-FlexCT-hardware/20170326-235957
base:   git://linuxtv.org/media_tree.git master
config: x86_64-rhel-7.2 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All warnings (new ones prefixed by >>):

   drivers/media/pci/ddbridge/ddbridge-core.c: In function 'dvb_input_detach':
>> drivers/media/pci/ddbridge/ddbridge-core.c:891:3: warning: this 'if' clause does not guard... [-Wmisleading-indentation]
      if (input->fe2)
      ^~
   drivers/media/pci/ddbridge/ddbridge-core.c:893:4: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
       input->fe2 = NULL;
       ^~~~~

vim +/if +891 drivers/media/pci/ddbridge/ddbridge-core.c

ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  875  }
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  876  
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  877  
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  878  static void dvb_input_detach(struct ddb_input *input)
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  879  {
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  880  	struct dvb_adapter *adap = &input->adap;
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  881  	struct dvb_demux *dvbdemux = &input->demux;
9f5af2d9 drivers/media/pci/ddbridge/ddbridge-core.c Daniel Scheller 2017-03-24  882  	struct i2c_client *client;
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  883  
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  884  	switch (input->attached) {
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  885  	case 5:
9f5af2d9 drivers/media/pci/ddbridge/ddbridge-core.c Daniel Scheller 2017-03-24  886  		client = input->i2c_client[0];
9f5af2d9 drivers/media/pci/ddbridge/ddbridge-core.c Daniel Scheller 2017-03-24  887  		if (client) {
9f5af2d9 drivers/media/pci/ddbridge/ddbridge-core.c Daniel Scheller 2017-03-24  888  			module_put(client->dev.driver->owner);
9f5af2d9 drivers/media/pci/ddbridge/ddbridge-core.c Daniel Scheller 2017-03-24  889  			i2c_unregister_device(client);
9f5af2d9 drivers/media/pci/ddbridge/ddbridge-core.c Daniel Scheller 2017-03-24  890  		}
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03 @891  		if (input->fe2)
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  892  			dvb_unregister_frontend(input->fe2);
9f5af2d9 drivers/media/pci/ddbridge/ddbridge-core.c Daniel Scheller 2017-03-24  893  			input->fe2 = NULL;
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  894  		if (input->fe) {
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  895  			dvb_unregister_frontend(input->fe);
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  896  			dvb_frontend_detach(input->fe);
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  897  			input->fe = NULL;
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  898  		}
ccad0457 drivers/media/dvb/ddbridge/ddbridge-core.c Ralph Metzler   2011-07-03  899  	case 4:

:::::: The code at line 891 was first introduced by commit
:::::: ccad04578fcbe2678084af0986ac010ab84a023d [media] ddbridge: Initial check-in

:::::: TO: Ralph Metzler <rmetzler@digitaldevices.de>
:::::: CC: Mauro Carvalho Chehab <mchehab@redhat.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Daniel Scheller March 26, 2017, 10:20 p.m. UTC | #3 
Am Mon, 27 Mar 2017 00:46:45 +0800
schrieb kbuild test robot <lkp@intel.com>:

> [auto build test WARNING on linuxtv-media/master]
> [also build test WARNING on v4.11-rc3 next-20170324]
> [if your patch is applied to the wrong git tree, please drop us a
> note to help improve the system]
> 
> url:
> https://github.com/0day-ci/linux/commits/Daniel-Scheller/stv0367-ddbridge-support-CTv6-FlexCT-hardware/20170326-235957
> base:   git://linuxtv.org/media_tree.git master config:
> x86_64-rhel-7.2 (attached as .config) compiler: gcc-6 (Debian
> 6.2.0-3) 6.2.0 20160901 reproduce:
>         # save the attached .config to linux build tree
>         make ARCH=x86_64 
> 
> All warnings (new ones prefixed by >>):
> 
>    drivers/media/pci/ddbridge/ddbridge-core.c: In function
> 'dvb_input_detach':
> >> drivers/media/pci/ddbridge/ddbridge-core.c:891:3: warning: this
> >> 'if' clause does not guard... [-Wmisleading-indentation]  
>       if (input->fe2)
>       ^~
>    drivers/media/pci/ddbridge/ddbridge-core.c:893:4: note: ...this
> statement, but the latter is misleadingly indented as if it is
> guarded by the 'if' input->fe2 = NULL; ^~~~~

Fixed in what I'll post as V3 series (planned for mid-week).

Daniel
diff mbox

Patch

diff --git a/drivers/media/pci/ddbridge/Kconfig b/drivers/media/pci/ddbridge/Kconfig
index 44e5dc1..16ede23 100644
--- a/drivers/media/pci/ddbridge/Kconfig
+++ b/drivers/media/pci/ddbridge/Kconfig
@@ -6,6 +6,8 @@  config DVB_DDBRIDGE
 	select DVB_STV090x if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_DRXK if MEDIA_SUBDRV_AUTOSELECT
 	select DVB_TDA18271C2DD if MEDIA_SUBDRV_AUTOSELECT
+	select DVB_STV0367 if MEDIA_SUBDRV_AUTOSELECT
+	select MEDIA_TUNER_TDA18212 if MEDIA_SUBDRV_AUTOSELECT
 	---help---
 	  Support for cards with the Digital Devices PCI express bridge:
 	  - Octopus PCIe Bridge
@@ -14,5 +16,6 @@  config DVB_DDBRIDGE
 	  - DuoFlex S2 Octopus
 	  - DuoFlex CT Octopus
 	  - cineS2(v6)
+	  - CineCTv6 and DuoFlex CT (STV0367-based)
 
 	  Say Y if you own such a card and want to use it.
diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c
index 340cff0..085fea0 100644
--- a/drivers/media/pci/ddbridge/ddbridge-core.c
+++ b/drivers/media/pci/ddbridge/ddbridge-core.c
@@ -39,6 +39,9 @@ 
 #include "stv090x.h"
 #include "lnbh24.h"
 #include "drxk.h"
+#include "stv0367.h"
+#include "stv0367_priv.h"
+#include "tda18212.h"
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
@@ -609,6 +612,103 @@  static int tuner_attach_tda18271(struct ddb_input *input)
 /******************************************************************************/
 /******************************************************************************/
 
+static struct stv0367_config ddb_stv0367_config[] = {
+	{
+		.demod_address = 0x1f,
+		.xtal = 27000000,
+		.if_khz = 0,
+		.if_iq_mode = FE_TER_NORMAL_IF_TUNER,
+		.ts_mode = STV0367_SERIAL_PUNCT_CLOCK,
+		.clk_pol = STV0367_CLOCKPOLARITY_DEFAULT,
+	}, {
+		.demod_address = 0x1e,
+		.xtal = 27000000,
+		.if_khz = 0,
+		.if_iq_mode = FE_TER_NORMAL_IF_TUNER,
+		.ts_mode = STV0367_SERIAL_PUNCT_CLOCK,
+		.clk_pol = STV0367_CLOCKPOLARITY_DEFAULT,
+	},
+};
+
+static int demod_attach_stv0367(struct ddb_input *input)
+{
+	struct i2c_adapter *i2c = &input->port->i2c->adap;
+
+	/* attach frontend */
+	input->fe = dvb_attach(stv0367ddb_attach,
+		&ddb_stv0367_config[(input->nr & 1)], i2c);
+
+	if (!input->fe) {
+		printk(KERN_ERR "stv0367ddb_attach failed (not found?)\n");
+		return -ENODEV;
+	}
+
+	input->fe->sec_priv = input;
+	input->gate_ctrl = input->fe->ops.i2c_gate_ctrl;
+	input->fe->ops.i2c_gate_ctrl = drxk_gate_ctrl;
+
+	return 0;
+}
+
+static int tuner_attach_tda18212(struct ddb_input *input, u32 porttype)
+{
+	struct i2c_adapter *adapter = &input->port->i2c->adap;
+	struct i2c_client *client;
+	struct tda18212_config config = {
+		.fe = input->fe,
+		.if_dvbt_6 = 3550,
+		.if_dvbt_7 = 3700,
+		.if_dvbt_8 = 4150,
+		.if_dvbt2_6 = 3250,
+		.if_dvbt2_7 = 4000,
+		.if_dvbt2_8 = 4000,
+		.if_dvbc = 5000,
+	};
+	struct i2c_board_info board_info = {
+		.type = "tda18212",
+		.platform_data = &config,
+	};
+
+	if (input->nr & 1)
+		board_info.addr = 0x63;
+	else
+		board_info.addr = 0x60;
+
+	request_module(board_info.type);
+
+	/* perform tuner init/attach */
+	client = i2c_new_device(adapter, &board_info);
+	/* hack/workaround: STV0367 demods sometimes misbehaves on it's
+	 * I2C gate when cold started, so try again for this hardware
+	 * combination
+	 */
+	if ((client == NULL || client->dev.driver == NULL)
+		&& (porttype == DDB_TUNER_DVBCT_ST)) {
+		printk(KERN_DEBUG "porttype=stv0367, tda18212 fail, cold start retry\n");
+		client = i2c_new_device(adapter, &board_info);
+	}
+
+	/* a possible failed second try indicates problems, so fail */
+	if (client == NULL || client->dev.driver == NULL)
+		goto err;
+
+	if (!try_module_get(client->dev.driver->owner)) {
+		i2c_unregister_device(client);
+		goto err;
+	}
+
+	input->i2c_client[0] = client;
+
+	return 0;
+err:
+	printk(KERN_INFO "TDA18212 tuner not found. Device is not fully operational.\n");
+	return -ENODEV;
+}
+
+/******************************************************************************/
+/******************************************************************************/
+/******************************************************************************/
+
 static struct stv090x_config stv0900 = {
 	.device         = STV0900,
 	.demod_mode     = STV090x_DUAL,
@@ -779,11 +879,18 @@  static void dvb_input_detach(struct ddb_input *input)
 {
 	struct dvb_adapter *adap = &input->adap;
 	struct dvb_demux *dvbdemux = &input->demux;
+	struct i2c_client *client;
 
 	switch (input->attached) {
 	case 5:
+		client = input->i2c_client[0];
+		if (client) {
+			module_put(client->dev.driver->owner);
+			i2c_unregister_device(client);
+		}
 		if (input->fe2)
 			dvb_unregister_frontend(input->fe2);
+			input->fe2 = NULL;
 		if (input->fe) {
 			dvb_unregister_frontend(input->fe);
 			dvb_frontend_detach(input->fe);
@@ -882,7 +989,18 @@  static int dvb_input_attach(struct ddb_input *input)
 			       sizeof(struct dvb_tuner_ops));
 		}
 		break;
+	case DDB_TUNER_DVBCT_ST:
+		if (demod_attach_stv0367(input) < 0)
+			return -ENODEV;
+		if (tuner_attach_tda18212(input, port->type) < 0)
+			return -ENODEV;
+		if (input->fe) {
+			if (dvb_register_frontend(adap, input->fe) < 0)
+				return -ENODEV;
+		}
+		break;
 	}
+
 	input->attached = 5;
 	return 0;
 }
@@ -1162,6 +1280,20 @@  static int port_has_drxks(struct ddb_port *port)
 	return 1;
 }
 
+static int port_has_stv0367(struct ddb_port *port)
+{
+	u8 val;
+	if (i2c_read_reg16(&port->i2c->adap, 0x1e, 0xf000, &val) < 0)
+		return 0;
+	if (val != 0x60)
+		return 0;
+	if (i2c_read_reg16(&port->i2c->adap, 0x1f, 0xf000, &val) < 0)
+		return 0;
+	if (val != 0x60)
+		return 0;
+	return 1;
+}
+
 static void ddb_port_probe(struct ddb_port *port)
 {
 	struct ddb *dev = port->dev;
@@ -1188,7 +1320,13 @@  static void ddb_port_probe(struct ddb_port *port)
 		port->class = DDB_PORT_TUNER;
 		port->type = DDB_TUNER_DVBCT_TR;
 		ddbwritel(I2C_SPEED_400, port->i2c->regs + I2C_TIMING);
+	} else if (port_has_stv0367(port)) {
+		modname = "DUAL DVB-C/T";
+		port->class = DDB_PORT_TUNER;
+		port->type = DDB_TUNER_DVBCT_ST;
+		ddbwritel(I2C_SPEED_100, port->i2c->regs + I2C_TIMING);
 	}
+
 	printk(KERN_INFO "Port %d (TAB %d): %s\n",
 			 port->nr, port->nr+1, modname);
 }
diff --git a/drivers/media/pci/ddbridge/ddbridge.h b/drivers/media/pci/ddbridge/ddbridge.h
index 185b423..0898f60 100644
--- a/drivers/media/pci/ddbridge/ddbridge.h
+++ b/drivers/media/pci/ddbridge/ddbridge.h
@@ -86,6 +86,7 @@  struct ddb_input {
 
 	struct dvb_adapter     adap;
 	struct dvb_device     *dev;
+	struct i2c_client     *i2c_client[1];
 	struct dvb_frontend   *fe;
 	struct dvb_frontend   *fe2;
 	struct dmxdev          dmxdev;