[media] em28xx: add basic support for eeproms with 16 bit address width

Newer devices (em2874, em2884, em28174, em25xx, em27[6,7,8]x) use eeproms with
16 bit instead of 8 bit address width.
The used eeprom type depends on the chip type, which makes sure eeproms can't
be damaged.
This patch adds basic support for 16 bit eeproms only, which includes
- reading the content
- calculating the eeprom hash
- displaying the content
The eeprom content uses a different format, for which support will be added with
subsequent patches.
Tested with the "Hauppauge HVR-930C" and the "Speedlink VAD Laplace webcam"
(with additional experimental patches).

Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 9332d051bde9bad55e0453fc81ee89762184dc77..f371dbede27ed2b727c1d4ae277e7f2bc12864fb 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -2183,6 +2183,7 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = {
        {0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
        {0x6b800080, EM2874_BOARD_LEADERSHIP_ISDBT, TUNER_ABSENT},
 };
+/* NOTE: introduce a separate hash table for devices with 16 bit eeproms */
 
 /* I2C possible address to saa7115, tvp5150, msp3400, tvaudio */
 static unsigned short saa711x_addrs[] = {
@@ -3019,11 +3020,13 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
                        chip_name = "em2874";
                        dev->reg_gpio_num = EM2874_R80_GPIO;
                        dev->wait_after_write = 0;
+                       dev->eeprom_addrwidth_16bit = 1;
                        break;
                case CHIP_ID_EM28174:
                        chip_name = "em28174";
                        dev->reg_gpio_num = EM2874_R80_GPIO;
                        dev->wait_after_write = 0;
+                       dev->eeprom_addrwidth_16bit = 1;
                        break;
                case CHIP_ID_EM2883:
                        chip_name = "em2882/3";
@@ -3033,6 +3036,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
                        chip_name = "em2884";
                        dev->reg_gpio_num = EM2874_R80_GPIO;
                        dev->wait_after_write = 0;
+                       dev->eeprom_addrwidth_16bit = 1;
                        break;
                default:
                        printk(KERN_INFO DRIVER_NAME

diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c
index 1b90e7536aa57c2f886b1f001d02d2e29b7ad49a..3f0012c9cf25fa9321f2a606c7d0504306df2890 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx-i2c.c
+++ b/drivers/media/usb/em28xx/em28xx-i2c.c
@@ -372,46 +372,34 @@ static inline unsigned long em28xx_hash_mem(char *buf, int length, int bits)
 
 static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
 {
-       unsigned char buf, *p = eedata;
+       unsigned char buf[2], *p = eedata;
        struct em28xx_eeprom *em_eeprom = (void *)eedata;
        int i, err, size = len, block, block_max;
 
-       if (dev->chip_id == CHIP_ID_EM2874 ||
-           dev->chip_id == CHIP_ID_EM28174 ||
-           dev->chip_id == CHIP_ID_EM2884) {
-               /* Empia switched to a 16-bit addressable eeprom in newer
-                  devices.  While we could certainly write a routine to read
-                  the eeprom, there is nothing of use in there that cannot be
-                  accessed through registers, and there is the risk that we
-                  could corrupt the eeprom (since a 16-bit read call is
-                  interpreted as a write call by 8-bit eeproms).
-               */
-               return 0;
-       }
-
        dev->i2c_client.addr = 0xa0 >> 1;
 
        /* Check if board has eeprom */
-       err = i2c_master_recv(&dev->i2c_client, &buf, 0);
+       err = i2c_master_recv(&dev->i2c_client, buf, 0);
        if (err < 0) {
                em28xx_info("board has no eeprom\n");
                memset(eedata, 0, len);
                return -ENODEV;
        }
 
-       buf = 0;
-
-       err = i2c_master_send(&dev->i2c_client, &buf, 1);
-       if (err != 1) {
+       /* Select address memory address 0x00(00) */
+       buf[0] = 0;
+       buf[1] = 0;
+       err = i2c_master_send(&dev->i2c_client, buf, 1 + dev->eeprom_addrwidth_16bit);
+       if (err != 1 + dev->eeprom_addrwidth_16bit) {
                em28xx_errdev("failed to read eeprom (err=%d)\n", err);
                return err;
        }
 
+       /* Read eeprom content */
        if (dev->board.is_em2800)
                block_max = 4;
        else
                block_max = 64;
-
        while (size > 0) {
                if (size > block_max)
                        block = block_max;
@@ -426,17 +414,48 @@ static int em28xx_i2c_eeprom(struct em28xx *dev, unsigned char *eedata, int len)
                size -= block;
                p += block;
        }
+
+       /* Display eeprom content */
        for (i = 0; i < len; i++) {
-               if (0 == (i % 16))
-                       em28xx_info("i2c eeprom %02x:", i);
+               if (0 == (i % 16)) {
+                       if (dev->eeprom_addrwidth_16bit)
+                               em28xx_info("i2c eeprom %04x:", i);
+                       else
+                               em28xx_info("i2c eeprom %02x:", i);
+               }
                printk(" %02x", eedata[i]);
                if (15 == (i % 16))
                        printk("\n");
        }
 
-       if (em_eeprom->id[0] != 0x1a || em_eeprom->id[1] != 0xeb ||
-           em_eeprom->id[2] != 0x67 || em_eeprom->id[3] != 0x95) {
-               em28xx_errdev("Unknown eeprom type or eeprom corrupted !");
+       if (dev->eeprom_addrwidth_16bit &&
+           eedata[0] == 0x26 && eedata[3] == 0x00) {
+               /* new eeprom format; size 4-64kb */
+               dev->hash = em28xx_hash_mem(eedata, len, 32);
+               em28xx_info("EEPROM hash = 0x%08lx\n", dev->hash);
+               em28xx_info("EEPROM info: boot page address = 0x%02x04, "
+                           "boot configuration = 0x%02x\n",
+                           eedata[1], eedata[2]);
+               /* boot configuration (address 0x0002):
+                * [0]   microcode download speed: 1 = 400 kHz; 0 = 100 kHz
+                * [1]   always selects 12 kb RAM
+                * [2]   USB device speed: 1 = force Full Speed; 0 = auto detect
+                * [4]   1 = force fast mode and no suspend for device testing
+                * [5:7] USB PHY tuning registers; determined by device
+                *       characterization
+                */
+
+               /* FIXME:
+                * - read more than 256 bytes / addresses above 0x00ff
+                * - find offset for device config dataset and extract it
+                * - decrypt eeprom data for camera bridges (em25xx, em276x+)
+                * - use separate/different eeprom hashes (not yet used)
+                */
+
+               return 0;
+       } else if (em_eeprom->id[0] != 0x1a || em_eeprom->id[1] != 0xeb ||
+                  em_eeprom->id[2] != 0x67 || em_eeprom->id[3] != 0x95) {
+               em28xx_info("unknown eeprom format or eeprom corrupted !\n");
                return -ENODEV;
        }
 

diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index 90266a1e795765ccfdd7b4c55c8e223f2a106c64..139dfe54a0579400b5effefe4c6da8991129945c 100644 (file)
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -510,6 +510,7 @@ struct em28xx {
        /* i2c i/o */
        struct i2c_adapter i2c_adap;
        struct i2c_client i2c_client;
+       unsigned char eeprom_addrwidth_16bit:1;
        /* video for linux */
        int users;              /* user count for exclusive use */
        int streaming_users;    /* Number of actively streaming users */