Em Sun, 05 Jan 2014 21:40:38 +0100
Frank Schäfer <fschaefer.oss@xxxxxxxxxxxxxx> escreveu:
> Am 04.01.2014 11:55, schrieb Mauro Carvalho Chehab:
> > The proper error code for I2C errors are EREMOTEIO. The em28xx driver
> > is using EIO instead.
> >
> > Replace all occurrences of EIO at em28xx-i2c, in order to fix it.
> >
> > Signed-off-by: Mauro Carvalho Chehab <m.chehab@xxxxxxxxxxx>
> > ---
> > drivers/media/usb/em28xx/em28xx-i2c.c | 20 ++++++++++----------
> > 1 file changed, 10 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c
> > index 9fa7ed51e5b1..8b35aa51b9bb 100644
> > --- a/drivers/media/usb/em28xx/em28xx-i2c.c
> > +++ b/drivers/media/usb/em28xx/em28xx-i2c.c
> > @@ -72,7 +72,7 @@ static int em2800_i2c_send_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len)
> > if (ret != 2 + len) {
> > em28xx_warn("failed to trigger write to i2c address 0x%x (error=%i)\n",
> > addr, ret);
> > - return (ret < 0) ? ret : -EIO;
> > + return (ret < 0) ? ret : -EREMOTEIO;
> > }
> > /* wait for completion */
> > while (time_is_after_jiffies(timeout)) {
> > @@ -91,7 +91,7 @@ static int em2800_i2c_send_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len)
> > msleep(5);
> > }
> > em28xx_warn("write to i2c device at 0x%x timed out\n", addr);
> > - return -EIO;
> > + return -EREMOTEIO;
> > }
> >
> > /*
> > @@ -115,7 +115,7 @@ static int em2800_i2c_recv_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len)
> > if (ret != 2) {
> > em28xx_warn("failed to trigger read from i2c address 0x%x (error=%i)\n",
> > addr, ret);
> > - return (ret < 0) ? ret : -EIO;
> > + return (ret < 0) ? ret : -EREMOTEIO;
> > }
> >
> > /* wait for completion */
> > @@ -142,7 +142,7 @@ static int em2800_i2c_recv_bytes(struct em28xx *dev, u8 addr, u8 *buf, u16 len)
> > if (ret != len) {
> > em28xx_warn("reading from i2c device at 0x%x failed: couldn't get the received message from the bridge (error=%i)\n",
> > addr, ret);
> > - return (ret < 0) ? ret : -EIO;
> > + return (ret < 0) ? ret : -EREMOTEIO;
> > }
> > for (i = 0; i < len; i++)
> > buf[i] = buf2[len - 1 - i];
> > @@ -162,7 +162,7 @@ static int em2800_i2c_check_for_device(struct em28xx *dev, u8 addr)
> > ret = em2800_i2c_recv_bytes(dev, addr, &buf, 1);
> > if (ret == 1)
> > return 0;
> > - return (ret < 0) ? ret : -EIO;
> > + return (ret < 0) ? ret : -EREMOTEIO;
> > }
> >
> > /*
> > @@ -191,7 +191,7 @@ static int em28xx_i2c_send_bytes(struct em28xx *dev, u16 addr, u8 *buf,
> > } else {
> > em28xx_warn("%i bytes write to i2c device at 0x%x requested, but %i bytes written\n",
> > len, addr, ret);
> > - return -EIO;
> > + return -EREMOTEIO;
> > }
> > }
> >
> > @@ -219,7 +219,7 @@ static int em28xx_i2c_send_bytes(struct em28xx *dev, u16 addr, u8 *buf,
> > }
> >
> > em28xx_warn("write to i2c device at 0x%x timed out\n", addr);
> > - return -EIO;
> > + return -EREMOTEIO;
> > }
> >
> > /*
> > @@ -268,7 +268,7 @@ static int em28xx_i2c_recv_bytes(struct em28xx *dev, u16 addr, u8 *buf, u16 len)
> > }
> >
> > em28xx_warn("unknown i2c error (status=%i)\n", ret);
> > - return -EIO;
> > + return -EREMOTEIO;
> > }
> >
> > /*
> > @@ -283,7 +283,7 @@ static int em28xx_i2c_check_for_device(struct em28xx *dev, u16 addr)
> > ret = em28xx_i2c_recv_bytes(dev, addr, &buf, 1);
> > if (ret == 1)
> > return 0;
> > - return (ret < 0) ? ret : -EIO;
> > + return (ret < 0) ? ret : -EREMOTEIO;
> > }
> >
> > /*
> > @@ -312,7 +312,7 @@ static int em25xx_bus_B_send_bytes(struct em28xx *dev, u16 addr, u8 *buf,
> > } else {
> > em28xx_warn("%i bytes write to i2c device at 0x%x requested, but %i bytes written\n",
> > len, addr, ret);
> > - return -EIO;
> > + return -EREMOTEIO;
> > }
> > }
> > /* Check success */
> Why the hell -EREMOTEIO ???
> See Documentation/i2c/fault-codes.
> It's not even listed there !
>
> What are you trying to fix here ?
This is not a fixup patch.
The idea of this path is to make em28xx more compliant with the Kernel
error codes.
As em28xx was the first USB media driver, it doesn't follow the best
standards, despite all efforts we've made back in 2005, when the driver
was merged, in order to follow the Kernel rules. We eventually fixed
several things along the time, but we didn't took much care to fix the
I2C error codes so far.
Now that we're taking care of it, we should do it right.
However, you're actually right here.
Before 2011, all I2C drivers under drivers/i2c used to return EREMOTEIO,
and the media drivers were moving to this error code since then.
But it seems that we missed a series of patches that moved I2C away from
EREMOTEIO:
http://www.spinics.net/lists/linux-i2c/msg06395.html
https://www.mail-archive.com/linux-i2c@xxxxxxxxxxxxxxx/msg04819.html
I'll rewrite this patch to return the right error codes, according with
Documentation/i2c/fault-codes.
It seems that the proper return codes are:
- ETIMEDOUT - when reg 05 returns 0x10
- ENXIO - when the device is not temporarily not responding
(e. g. reg 05 returning something not 0x10 or 0x00)
- EBUSY - when reg 05 returns 0x20 on em2874 and upper [1]
- EIO - for generic I/O errors that don't fit into the above.
[1] According with a post that Devin made on IRC sometime ago, bit 5
indicates that the I2C is busy when the master tries to use it, but it
exists only on em2874 (and likely newer chips).
Cheers,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
