* [PATCH v2] media: i2c: adv7511: remove open coded version of SMBus block read
@ 2021-01-27 10:33 Wolfram Sang
2021-02-23 12:01 ` Hans Verkuil
0 siblings, 1 reply; 6+ messages in thread
From: Wolfram Sang @ 2021-01-27 10:33 UTC (permalink / raw)
To: linux-media; +Cc: linux-i2c, linux-renesas-soc, Hans Verkuil, Wolfram Sang
The open coded version differs from the one in the core in one way: the
buffer will be always copied back, even when the transfer failed. Be
more robust: use the block read from the I2C core and propagate a
potential errno further to the sanity checks.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
Changes since v1:
* respect 'err' in more code paths
* updated comment
drivers/media/i2c/adv7511-v4l2.c | 58 ++++++++++++++------------------
1 file changed, 26 insertions(+), 32 deletions(-)
diff --git a/drivers/media/i2c/adv7511-v4l2.c b/drivers/media/i2c/adv7511-v4l2.c
index a3161d709015..9183003ae22d 100644
--- a/drivers/media/i2c/adv7511-v4l2.c
+++ b/drivers/media/i2c/adv7511-v4l2.c
@@ -214,36 +214,25 @@ static inline void adv7511_wr_and_or(struct v4l2_subdev *sd, u8 reg, u8 clr_mask
adv7511_wr(sd, reg, (adv7511_rd(sd, reg) & clr_mask) | val_mask);
}
-static int adv_smbus_read_i2c_block_data(struct i2c_client *client,
- u8 command, unsigned length, u8 *values)
-{
- union i2c_smbus_data data;
- int ret;
-
- if (length > I2C_SMBUS_BLOCK_MAX)
- length = I2C_SMBUS_BLOCK_MAX;
- data.block[0] = length;
-
- ret = i2c_smbus_xfer(client->adapter, client->addr, client->flags,
- I2C_SMBUS_READ, command,
- I2C_SMBUS_I2C_BLOCK_DATA, &data);
- memcpy(values, data.block + 1, length);
- return ret;
-}
-
-static void adv7511_edid_rd(struct v4l2_subdev *sd, uint16_t len, uint8_t *buf)
+static int adv7511_edid_rd(struct v4l2_subdev *sd, uint16_t len, uint8_t *buf)
{
struct adv7511_state *state = get_adv7511_state(sd);
int i;
- int err = 0;
v4l2_dbg(1, debug, sd, "%s:\n", __func__);
- for (i = 0; !err && i < len; i += I2C_SMBUS_BLOCK_MAX)
- err = adv_smbus_read_i2c_block_data(state->i2c_edid, i,
+ for (i = 0; i < len; i += I2C_SMBUS_BLOCK_MAX) {
+ s32 ret;
+
+ ret = i2c_smbus_read_i2c_block_data(state->i2c_edid, i,
I2C_SMBUS_BLOCK_MAX, buf + i);
- if (err)
- v4l2_err(sd, "%s: i2c read error\n", __func__);
+ if (ret < 0) {
+ v4l2_err(sd, "%s: i2c read error\n", __func__);
+ return ret;
+ }
+ }
+
+ return 0;
}
static inline int adv7511_cec_read(struct v4l2_subdev *sd, u8 reg)
@@ -1668,22 +1657,27 @@ static bool adv7511_check_edid_status(struct v4l2_subdev *sd)
if (edidRdy & MASK_ADV7511_EDID_RDY) {
int segment = adv7511_rd(sd, 0xc4);
struct adv7511_edid_detect ed;
+ int err;
if (segment >= EDID_MAX_SEGM) {
v4l2_err(sd, "edid segment number too big\n");
return false;
}
v4l2_dbg(1, debug, sd, "%s: got segment %d\n", __func__, segment);
- adv7511_edid_rd(sd, 256, &state->edid.data[segment * 256]);
- adv7511_dbg_dump_edid(2, debug, sd, segment, &state->edid.data[segment * 256]);
- if (segment == 0) {
- state->edid.blocks = state->edid.data[0x7e] + 1;
- v4l2_dbg(1, debug, sd, "%s: %d blocks in total\n", __func__, state->edid.blocks);
+ err = adv7511_edid_rd(sd, 256, &state->edid.data[segment * 256]);
+ if (!err) {
+ adv7511_dbg_dump_edid(2, debug, sd, segment, &state->edid.data[segment * 256]);
+ if (segment == 0) {
+ state->edid.blocks = state->edid.data[0x7e] + 1;
+ v4l2_dbg(1, debug, sd, "%s: %d blocks in total\n",
+ __func__, state->edid.blocks);
+ }
}
- if (!edid_verify_crc(sd, segment) ||
- !edid_verify_header(sd, segment)) {
- /* edid crc error, force reread of edid segment */
- v4l2_err(sd, "%s: edid crc or header error\n", __func__);
+
+ if (err || !edid_verify_crc(sd, segment) || !edid_verify_header(sd, segment)) {
+ /* Couldn't read EDID or EDID is invalid. Force retry! */
+ if (!err)
+ v4l2_err(sd, "%s: edid crc or header error\n", __func__);
state->have_monitor = false;
adv7511_s_power(sd, false);
adv7511_s_power(sd, true);
--
2.28.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2] media: i2c: adv7511: remove open coded version of SMBus block read
2021-01-27 10:33 [PATCH v2] media: i2c: adv7511: remove open coded version of SMBus block read Wolfram Sang
@ 2021-02-23 12:01 ` Hans Verkuil
2021-03-04 10:51 ` Hans Verkuil
0 siblings, 1 reply; 6+ messages in thread
From: Hans Verkuil @ 2021-02-23 12:01 UTC (permalink / raw)
To: Wolfram Sang, linux-media; +Cc: linux-i2c, linux-renesas-soc
Hi Wolfram,
On 27/01/2021 11:33, Wolfram Sang wrote:
> The open coded version differs from the one in the core in one way: the
> buffer will be always copied back, even when the transfer failed. Be
> more robust: use the block read from the I2C core and propagate a
> potential errno further to the sanity checks.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
This looks good.
If you want to merge this, then you can add my:
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
If you want me to take it, then just let me know and I'll queue it up for 5.13.
Regards,
Hans
> ---
>
> Changes since v1:
> * respect 'err' in more code paths
> * updated comment
>
> drivers/media/i2c/adv7511-v4l2.c | 58 ++++++++++++++------------------
> 1 file changed, 26 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/media/i2c/adv7511-v4l2.c b/drivers/media/i2c/adv7511-v4l2.c
> index a3161d709015..9183003ae22d 100644
> --- a/drivers/media/i2c/adv7511-v4l2.c
> +++ b/drivers/media/i2c/adv7511-v4l2.c
> @@ -214,36 +214,25 @@ static inline void adv7511_wr_and_or(struct v4l2_subdev *sd, u8 reg, u8 clr_mask
> adv7511_wr(sd, reg, (adv7511_rd(sd, reg) & clr_mask) | val_mask);
> }
>
> -static int adv_smbus_read_i2c_block_data(struct i2c_client *client,
> - u8 command, unsigned length, u8 *values)
> -{
> - union i2c_smbus_data data;
> - int ret;
> -
> - if (length > I2C_SMBUS_BLOCK_MAX)
> - length = I2C_SMBUS_BLOCK_MAX;
> - data.block[0] = length;
> -
> - ret = i2c_smbus_xfer(client->adapter, client->addr, client->flags,
> - I2C_SMBUS_READ, command,
> - I2C_SMBUS_I2C_BLOCK_DATA, &data);
> - memcpy(values, data.block + 1, length);
> - return ret;
> -}
> -
> -static void adv7511_edid_rd(struct v4l2_subdev *sd, uint16_t len, uint8_t *buf)
> +static int adv7511_edid_rd(struct v4l2_subdev *sd, uint16_t len, uint8_t *buf)
> {
> struct adv7511_state *state = get_adv7511_state(sd);
> int i;
> - int err = 0;
>
> v4l2_dbg(1, debug, sd, "%s:\n", __func__);
>
> - for (i = 0; !err && i < len; i += I2C_SMBUS_BLOCK_MAX)
> - err = adv_smbus_read_i2c_block_data(state->i2c_edid, i,
> + for (i = 0; i < len; i += I2C_SMBUS_BLOCK_MAX) {
> + s32 ret;
> +
> + ret = i2c_smbus_read_i2c_block_data(state->i2c_edid, i,
> I2C_SMBUS_BLOCK_MAX, buf + i);
> - if (err)
> - v4l2_err(sd, "%s: i2c read error\n", __func__);
> + if (ret < 0) {
> + v4l2_err(sd, "%s: i2c read error\n", __func__);
> + return ret;
> + }
> + }
> +
> + return 0;
> }
>
> static inline int adv7511_cec_read(struct v4l2_subdev *sd, u8 reg)
> @@ -1668,22 +1657,27 @@ static bool adv7511_check_edid_status(struct v4l2_subdev *sd)
> if (edidRdy & MASK_ADV7511_EDID_RDY) {
> int segment = adv7511_rd(sd, 0xc4);
> struct adv7511_edid_detect ed;
> + int err;
>
> if (segment >= EDID_MAX_SEGM) {
> v4l2_err(sd, "edid segment number too big\n");
> return false;
> }
> v4l2_dbg(1, debug, sd, "%s: got segment %d\n", __func__, segment);
> - adv7511_edid_rd(sd, 256, &state->edid.data[segment * 256]);
> - adv7511_dbg_dump_edid(2, debug, sd, segment, &state->edid.data[segment * 256]);
> - if (segment == 0) {
> - state->edid.blocks = state->edid.data[0x7e] + 1;
> - v4l2_dbg(1, debug, sd, "%s: %d blocks in total\n", __func__, state->edid.blocks);
> + err = adv7511_edid_rd(sd, 256, &state->edid.data[segment * 256]);
> + if (!err) {
> + adv7511_dbg_dump_edid(2, debug, sd, segment, &state->edid.data[segment * 256]);
> + if (segment == 0) {
> + state->edid.blocks = state->edid.data[0x7e] + 1;
> + v4l2_dbg(1, debug, sd, "%s: %d blocks in total\n",
> + __func__, state->edid.blocks);
> + }
> }
> - if (!edid_verify_crc(sd, segment) ||
> - !edid_verify_header(sd, segment)) {
> - /* edid crc error, force reread of edid segment */
> - v4l2_err(sd, "%s: edid crc or header error\n", __func__);
> +
> + if (err || !edid_verify_crc(sd, segment) || !edid_verify_header(sd, segment)) {
> + /* Couldn't read EDID or EDID is invalid. Force retry! */
> + if (!err)
> + v4l2_err(sd, "%s: edid crc or header error\n", __func__);
> state->have_monitor = false;
> adv7511_s_power(sd, false);
> adv7511_s_power(sd, true);
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] media: i2c: adv7511: remove open coded version of SMBus block read
2021-02-23 12:01 ` Hans Verkuil
@ 2021-03-04 10:51 ` Hans Verkuil
2021-03-18 10:43 ` Wolfram Sang
0 siblings, 1 reply; 6+ messages in thread
From: Hans Verkuil @ 2021-03-04 10:51 UTC (permalink / raw)
To: Wolfram Sang, linux-media; +Cc: linux-i2c, linux-renesas-soc
Hi Wolfram,
On 23/02/2021 13:01, Hans Verkuil wrote:
> Hi Wolfram,
>
> On 27/01/2021 11:33, Wolfram Sang wrote:
>> The open coded version differs from the one in the core in one way: the
>> buffer will be always copied back, even when the transfer failed. Be
>> more robust: use the block read from the I2C core and propagate a
>> potential errno further to the sanity checks.
>>
>> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
>
> This looks good.
>
> If you want to merge this, then you can add my:
>
> Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
>
> If you want me to take it, then just let me know and I'll queue it up for 5.13.
I didn't hear back from you, so I'll pick it up for 5.13.
Regards,
Hans
>
> Regards,
>
> Hans
>
>> ---
>>
>> Changes since v1:
>> * respect 'err' in more code paths
>> * updated comment
>>
>> drivers/media/i2c/adv7511-v4l2.c | 58 ++++++++++++++------------------
>> 1 file changed, 26 insertions(+), 32 deletions(-)
>>
>> diff --git a/drivers/media/i2c/adv7511-v4l2.c b/drivers/media/i2c/adv7511-v4l2.c
>> index a3161d709015..9183003ae22d 100644
>> --- a/drivers/media/i2c/adv7511-v4l2.c
>> +++ b/drivers/media/i2c/adv7511-v4l2.c
>> @@ -214,36 +214,25 @@ static inline void adv7511_wr_and_or(struct v4l2_subdev *sd, u8 reg, u8 clr_mask
>> adv7511_wr(sd, reg, (adv7511_rd(sd, reg) & clr_mask) | val_mask);
>> }
>>
>> -static int adv_smbus_read_i2c_block_data(struct i2c_client *client,
>> - u8 command, unsigned length, u8 *values)
>> -{
>> - union i2c_smbus_data data;
>> - int ret;
>> -
>> - if (length > I2C_SMBUS_BLOCK_MAX)
>> - length = I2C_SMBUS_BLOCK_MAX;
>> - data.block[0] = length;
>> -
>> - ret = i2c_smbus_xfer(client->adapter, client->addr, client->flags,
>> - I2C_SMBUS_READ, command,
>> - I2C_SMBUS_I2C_BLOCK_DATA, &data);
>> - memcpy(values, data.block + 1, length);
>> - return ret;
>> -}
>> -
>> -static void adv7511_edid_rd(struct v4l2_subdev *sd, uint16_t len, uint8_t *buf)
>> +static int adv7511_edid_rd(struct v4l2_subdev *sd, uint16_t len, uint8_t *buf)
>> {
>> struct adv7511_state *state = get_adv7511_state(sd);
>> int i;
>> - int err = 0;
>>
>> v4l2_dbg(1, debug, sd, "%s:\n", __func__);
>>
>> - for (i = 0; !err && i < len; i += I2C_SMBUS_BLOCK_MAX)
>> - err = adv_smbus_read_i2c_block_data(state->i2c_edid, i,
>> + for (i = 0; i < len; i += I2C_SMBUS_BLOCK_MAX) {
>> + s32 ret;
>> +
>> + ret = i2c_smbus_read_i2c_block_data(state->i2c_edid, i,
>> I2C_SMBUS_BLOCK_MAX, buf + i);
>> - if (err)
>> - v4l2_err(sd, "%s: i2c read error\n", __func__);
>> + if (ret < 0) {
>> + v4l2_err(sd, "%s: i2c read error\n", __func__);
>> + return ret;
>> + }
>> + }
>> +
>> + return 0;
>> }
>>
>> static inline int adv7511_cec_read(struct v4l2_subdev *sd, u8 reg)
>> @@ -1668,22 +1657,27 @@ static bool adv7511_check_edid_status(struct v4l2_subdev *sd)
>> if (edidRdy & MASK_ADV7511_EDID_RDY) {
>> int segment = adv7511_rd(sd, 0xc4);
>> struct adv7511_edid_detect ed;
>> + int err;
>>
>> if (segment >= EDID_MAX_SEGM) {
>> v4l2_err(sd, "edid segment number too big\n");
>> return false;
>> }
>> v4l2_dbg(1, debug, sd, "%s: got segment %d\n", __func__, segment);
>> - adv7511_edid_rd(sd, 256, &state->edid.data[segment * 256]);
>> - adv7511_dbg_dump_edid(2, debug, sd, segment, &state->edid.data[segment * 256]);
>> - if (segment == 0) {
>> - state->edid.blocks = state->edid.data[0x7e] + 1;
>> - v4l2_dbg(1, debug, sd, "%s: %d blocks in total\n", __func__, state->edid.blocks);
>> + err = adv7511_edid_rd(sd, 256, &state->edid.data[segment * 256]);
>> + if (!err) {
>> + adv7511_dbg_dump_edid(2, debug, sd, segment, &state->edid.data[segment * 256]);
>> + if (segment == 0) {
>> + state->edid.blocks = state->edid.data[0x7e] + 1;
>> + v4l2_dbg(1, debug, sd, "%s: %d blocks in total\n",
>> + __func__, state->edid.blocks);
>> + }
>> }
>> - if (!edid_verify_crc(sd, segment) ||
>> - !edid_verify_header(sd, segment)) {
>> - /* edid crc error, force reread of edid segment */
>> - v4l2_err(sd, "%s: edid crc or header error\n", __func__);
>> +
>> + if (err || !edid_verify_crc(sd, segment) || !edid_verify_header(sd, segment)) {
>> + /* Couldn't read EDID or EDID is invalid. Force retry! */
>> + if (!err)
>> + v4l2_err(sd, "%s: edid crc or header error\n", __func__);
>> state->have_monitor = false;
>> adv7511_s_power(sd, false);
>> adv7511_s_power(sd, true);
>>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v2] media: i2c: adv7511: remove open coded version of SMBus block read
2021-03-04 10:51 ` Hans Verkuil
@ 2021-03-18 10:43 ` Wolfram Sang
2021-03-18 11:06 ` Hans Verkuil
0 siblings, 1 reply; 6+ messages in thread
From: Wolfram Sang @ 2021-03-18 10:43 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, linux-i2c, linux-renesas-soc
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
> I didn't hear back from you, so I'll pick it up for 5.13.
Thank you, Hans!
Can you pick up this one as well?
[PATCH 1/3] media: i2c: adv7842: remove open coded version of SMBus block write
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] media: i2c: adv7511: remove open coded version of SMBus block read
2021-03-18 10:43 ` Wolfram Sang
@ 2021-03-18 11:06 ` Hans Verkuil
2021-03-18 11:08 ` Wolfram Sang
0 siblings, 1 reply; 6+ messages in thread
From: Hans Verkuil @ 2021-03-18 11:06 UTC (permalink / raw)
To: Wolfram Sang; +Cc: linux-media, linux-i2c, linux-renesas-soc
On 18/03/2021 11:43, Wolfram Sang wrote:
>
>> I didn't hear back from you, so I'll pick it up for 5.13.
>
> Thank you, Hans!
>
> Can you pick up this one as well?
>
> [PATCH 1/3] media: i2c: adv7842: remove open coded version of SMBus block write
>
Ah, I thought you had picked that one up. Miscommunication.
I've delegated it to myself in our patchwork system, so it should appear in a PR
for 5.13 next week or so.
Regards,
Hans
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-18 11:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-27 10:33 [PATCH v2] media: i2c: adv7511: remove open coded version of SMBus block read Wolfram Sang
2021-02-23 12:01 ` Hans Verkuil
2021-03-04 10:51 ` Hans Verkuil
2021-03-18 10:43 ` Wolfram Sang
2021-03-18 11:06 ` Hans Verkuil
2021-03-18 11:08 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).