| Message ID | 1389342820-12605-4-git-send-email-m.chehab@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am 10.01.2014 09:33, schrieb Mauro Carvalho Chehab: > If i2c_debug is enabled, we splicitly want to know when a > device fails with timeout. > > If i2c_debug==2, this is already provided, for each I2C transfer > that fails. > > However, most of the time, we don't need to go that far. We just > want to know that I2C transfers fail. > > So, add such errors for normal (ret == 0x10) I2C aborted timeouts. > > Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> > --- > drivers/media/usb/em28xx/em28xx-i2c.c | 27 ++++++++++++++++++++++++--- > 1 file changed, 24 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c > index e8eb83160d36..7e1724076ac4 100644 > --- a/drivers/media/usb/em28xx/em28xx-i2c.c > +++ b/drivers/media/usb/em28xx/em28xx-i2c.c > @@ -80,6 +80,9 @@ static int em2800_i2c_send_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len) > if (ret == 0x80 + len - 1) > return len; > if (ret == 0x94 + len - 1) { > + if (i2c_debug == 1) > + em28xx_warn("R05 returned 0x%02x: I2C timeout", > + ret); > return -ENXIO; > } > if (ret < 0) { > @@ -124,6 +127,9 @@ static int em2800_i2c_recv_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len) > if (ret == 0x84 + len - 1) > break; > if (ret == 0x94 + len - 1) { > + if (i2c_debug == 1) > + em28xx_warn("R05 returned 0x%02x: I2C timeout", > + ret); > return -ENXIO; > } > if (ret < 0) { > @@ -203,6 +209,9 @@ static int em28xx_i2c_send_bytes(struct em28xx *dev, u16 addr, u8 *buf, > if (ret == 0) /* success */ > return len; > if (ret == 0x10) { > + if (i2c_debug == 1) > + em28xx_warn("I2C transfer timeout on writing to addr 0x%02x", > + addr); > return -ENXIO; > } > if (ret < 0) { > @@ -263,8 +272,12 @@ static int em28xx_i2c_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, u16 len) > ret); > return ret; > } > - if (ret == 0x10) > + if (ret == 0x10) { > + if (i2c_debug == 1) > + em28xx_warn("I2C transfer timeout on writing to addr 0x%02x", > + addr); > return -ENXIO; > + } > > em28xx_warn("unknown i2c error (status=%i)\n", ret); > return -ETIMEDOUT; > @@ -322,8 +335,12 @@ static int em25xx_bus_B_send_bytes(struct em28xx *dev, u16 addr, u8 *buf, > */ > if (!ret) > return len; > - else if (ret > 0) > + else if (ret > 0) { > + if (i2c_debug == 1) > + em28xx_warn("Bus B R08 returned 0x%02x: I2C timeout", > + ret); > return -ENXIO; > + } > > return ret; > /* > @@ -373,8 +390,12 @@ static int em25xx_bus_B_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, > */ > if (!ret) > return len; > - else if (ret > 0) > + else if (ret > 0) { > + if (i2c_debug == 1) > + em28xx_warn("Bus B R08 returned 0x%02x: I2C timeout", > + ret); > return -ENXIO; > + } > > return ret; > /* The error description should be "I2C ACK error". You are using (i2c_debug == 1) checks here, which should either be changed to (i2c_debug > 0) in case of 3 debug levels. -- 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
Em Sat, 11 Jan 2014 14:14:38 +0100 Frank Schäfer <fschaefer.oss@googlemail.com> escreveu: > Am 10.01.2014 09:33, schrieb Mauro Carvalho Chehab: > > If i2c_debug is enabled, we splicitly want to know when a > > device fails with timeout. > > > > If i2c_debug==2, this is already provided, for each I2C transfer > > that fails. > > > > However, most of the time, we don't need to go that far. We just > > want to know that I2C transfers fail. > > > > So, add such errors for normal (ret == 0x10) I2C aborted timeouts. > > > > Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> > > --- > > drivers/media/usb/em28xx/em28xx-i2c.c | 27 ++++++++++++++++++++++++--- > > 1 file changed, 24 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c > > index e8eb83160d36..7e1724076ac4 100644 > > --- a/drivers/media/usb/em28xx/em28xx-i2c.c > > +++ b/drivers/media/usb/em28xx/em28xx-i2c.c > > @@ -80,6 +80,9 @@ static int em2800_i2c_send_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len) > > if (ret == 0x80 + len - 1) > > return len; > > if (ret == 0x94 + len - 1) { > > + if (i2c_debug == 1) > > + em28xx_warn("R05 returned 0x%02x: I2C timeout", > > + ret); > > return -ENXIO; > > } > > if (ret < 0) { > > @@ -124,6 +127,9 @@ static int em2800_i2c_recv_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len) > > if (ret == 0x84 + len - 1) > > break; > > if (ret == 0x94 + len - 1) { > > + if (i2c_debug == 1) > > + em28xx_warn("R05 returned 0x%02x: I2C timeout", > > + ret); > > return -ENXIO; > > } > > if (ret < 0) { > > @@ -203,6 +209,9 @@ static int em28xx_i2c_send_bytes(struct em28xx *dev, u16 addr, u8 *buf, > > if (ret == 0) /* success */ > > return len; > > if (ret == 0x10) { > > + if (i2c_debug == 1) > > + em28xx_warn("I2C transfer timeout on writing to addr 0x%02x", > > + addr); > > return -ENXIO; > > } > > if (ret < 0) { > > @@ -263,8 +272,12 @@ static int em28xx_i2c_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, u16 len) > > ret); > > return ret; > > } > > - if (ret == 0x10) > > + if (ret == 0x10) { > > + if (i2c_debug == 1) > > + em28xx_warn("I2C transfer timeout on writing to addr 0x%02x", > > + addr); > > return -ENXIO; > > + } > > > > em28xx_warn("unknown i2c error (status=%i)\n", ret); > > return -ETIMEDOUT; > > @@ -322,8 +335,12 @@ static int em25xx_bus_B_send_bytes(struct em28xx *dev, u16 addr, u8 *buf, > > */ > > if (!ret) > > return len; > > - else if (ret > 0) > > + else if (ret > 0) { > > + if (i2c_debug == 1) > > + em28xx_warn("Bus B R08 returned 0x%02x: I2C timeout", > > + ret); > > return -ENXIO; > > + } > > > > return ret; > > /* > > @@ -373,8 +390,12 @@ static int em25xx_bus_B_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, > > */ > > if (!ret) > > return len; > > - else if (ret > 0) > > + else if (ret > 0) { > > + if (i2c_debug == 1) > > + em28xx_warn("Bus B R08 returned 0x%02x: I2C timeout", > > + ret); > > return -ENXIO; > > + } > > > > return ret; > > /* > > The error description should be "I2C ACK error". Ok. > > You are using (i2c_debug == 1) checks here, which should either be > changed to (i2c_debug > 0) in case of 3 debug levels. Actually, no. If you use i2c_debug = 2, you can't print anything on those routines, as otherwise it will be printed on a line that it would supposed to be a KERNEL_CONT message. > >
On 11.01.2014 21:27, Mauro Carvalho Chehab wrote: > Em Sat, 11 Jan 2014 14:14:38 +0100 > Frank Schäfer <fschaefer.oss@googlemail.com> escreveu: > >> Am 10.01.2014 09:33, schrieb Mauro Carvalho Chehab: >>> If i2c_debug is enabled, we splicitly want to know when a >>> device fails with timeout. >>> >>> If i2c_debug==2, this is already provided, for each I2C transfer >>> that fails. >>> >>> However, most of the time, we don't need to go that far. We just >>> want to know that I2C transfers fail. >>> >>> So, add such errors for normal (ret == 0x10) I2C aborted timeouts. >>> >>> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> >>> --- >>> drivers/media/usb/em28xx/em28xx-i2c.c | 27 ++++++++++++++++++++++++--- >>> 1 file changed, 24 insertions(+), 3 deletions(-) >>> >>> diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c >>> index e8eb83160d36..7e1724076ac4 100644 >>> --- a/drivers/media/usb/em28xx/em28xx-i2c.c >>> +++ b/drivers/media/usb/em28xx/em28xx-i2c.c >>> @@ -80,6 +80,9 @@ static int em2800_i2c_send_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len) >>> if (ret == 0x80 + len - 1) >>> return len; >>> if (ret == 0x94 + len - 1) { >>> + if (i2c_debug == 1) >>> + em28xx_warn("R05 returned 0x%02x: I2C timeout", >>> + ret); >>> return -ENXIO; >>> } >>> if (ret < 0) { >>> @@ -124,6 +127,9 @@ static int em2800_i2c_recv_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len) >>> if (ret == 0x84 + len - 1) >>> break; >>> if (ret == 0x94 + len - 1) { >>> + if (i2c_debug == 1) >>> + em28xx_warn("R05 returned 0x%02x: I2C timeout", >>> + ret); >>> return -ENXIO; >>> } >>> if (ret < 0) { >>> @@ -203,6 +209,9 @@ static int em28xx_i2c_send_bytes(struct em28xx *dev, u16 addr, u8 *buf, >>> if (ret == 0) /* success */ >>> return len; >>> if (ret == 0x10) { >>> + if (i2c_debug == 1) >>> + em28xx_warn("I2C transfer timeout on writing to addr 0x%02x", >>> + addr); >>> return -ENXIO; >>> } >>> if (ret < 0) { >>> @@ -263,8 +272,12 @@ static int em28xx_i2c_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, u16 len) >>> ret); >>> return ret; >>> } >>> - if (ret == 0x10) >>> + if (ret == 0x10) { >>> + if (i2c_debug == 1) >>> + em28xx_warn("I2C transfer timeout on writing to addr 0x%02x", >>> + addr); >>> return -ENXIO; >>> + } >>> >>> em28xx_warn("unknown i2c error (status=%i)\n", ret); >>> return -ETIMEDOUT; >>> @@ -322,8 +335,12 @@ static int em25xx_bus_B_send_bytes(struct em28xx *dev, u16 addr, u8 *buf, >>> */ >>> if (!ret) >>> return len; >>> - else if (ret > 0) >>> + else if (ret > 0) { >>> + if (i2c_debug == 1) >>> + em28xx_warn("Bus B R08 returned 0x%02x: I2C timeout", >>> + ret); >>> return -ENXIO; >>> + } >>> >>> return ret; >>> /* >>> @@ -373,8 +390,12 @@ static int em25xx_bus_B_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, >>> */ >>> if (!ret) >>> return len; >>> - else if (ret > 0) >>> + else if (ret > 0) { >>> + if (i2c_debug == 1) >>> + em28xx_warn("Bus B R08 returned 0x%02x: I2C timeout", >>> + ret); >>> return -ENXIO; >>> + } >>> >>> return ret; >>> /* >> The error description should be "I2C ACK error". > Ok. > >> You are using (i2c_debug == 1) checks here, which should either be >> changed to (i2c_debug > 0) in case of 3 debug levels. > Actually, no. If you use i2c_debug = 2, you can't print anything on those > routines, as otherwise it will be printed on a line that it would supposed > to be a KERNEL_CONT message. Hmm ok, so this is to avoid output format issues. I remember that this is a bit tricky... That's why I was using some ordinary printks without \n linebreaks. -- 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
Em Sun, 12 Jan 2014 16:29:26 +0100 Frank Schäfer <fschaefer.oss@googlemail.com> escreveu: > On 11.01.2014 21:27, Mauro Carvalho Chehab wrote: > > Em Sat, 11 Jan 2014 14:14:38 +0100 > > Frank Schäfer <fschaefer.oss@googlemail.com> escreveu: > > > >> Am 10.01.2014 09:33, schrieb Mauro Carvalho Chehab: > >>> If i2c_debug is enabled, we splicitly want to know when a > >>> device fails with timeout. > >>> > >>> If i2c_debug==2, this is already provided, for each I2C transfer > >>> that fails. > >>> > >>> However, most of the time, we don't need to go that far. We just > >>> want to know that I2C transfers fail. > >>> > >>> So, add such errors for normal (ret == 0x10) I2C aborted timeouts. > >>> > >>> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> > >>> --- > >>> drivers/media/usb/em28xx/em28xx-i2c.c | 27 ++++++++++++++++++++++++--- > >>> 1 file changed, 24 insertions(+), 3 deletions(-) > >>> > >>> diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c > >>> index e8eb83160d36..7e1724076ac4 100644 > >>> --- a/drivers/media/usb/em28xx/em28xx-i2c.c > >>> +++ b/drivers/media/usb/em28xx/em28xx-i2c.c > >>> @@ -80,6 +80,9 @@ static int em2800_i2c_send_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len) > >>> if (ret == 0x80 + len - 1) > >>> return len; > >>> if (ret == 0x94 + len - 1) { > >>> + if (i2c_debug == 1) > >>> + em28xx_warn("R05 returned 0x%02x: I2C timeout", > >>> + ret); > >>> return -ENXIO; > >>> } > >>> if (ret < 0) { > >>> @@ -124,6 +127,9 @@ static int em2800_i2c_recv_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len) > >>> if (ret == 0x84 + len - 1) > >>> break; > >>> if (ret == 0x94 + len - 1) { > >>> + if (i2c_debug == 1) > >>> + em28xx_warn("R05 returned 0x%02x: I2C timeout", > >>> + ret); > >>> return -ENXIO; > >>> } > >>> if (ret < 0) { > >>> @@ -203,6 +209,9 @@ static int em28xx_i2c_send_bytes(struct em28xx *dev, u16 addr, u8 *buf, > >>> if (ret == 0) /* success */ > >>> return len; > >>> if (ret == 0x10) { > >>> + if (i2c_debug == 1) > >>> + em28xx_warn("I2C transfer timeout on writing to addr 0x%02x", > >>> + addr); > >>> return -ENXIO; > >>> } > >>> if (ret < 0) { > >>> @@ -263,8 +272,12 @@ static int em28xx_i2c_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, u16 len) > >>> ret); > >>> return ret; > >>> } > >>> - if (ret == 0x10) > >>> + if (ret == 0x10) { > >>> + if (i2c_debug == 1) > >>> + em28xx_warn("I2C transfer timeout on writing to addr 0x%02x", > >>> + addr); > >>> return -ENXIO; > >>> + } > >>> > >>> em28xx_warn("unknown i2c error (status=%i)\n", ret); > >>> return -ETIMEDOUT; > >>> @@ -322,8 +335,12 @@ static int em25xx_bus_B_send_bytes(struct em28xx *dev, u16 addr, u8 *buf, > >>> */ > >>> if (!ret) > >>> return len; > >>> - else if (ret > 0) > >>> + else if (ret > 0) { > >>> + if (i2c_debug == 1) > >>> + em28xx_warn("Bus B R08 returned 0x%02x: I2C timeout", > >>> + ret); > >>> return -ENXIO; > >>> + } > >>> > >>> return ret; > >>> /* > >>> @@ -373,8 +390,12 @@ static int em25xx_bus_B_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, > >>> */ > >>> if (!ret) > >>> return len; > >>> - else if (ret > 0) > >>> + else if (ret > 0) { > >>> + if (i2c_debug == 1) > >>> + em28xx_warn("Bus B R08 returned 0x%02x: I2C timeout", > >>> + ret); > >>> return -ENXIO; > >>> + } > >>> > >>> return ret; > >>> /* > >> The error description should be "I2C ACK error". > > Ok. > > > >> You are using (i2c_debug == 1) checks here, which should either be > >> changed to (i2c_debug > 0) in case of 3 debug levels. > > Actually, no. If you use i2c_debug = 2, you can't print anything on those > > routines, as otherwise it will be printed on a line that it would supposed > > to be a KERNEL_CONT message. > Hmm ok, so this is to avoid output format issues. > I remember that this is a bit tricky... > That's why I was using some ordinary printks without \n linebreaks. Yep. After reading all your 3 comments, it seems that there's no strong reason why not merging this series. Ok, improvements can be made, and I'm free to discuss them if you want to submit some patches improving the I2C debug code, but there are much more serious issues yet to be fixed, and I want to move on. So, I'll merge this 3 patch series, plus the 4 patch alsa series, and start working on the remaining issues, and to test your 8 RFT/RFC patch series. Regards, Mauro -- 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
diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c index e8eb83160d36..7e1724076ac4 100644 --- a/drivers/media/usb/em28xx/em28xx-i2c.c +++ b/drivers/media/usb/em28xx/em28xx-i2c.c @@ -80,6 +80,9 @@ static int em2800_i2c_send_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len) if (ret == 0x80 + len - 1) return len; if (ret == 0x94 + len - 1) { + if (i2c_debug == 1) + em28xx_warn("R05 returned 0x%02x: I2C timeout", + ret); return -ENXIO; } if (ret < 0) { @@ -124,6 +127,9 @@ static int em2800_i2c_recv_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len) if (ret == 0x84 + len - 1) break; if (ret == 0x94 + len - 1) { + if (i2c_debug == 1) + em28xx_warn("R05 returned 0x%02x: I2C timeout", + ret); return -ENXIO; } if (ret < 0) { @@ -203,6 +209,9 @@ static int em28xx_i2c_send_bytes(struct em28xx *dev, u16 addr, u8 *buf, if (ret == 0) /* success */ return len; if (ret == 0x10) { + if (i2c_debug == 1) + em28xx_warn("I2C transfer timeout on writing to addr 0x%02x", + addr); return -ENXIO; } if (ret < 0) { @@ -263,8 +272,12 @@ static int em28xx_i2c_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, u16 len) ret); return ret; } - if (ret == 0x10) + if (ret == 0x10) { + if (i2c_debug == 1) + em28xx_warn("I2C transfer timeout on writing to addr 0x%02x", + addr); return -ENXIO; + } em28xx_warn("unknown i2c error (status=%i)\n", ret); return -ETIMEDOUT; @@ -322,8 +335,12 @@ static int em25xx_bus_B_send_bytes(struct em28xx *dev, u16 addr, u8 *buf, */ if (!ret) return len; - else if (ret > 0) + else if (ret > 0) { + if (i2c_debug == 1) + em28xx_warn("Bus B R08 returned 0x%02x: I2C timeout", + ret); return -ENXIO; + } return ret; /* @@ -373,8 +390,12 @@ static int em25xx_bus_B_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, */ if (!ret) return len; - else if (ret > 0) + else if (ret > 0) { + if (i2c_debug == 1) + em28xx_warn("Bus B R08 returned 0x%02x: I2C timeout", + ret); return -ENXIO; + } return ret; /*
If i2c_debug is enabled, we splicitly want to know when a device fails with timeout. If i2c_debug==2, this is already provided, for each I2C transfer that fails. However, most of the time, we don't need to go that far. We just want to know that I2C transfers fail. So, add such errors for normal (ret == 0x10) I2C aborted timeouts. Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> --- drivers/media/usb/em28xx/em28xx-i2c.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-)