| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 25 Oct 2010 19:59:04 +0200
From: Maciej Szmigiero <mhej@...pl>
To: Mauro Carvalho Chehab <mchehab@...radead.org>
Cc: linux-media@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [V4L][SAA7134] fix tda9887 detection on cold and eeprom read corruption
on warm Medion 7134
[V4L][SAA7134] fix tda9887 detection on cold and eeprom read corruption on warm Medion 7134
When Medion 7134 analog+DVB-T card is cold (after powerup) the tda9887 analog demodulator
won't show on i2c bus.
This results in no signal on analog TV. After loading driver for second time
eeprom (required for tuner autodetection) read is corrupted, but tda9987 is detected
properly and analog TV works when tuner model is forced.
Fix tda9887 problem by moving its detect code after tuner setup which unhides it.
The eeprom read issue is fixed by opening i2c gate in DVB-T demodulator.
Tested on Medion 7134 and also tested for reference on Typhoon Cardbus Hybrid
(which also uses saa7134 driver).
Signed-off-by: Maciej Szmigiero <mhej@...pl>
--- a/drivers/media/video/saa7134/saa7134-cards.c 2010-08-02 00:11:14.000000000 +0200
+++ b/drivers/media/video/saa7134/saa7134-cards.c 2010-10-25 19:19:08.000000000 +0200
@@ -7249,12 +7249,37 @@
break;
case SAA7134_BOARD_MD7134:
{
- u8 subaddr;
+ u8 subaddr, dmdregval;
u8 data[3];
int ret, tuner_t;
+ struct i2c_msg i2cgatemsg_r[] = { {.addr = 0x08, .flags = 0,
+ .buf = &subaddr, .len = 1},
+ {.addr = 0x08,
+ .flags = I2C_M_RD,
+ .buf = &dmdregval, .len = 1} };
+ struct i2c_msg i2cgatemsg_w[] = { {.addr = 0x08, .flags = 0,
+ .buf = data, .len = 2} };
struct i2c_msg msg[] = {{.addr=0x50, .flags=0, .buf=&subaddr, .len = 1},
{.addr=0x50, .flags=I2C_M_RD, .buf=data, .len = 3}};
+ /* open i2c gate in DVB-T demod */
+ /* so eeprom read won't be corrupted */
+ subaddr = 0x7;
+ ret = i2c_transfer(&dev->i2c_adap, i2cgatemsg_r, 2);
+ if ((ret == 2) && (dmdregval & 0x2)) {
+ printk(KERN_NOTICE "%s DVB-T demod i2c gate was left"
+ " closed\n", dev->name);
+ printk(KERN_NOTICE "%s previous informational"
+ " EEPROM read might have been"
+ " corrupted\n", dev->name);
+
+ data[0] = 0x7;
+ data[1] = (dmdregval & ~0x2);
+ if (i2c_transfer(&dev->i2c_adap, i2cgatemsg_w, 1) != 1)
+ printk(KERN_ERR "early i2c gate"
+ " open failure\n");
+ }
+
subaddr= 0x14;
tuner_t = 0;
@@ -7522,10 +7547,6 @@
v4l2_i2c_new_subdev(&dev->v4l2_dev,
&dev->i2c_adap, "tuner", "tuner",
dev->radio_addr, NULL);
- if (has_demod)
- v4l2_i2c_new_subdev(&dev->v4l2_dev,
- &dev->i2c_adap, "tuner", "tuner",
- 0, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
if (dev->tuner_addr == ADDR_UNSET) {
enum v4l2_i2c_tuner_type type =
has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
@@ -7542,6 +7563,15 @@
saa7134_tuner_setup(dev);
+ /* some cards (Medion 7134 for example) needs tuner to be setup */
+ /* before tda9887 shows itself on i2c bus */
+ if ((TUNER_ABSENT != dev->tuner_type)
+ && (dev->tda9887_conf & TDA9887_PRESENT)) {
+ v4l2_i2c_new_subdev(&dev->v4l2_dev,
+ &dev->i2c_adap, "tuner", "tuner",
+ 0, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+ }
+
switch (dev->board) {
case SAA7134_BOARD_BEHOLD_COLUMBUS_TVFM:
case SAA7134_BOARD_AVERMEDIA_CARDBUS_501:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists