Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1387561
| Path | csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Jan Glauber <jglauber@cavium.com> |
| Newsgroups | linux.kernel |
| Subject | [PATCH] i2c: octeon: Remove zero-length message support |
| Date | Tue, 26 Apr 2016 16:50:03 +0200 |
| Message-ID | <rsctl-Xx-33@gated-at.bofh.it> (permalink) |
| References | <rsaKS-81H-1@gated-at.bofh.it> |
| X-Original-To | Wolfram Sang <wsa@the-dreams.de> |
| X-Google-Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DCdaNUwNuTxQ8Oy+1gpRoZOVtybk6jzewP3fkquLtUo=; b=Z7TsRw9dSB60yuIWFPNIkuW3QM6BlIGHDY0HhaniJFCiNJCwXgQ9ENVT3ZaGrJ7DhH toyeIGNRuy0eIp8zFD+uWLmH9TY9GPdzT5XCme7g/F0u5/SdDhkjqOO6UuIJ0Qt5/7D/ 6XK8pEJMwwH+Uun3fk1AFK2eH335gEbiisg6M0JcC3bkYtmH/ts8zcdYBuGJrcqjHWDQ VhNZLpwSEuz6c94x/U6wrBLOPbx9QO7q+lTBA4wAEdFjks2iZOMx7LUPZyARQNAu3IIg g1ydHogQwtcNv6K6F7F60W5ktN+UwGb4Ux3Kla9fQyUTANjhlyGmyYFEeeMtZBLKquEq rDlw== |
| X-Gm-Message-State | AOPr4FV2+iIr4mW/QWo9cvtlsIgaJMnvxlZeiueYV6ZyiIPksHQkEFRLsc8ipZz+nqBu2Q== |
| X-Received | by 10.194.92.237 with SMTP id cp13mr3631366wjb.168.1461680829708; Tue, 26 Apr 2016 07:27:09 -0700 (PDT) |
| X-Mailer | git-send-email 1.9.1 |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 50 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, David Daney <ddaney@caviumnetworks.com>, Jan Glauber <jglauber@cavium.com> |
| X-Original-Date | Tue, 26 Apr 2016 16:26:52 +0200 |
| X-Original-Message-ID | <1461680812-10237-1-git-send-email-jglauber@cavium.com> |
| X-Original-References | <20160426125342.GB23679@katana> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1387561 |
Show key headers only | View raw
Zero-length message support (SMBUS QUICK or i2c) never worked with
the Octeon hardware. Disable SMBUS QUICK support and bail out in
case of a zero-length i2c request.
After this change 'i2c-detect -q' will return an error on Octeon but
the previously reported results were wrong anyway.
Signed-off-by: Jan Glauber <jglauber@cavium.com>
---
drivers/i2c/busses/i2c-octeon.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c
index 9f11e19..e8a65f5 100644
--- a/drivers/i2c/busses/i2c-octeon.c
+++ b/drivers/i2c/busses/i2c-octeon.c
@@ -837,9 +837,6 @@ static int octeon_i2c_read(struct octeon_i2c *i2c, int target,
int i, result, length = *rlength;
bool final_read = false;
- if (length < 1)
- return -EINVAL;
-
octeon_i2c_data_write(i2c, (target << 1) | 1);
octeon_i2c_ctl_write(i2c, TWSI_CTL_ENAB);
@@ -925,6 +922,12 @@ static int octeon_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
for (i = 0; ret == 0 && i < num; i++) {
struct i2c_msg *pmsg = &msgs[i];
+ /* zero-length messages are not supported */
+ if (!pmsg->len) {
+ ret = -EOPNOTSUPP;
+ break;
+ }
+
ret = octeon_i2c_start(i2c);
if (ret)
return ret;
@@ -998,7 +1001,7 @@ static struct i2c_bus_recovery_info octeon_i2c_recovery_info = {
static u32 octeon_i2c_functionality(struct i2c_adapter *adap)
{
- return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL |
+ return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK) |
I2C_FUNC_SMBUS_READ_BLOCK_DATA | I2C_SMBUS_BLOCK_PROC_CALL;
}
--
1.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v7 03/15] i2c: octeon: Remove I2C_FUNC_SMBUS_QUICK support Jan Glauber <jglauber@cavium.com> - 2016-04-25 16:40 +0200
Re: [PATCH v7 03/15] i2c: octeon: Remove I2C_FUNC_SMBUS_QUICK support Wolfram Sang <wsa@the-dreams.de> - 2016-04-26 00:20 +0200
Re: [PATCH v7 03/15] i2c: octeon: Remove I2C_FUNC_SMBUS_QUICK support Jan Glauber <jan.glauber@caviumnetworks.com> - 2016-04-26 08:50 +0200
Re: [PATCH v7 03/15] i2c: octeon: Remove I2C_FUNC_SMBUS_QUICK support Wolfram Sang <wsa@the-dreams.de> - 2016-04-26 09:40 +0200
Re: [PATCH v7 03/15] i2c: octeon: Remove I2C_FUNC_SMBUS_QUICK support Jan Glauber <jan.glauber@caviumnetworks.com> - 2016-04-26 14:40 +0200
Re: [PATCH v7 03/15] i2c: octeon: Remove I2C_FUNC_SMBUS_QUICK support Wolfram Sang <wsa@the-dreams.de> - 2016-04-26 15:00 +0200
[PATCH] i2c: octeon: Remove zero-length message support Jan Glauber <jglauber@cavium.com> - 2016-04-26 16:50 +0200
Re: [PATCH] i2c: octeon: Remove zero-length message support Wolfram Sang <wsa@the-dreams.de> - 2016-04-26 23:10 +0200
csiph-web