| Message ID | 1411621684-8295-2-git-send-email-zzam@gentoo.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from <linux-media-owner@vger.kernel.org>) id 1XX1Hz-0007tA-5p; Thu, 25 Sep 2014 07:08:23 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-7) with esmtp id 1XX1Hx-0005MD-1G; Thu, 25 Sep 2014 07:08:23 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751551AbaIYFIT (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Thu, 25 Sep 2014 01:08:19 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:43832 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750864AbaIYFIT (ORCPT <rfc822;linux-media@vger.kernel.org>); Thu, 25 Sep 2014 01:08:19 -0400 Received: from gauss.fritz.box (aftr-88-217-181-51.dynamic.mnet-online.de [88.217.181.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zzam) by smtp.gentoo.org (Postfix) with ESMTPSA id B0E733401D9; Thu, 25 Sep 2014 05:08:17 +0000 (UTC) From: Matthias Schwarzott <zzam@gentoo.org> To: linux-media@vger.kernel.org, mchehab@osg.samsung.com Cc: Matthias Schwarzott <zzam@gentoo.org> Subject: [PATCH 02/12] cx231xx: use own i2c_client for eeprom access Date: Thu, 25 Sep 2014 07:07:54 +0200 Message-Id: <1411621684-8295-2-git-send-email-zzam@gentoo.org> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1411621684-8295-1-git-send-email-zzam@gentoo.org> References: <1411621684-8295-1-git-send-email-zzam@gentoo.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.9.25.50019 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' |
Commit Message
Matthias Schwarzott
Sept. 25, 2014, 5:07 a.m. UTC
Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
---
drivers/media/usb/cx231xx/cx231xx-cards.c | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
Comments
Reviewed-by: Antti Palosaari <crope@iki.fi> Please add commit description (why and how). Some notes for further development: It sends single messages, so you could (or even should) use i2c_master_send/i2c_master_recv (i2c_transfer is aimed for sending multiple messages using REPEATED START condition). I am not sure though if these eeprom chips uses REPEATED START condition for reads (means it could be broken even now). regards Antti On 09/25/2014 08:07 AM, Matthias Schwarzott wrote: > Signed-off-by: Matthias Schwarzott <zzam@gentoo.org> > --- > drivers/media/usb/cx231xx/cx231xx-cards.c | 24 +++++++++++++----------- > 1 file changed, 13 insertions(+), 11 deletions(-) > > diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c > index 791f00c..092fb85 100644 > --- a/drivers/media/usb/cx231xx/cx231xx-cards.c > +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c > @@ -980,23 +980,20 @@ static void cx231xx_config_tuner(struct cx231xx *dev) > > } > > -static int read_eeprom(struct cx231xx *dev, u8 *eedata, int len) > +static int read_eeprom(struct cx231xx *dev, struct i2c_client *client, > + u8 *eedata, int len) > { > int ret = 0; > - u8 addr = 0xa0 >> 1; > u8 start_offset = 0; > int len_todo = len; > u8 *eedata_cur = eedata; > int i; > - struct i2c_msg msg_write = { .addr = addr, .flags = 0, > + struct i2c_msg msg_write = { .addr = client->addr, .flags = 0, > .buf = &start_offset, .len = 1 }; > - struct i2c_msg msg_read = { .addr = addr, .flags = I2C_M_RD }; > - > - /* mutex_lock(&dev->i2c_lock); */ > - cx231xx_enable_i2c_port_3(dev, false); > + struct i2c_msg msg_read = { .addr = client->addr, .flags = I2C_M_RD }; > > /* start reading at offset 0 */ > - ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_write, 1); > + ret = i2c_transfer(client->adapter, &msg_write, 1); > if (ret < 0) { > cx231xx_err("Can't read eeprom\n"); > return ret; > @@ -1006,7 +1003,7 @@ static int read_eeprom(struct cx231xx *dev, u8 *eedata, int len) > msg_read.len = (len_todo > 64) ? 64 : len_todo; > msg_read.buf = eedata_cur; > > - ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_read, 1); > + ret = i2c_transfer(client->adapter, &msg_read, 1); > if (ret < 0) { > cx231xx_err("Can't read eeprom\n"); > return ret; > @@ -1062,9 +1059,14 @@ void cx231xx_card_setup(struct cx231xx *dev) > { > struct tveeprom tvee; > static u8 eeprom[256]; > + struct i2c_client client; > + > + memset(&client, 0, sizeof(client)); > + client.adapter = &dev->i2c_bus[1].i2c_adap; > + client.addr = 0xa0 >> 1; > > - read_eeprom(dev, eeprom, sizeof(eeprom)); > - tveeprom_hauppauge_analog(&dev->i2c_bus[1].i2c_client, > + read_eeprom(dev, &client, eeprom, sizeof(eeprom)); > + tveeprom_hauppauge_analog(&client, > &tvee, eeprom + 0xc0); > break; > } >
Hi Antti, I think that i2c_transfer sens no repeated start when sending only one message per call. At least the received eeprom content looks correct. Regards Matthias On 25.09.2014 16:58, Antti Palosaari wrote: > Reviewed-by: Antti Palosaari <crope@iki.fi> > > Please add commit description (why and how). > > Some notes for further development: > It sends single messages, so you could (or even should) use > i2c_master_send/i2c_master_recv (i2c_transfer is aimed for sending > multiple messages using REPEATED START condition). > > I am not sure though if these eeprom chips uses REPEATED START condition > for reads (means it could be broken even now). > > regards > Antti > > On 09/25/2014 08:07 AM, Matthias Schwarzott wrote: >> Signed-off-by: Matthias Schwarzott <zzam@gentoo.org> >> --- >> drivers/media/usb/cx231xx/cx231xx-cards.c | 24 +++++++++++++----------- >> 1 file changed, 13 insertions(+), 11 deletions(-) >> >> diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c >> b/drivers/media/usb/cx231xx/cx231xx-cards.c >> index 791f00c..092fb85 100644 >> --- a/drivers/media/usb/cx231xx/cx231xx-cards.c >> +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c >> @@ -980,23 +980,20 @@ static void cx231xx_config_tuner(struct cx231xx >> *dev) >> >> } >> >> -static int read_eeprom(struct cx231xx *dev, u8 *eedata, int len) >> +static int read_eeprom(struct cx231xx *dev, struct i2c_client *client, >> + u8 *eedata, int len) >> { >> int ret = 0; >> - u8 addr = 0xa0 >> 1; >> u8 start_offset = 0; >> int len_todo = len; >> u8 *eedata_cur = eedata; >> int i; >> - struct i2c_msg msg_write = { .addr = addr, .flags = 0, >> + struct i2c_msg msg_write = { .addr = client->addr, .flags = 0, >> .buf = &start_offset, .len = 1 }; >> - struct i2c_msg msg_read = { .addr = addr, .flags = I2C_M_RD }; >> - >> - /* mutex_lock(&dev->i2c_lock); */ >> - cx231xx_enable_i2c_port_3(dev, false); >> + struct i2c_msg msg_read = { .addr = client->addr, .flags = >> I2C_M_RD }; >> >> /* start reading at offset 0 */ >> - ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_write, 1); >> + ret = i2c_transfer(client->adapter, &msg_write, 1); >> if (ret < 0) { >> cx231xx_err("Can't read eeprom\n"); >> return ret; >> @@ -1006,7 +1003,7 @@ static int read_eeprom(struct cx231xx *dev, u8 >> *eedata, int len) >> msg_read.len = (len_todo > 64) ? 64 : len_todo; >> msg_read.buf = eedata_cur; >> >> - ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_read, 1); >> + ret = i2c_transfer(client->adapter, &msg_read, 1); >> if (ret < 0) { >> cx231xx_err("Can't read eeprom\n"); >> return ret; >> @@ -1062,9 +1059,14 @@ void cx231xx_card_setup(struct cx231xx *dev) >> { >> struct tveeprom tvee; >> static u8 eeprom[256]; >> + struct i2c_client client; >> + >> + memset(&client, 0, sizeof(client)); >> + client.adapter = &dev->i2c_bus[1].i2c_adap; >> + client.addr = 0xa0 >> 1; >> >> - read_eeprom(dev, eeprom, sizeof(eeprom)); >> - tveeprom_hauppauge_analog(&dev->i2c_bus[1].i2c_client, >> + read_eeprom(dev, &client, eeprom, sizeof(eeprom)); >> + tveeprom_hauppauge_analog(&client, >> &tvee, eeprom + 0xc0); >> break; >> } >> > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
yes, of course :) If you has only one message, there is nothing to start again. Sending one message using i2c_transfer() means same than using i2c_master_send(), but the later one is just aimed to send single message and it cannot be used to send multiple messages at once. Code is correct, but it triggered my sensors when reading it and I have to check it many times whats going there. regards Antti On 09/26/2014 07:30 AM, Matthias Schwarzott wrote: > Hi Antti, > > I think that i2c_transfer sens no repeated start when sending only one > message per call. > > At least the received eeprom content looks correct. > > Regards > Matthias > > On 25.09.2014 16:58, Antti Palosaari wrote: >> Reviewed-by: Antti Palosaari <crope@iki.fi> >> >> Please add commit description (why and how). >> >> Some notes for further development: >> It sends single messages, so you could (or even should) use >> i2c_master_send/i2c_master_recv (i2c_transfer is aimed for sending >> multiple messages using REPEATED START condition). >> >> I am not sure though if these eeprom chips uses REPEATED START condition >> for reads (means it could be broken even now). >> >> regards >> Antti >> >> On 09/25/2014 08:07 AM, Matthias Schwarzott wrote: >>> Signed-off-by: Matthias Schwarzott <zzam@gentoo.org> >>> --- >>> drivers/media/usb/cx231xx/cx231xx-cards.c | 24 +++++++++++++----------- >>> 1 file changed, 13 insertions(+), 11 deletions(-) >>> >>> diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c >>> b/drivers/media/usb/cx231xx/cx231xx-cards.c >>> index 791f00c..092fb85 100644 >>> --- a/drivers/media/usb/cx231xx/cx231xx-cards.c >>> +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c >>> @@ -980,23 +980,20 @@ static void cx231xx_config_tuner(struct cx231xx >>> *dev) >>> >>> } >>> >>> -static int read_eeprom(struct cx231xx *dev, u8 *eedata, int len) >>> +static int read_eeprom(struct cx231xx *dev, struct i2c_client *client, >>> + u8 *eedata, int len) >>> { >>> int ret = 0; >>> - u8 addr = 0xa0 >> 1; >>> u8 start_offset = 0; >>> int len_todo = len; >>> u8 *eedata_cur = eedata; >>> int i; >>> - struct i2c_msg msg_write = { .addr = addr, .flags = 0, >>> + struct i2c_msg msg_write = { .addr = client->addr, .flags = 0, >>> .buf = &start_offset, .len = 1 }; >>> - struct i2c_msg msg_read = { .addr = addr, .flags = I2C_M_RD }; >>> - >>> - /* mutex_lock(&dev->i2c_lock); */ >>> - cx231xx_enable_i2c_port_3(dev, false); >>> + struct i2c_msg msg_read = { .addr = client->addr, .flags = >>> I2C_M_RD }; >>> >>> /* start reading at offset 0 */ >>> - ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_write, 1); >>> + ret = i2c_transfer(client->adapter, &msg_write, 1); >>> if (ret < 0) { >>> cx231xx_err("Can't read eeprom\n"); >>> return ret; >>> @@ -1006,7 +1003,7 @@ static int read_eeprom(struct cx231xx *dev, u8 >>> *eedata, int len) >>> msg_read.len = (len_todo > 64) ? 64 : len_todo; >>> msg_read.buf = eedata_cur; >>> >>> - ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_read, 1); >>> + ret = i2c_transfer(client->adapter, &msg_read, 1); >>> if (ret < 0) { >>> cx231xx_err("Can't read eeprom\n"); >>> return ret; >>> @@ -1062,9 +1059,14 @@ void cx231xx_card_setup(struct cx231xx *dev) >>> { >>> struct tveeprom tvee; >>> static u8 eeprom[256]; >>> + struct i2c_client client; >>> + >>> + memset(&client, 0, sizeof(client)); >>> + client.adapter = &dev->i2c_bus[1].i2c_adap; >>> + client.addr = 0xa0 >> 1; >>> >>> - read_eeprom(dev, eeprom, sizeof(eeprom)); >>> - tveeprom_hauppauge_analog(&dev->i2c_bus[1].i2c_client, >>> + read_eeprom(dev, &client, eeprom, sizeof(eeprom)); >>> + tveeprom_hauppauge_analog(&client, >>> &tvee, eeprom + 0xc0); >>> break; >>> } >>> >> >
I decided to check how eeprom I2C interface works from datasheet. Chip keeps internally current address value and read operations are done for that. Basically both reads works, as chip keeps count of current read address internally. That datasheet has nice figures from use cases: http://www.atmel.com/Images/doc8700.pdf Figure 9-1. Byte Write Figure 9-2. Page Write Figure 9-3. Current Address Read Figure 9-4. Random Read Figure 9-5. Sequential Read regards Antti On 09/26/2014 03:31 PM, Antti Palosaari wrote: > yes, of course :) If you has only one message, there is nothing to start > again. Sending one message using i2c_transfer() means same than using > i2c_master_send(), but the later one is just aimed to send single > message and it cannot be used to send multiple messages at once. > > Code is correct, but it triggered my sensors when reading it and I have > to check it many times whats going there. > > regards > Antti > > On 09/26/2014 07:30 AM, Matthias Schwarzott wrote: >> Hi Antti, >> >> I think that i2c_transfer sens no repeated start when sending only one >> message per call. >> >> At least the received eeprom content looks correct. >> >> Regards >> Matthias >> >> On 25.09.2014 16:58, Antti Palosaari wrote: >>> Reviewed-by: Antti Palosaari <crope@iki.fi> >>> >>> Please add commit description (why and how). >>> >>> Some notes for further development: >>> It sends single messages, so you could (or even should) use >>> i2c_master_send/i2c_master_recv (i2c_transfer is aimed for sending >>> multiple messages using REPEATED START condition). >>> >>> I am not sure though if these eeprom chips uses REPEATED START condition >>> for reads (means it could be broken even now). >>> >>> regards >>> Antti >>> >>> On 09/25/2014 08:07 AM, Matthias Schwarzott wrote: >>>> Signed-off-by: Matthias Schwarzott <zzam@gentoo.org> >>>> --- >>>> drivers/media/usb/cx231xx/cx231xx-cards.c | 24 >>>> +++++++++++++----------- >>>> 1 file changed, 13 insertions(+), 11 deletions(-) >>>> >>>> diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c >>>> b/drivers/media/usb/cx231xx/cx231xx-cards.c >>>> index 791f00c..092fb85 100644 >>>> --- a/drivers/media/usb/cx231xx/cx231xx-cards.c >>>> +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c >>>> @@ -980,23 +980,20 @@ static void cx231xx_config_tuner(struct cx231xx >>>> *dev) >>>> >>>> } >>>> >>>> -static int read_eeprom(struct cx231xx *dev, u8 *eedata, int len) >>>> +static int read_eeprom(struct cx231xx *dev, struct i2c_client *client, >>>> + u8 *eedata, int len) >>>> { >>>> int ret = 0; >>>> - u8 addr = 0xa0 >> 1; >>>> u8 start_offset = 0; >>>> int len_todo = len; >>>> u8 *eedata_cur = eedata; >>>> int i; >>>> - struct i2c_msg msg_write = { .addr = addr, .flags = 0, >>>> + struct i2c_msg msg_write = { .addr = client->addr, .flags = 0, >>>> .buf = &start_offset, .len = 1 }; >>>> - struct i2c_msg msg_read = { .addr = addr, .flags = I2C_M_RD }; >>>> - >>>> - /* mutex_lock(&dev->i2c_lock); */ >>>> - cx231xx_enable_i2c_port_3(dev, false); >>>> + struct i2c_msg msg_read = { .addr = client->addr, .flags = >>>> I2C_M_RD }; >>>> >>>> /* start reading at offset 0 */ >>>> - ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_write, 1); >>>> + ret = i2c_transfer(client->adapter, &msg_write, 1); >>>> if (ret < 0) { >>>> cx231xx_err("Can't read eeprom\n"); >>>> return ret; >>>> @@ -1006,7 +1003,7 @@ static int read_eeprom(struct cx231xx *dev, u8 >>>> *eedata, int len) >>>> msg_read.len = (len_todo > 64) ? 64 : len_todo; >>>> msg_read.buf = eedata_cur; >>>> >>>> - ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_read, 1); >>>> + ret = i2c_transfer(client->adapter, &msg_read, 1); >>>> if (ret < 0) { >>>> cx231xx_err("Can't read eeprom\n"); >>>> return ret; >>>> @@ -1062,9 +1059,14 @@ void cx231xx_card_setup(struct cx231xx *dev) >>>> { >>>> struct tveeprom tvee; >>>> static u8 eeprom[256]; >>>> + struct i2c_client client; >>>> + >>>> + memset(&client, 0, sizeof(client)); >>>> + client.adapter = &dev->i2c_bus[1].i2c_adap; >>>> + client.addr = 0xa0 >> 1; >>>> >>>> - read_eeprom(dev, eeprom, sizeof(eeprom)); >>>> - tveeprom_hauppauge_analog(&dev->i2c_bus[1].i2c_client, >>>> + read_eeprom(dev, &client, eeprom, sizeof(eeprom)); >>>> + tveeprom_hauppauge_analog(&client, >>>> &tvee, eeprom + 0xc0); >>>> break; >>>> } >>>> >>> >> >
diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c index 791f00c..092fb85 100644 --- a/drivers/media/usb/cx231xx/cx231xx-cards.c +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c @@ -980,23 +980,20 @@ static void cx231xx_config_tuner(struct cx231xx *dev) } -static int read_eeprom(struct cx231xx *dev, u8 *eedata, int len) +static int read_eeprom(struct cx231xx *dev, struct i2c_client *client, + u8 *eedata, int len) { int ret = 0; - u8 addr = 0xa0 >> 1; u8 start_offset = 0; int len_todo = len; u8 *eedata_cur = eedata; int i; - struct i2c_msg msg_write = { .addr = addr, .flags = 0, + struct i2c_msg msg_write = { .addr = client->addr, .flags = 0, .buf = &start_offset, .len = 1 }; - struct i2c_msg msg_read = { .addr = addr, .flags = I2C_M_RD }; - - /* mutex_lock(&dev->i2c_lock); */ - cx231xx_enable_i2c_port_3(dev, false); + struct i2c_msg msg_read = { .addr = client->addr, .flags = I2C_M_RD }; /* start reading at offset 0 */ - ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_write, 1); + ret = i2c_transfer(client->adapter, &msg_write, 1); if (ret < 0) { cx231xx_err("Can't read eeprom\n"); return ret; @@ -1006,7 +1003,7 @@ static int read_eeprom(struct cx231xx *dev, u8 *eedata, int len) msg_read.len = (len_todo > 64) ? 64 : len_todo; msg_read.buf = eedata_cur; - ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_read, 1); + ret = i2c_transfer(client->adapter, &msg_read, 1); if (ret < 0) { cx231xx_err("Can't read eeprom\n"); return ret; @@ -1062,9 +1059,14 @@ void cx231xx_card_setup(struct cx231xx *dev) { struct tveeprom tvee; static u8 eeprom[256]; + struct i2c_client client; + + memset(&client, 0, sizeof(client)); + client.adapter = &dev->i2c_bus[1].i2c_adap; + client.addr = 0xa0 >> 1; - read_eeprom(dev, eeprom, sizeof(eeprom)); - tveeprom_hauppauge_analog(&dev->i2c_bus[1].i2c_client, + read_eeprom(dev, &client, eeprom, sizeof(eeprom)); + tveeprom_hauppauge_analog(&client, &tvee, eeprom + 0xc0); break; }