From patchwork Fri Dec 30 15:21:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 89386 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp6489876qgi; Fri, 30 Dec 2016 07:33:16 -0800 (PST) X-Received: by 10.237.47.227 with SMTP id m90mr43097127qtd.120.1483111996496; Fri, 30 Dec 2016 07:33:16 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g65si34781277qtd.241.2016.12.30.07.33.16 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 30 Dec 2016 07:33:16 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:40352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMzBE-0002fA-1w for patch@linaro.org; Fri, 30 Dec 2016 10:33:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cMz0R-0002Ij-Gh for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cMz0Q-0000FC-Ew for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:07 -0500 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:33868) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cMz0Q-0000Eu-8v for qemu-devel@nongnu.org; Fri, 30 Dec 2016 10:22:06 -0500 Received: by mail-pg0-x241.google.com with SMTP id b1so22369346pgc.1 for ; Fri, 30 Dec 2016 07:22:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Z5aNSS6MijoP1wgqhIci1WNrjgzFgwDVxSxpdn8YtFk=; b=lNY58DjduRHdF4IzUCD588mn7c1ZO2Gp82/DeqOlsOnl3gollXp5HNZyP5+Rg1huXJ RPg2xzkSeU+dtQmaT+x5CgVDp1g9ZUwQk+rquGf6cfYsWgfGjpCe0dxUtSt3RcZWFeqW eomSvn9sbgWJ50n50z2BLXjtqpdu0zRuR6se7C2kwXsFkB/baOXJmDXQJfcVb/Ho6aBH /92kFJnZzO4X86G2gRkHhzUaXkS7R6aDTyqRNB732cHoIDAAPbfFf2bOST2HhZinP/Ba +s4jxXi5uXID6nOvGFiuSWN9M21v1+LqUGbRUHLX5Pqvmpldy8zft8yYmQlWu0xWhRBA /Ejw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Z5aNSS6MijoP1wgqhIci1WNrjgzFgwDVxSxpdn8YtFk=; b=YdYeGuu6vKs8DjQO0oJ1o5SN1JjYWEuiV+/UEI9wZmBgEc3+63weOIsdiiG/eWdQtl ZjITjP/Obsbx8IiEL2qXXPiOLZd8ELZnYSknWHNn9KgJKTVNV4uQdD8Hlu3VlDrtMhMF plurVyJ1Yx/V1jfYX+aj2Q73Hw8ak6Lh+6x6ARxXH7auZ3yhY4w1jQPbkTLtBkJ1Baxf +JNljHKK9S4utDPFn0MlCOs1rI06/lVg6eURqP07tw+9DpTG1XIi3ISapB2CPu1KrcWj 6a57ZLejX8+eDWuzzC4H+ZdfdStDn8G05uePoYo4LEBOB0BJ3eglEel/m/OGcvu5ZBd3 Ti2Q== X-Gm-Message-State: AIkVDXKCbSlhpVOn6BZ4uHwbr5vvmRpZ0Rb8WKGWBSilbqHFfprT6tiaf2WqX5q9ecgGCw== X-Received: by 10.98.67.89 with SMTP id q86mr43953035pfa.178.1483111325496; Fri, 30 Dec 2016 07:22:05 -0800 (PST) Received: from serve.minyard.net ([47.184.183.230]) by smtp.gmail.com with ESMTPSA id n17sm113396041pfg.80.2016.12.30.07.21.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Dec 2016 07:22:01 -0800 (PST) Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id 026D2A126; Fri, 30 Dec 2016 09:21:57 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 5FB32300069; Fri, 30 Dec 2016 09:21:52 -0600 (CST) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Fri, 30 Dec 2016 09:21:35 -0600 Message-Id: <1483111310-24808-5-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1483111310-24808-1-git-send-email-minyard@acm.org> References: <1483111310-24808-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH 04/19] i2c:pm_smbus: Fix the semantics of block I2C transfers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Corey Minyard , minyard@acm.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Corey Minyard The I2C block transfer commands was not implemented correctly, it read a length byte and such like it was an smbus transfer. So fix the smbus_read_block() and smbus_write_block() functions so they can properly handle I2C transfers, and normal SMBus transfers (for upcoming changes). Pass in a transfer size and a bool to know whether to use the size byte (like SMBus) or use the length given (like I2C). Signed-off-by: Corey Minyard --- hw/i2c/pm_smbus.c | 10 ++++++++-- hw/i2c/smbus.c | 37 ++++++++++++++++++++++++------------- include/hw/i2c/smbus.h | 17 +++++++++++++++-- 3 files changed, 47 insertions(+), 17 deletions(-) -- 2.7.4 diff --git a/hw/i2c/pm_smbus.c b/hw/i2c/pm_smbus.c index 92c3aebd..679edbc 100644 --- a/hw/i2c/pm_smbus.c +++ b/hw/i2c/pm_smbus.c @@ -115,10 +115,16 @@ static void smb_transaction(PMSMBus *s) break; case PROT_I2C_BLOCK_DATA: if (read) { - ret = smbus_read_block(bus, addr, cmd, s->smb_data); + int xfersize = s->smb_data0; + if (xfersize > sizeof(s->smb_data)) { + xfersize = sizeof(s->smb_data); + } + ret = smbus_read_block(bus, addr, s->smb_data1, s->smb_data, + xfersize, false, true); goto data8; } else { - ret = smbus_write_block(bus, addr, cmd, s->smb_data, s->smb_data0); + ret = smbus_write_block(bus, addr, cmd, s->smb_data, s->smb_data0, + false); goto done; } break; diff --git a/hw/i2c/smbus.c b/hw/i2c/smbus.c index c631a1c..4cb651e 100644 --- a/hw/i2c/smbus.c +++ b/hw/i2c/smbus.c @@ -301,33 +301,42 @@ int smbus_write_word(I2CBus *bus, uint8_t addr, uint8_t command, uint16_t data) return 0; } -int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data) +int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data, + int len, bool recv_len, bool send_cmd) { - int len; + int rlen; int i; - if (i2c_start_transfer(bus, addr, 0)) { - return -1; + if (send_cmd) { + if (i2c_start_transfer(bus, addr, 0)) { + return -1; + } + i2c_send(bus, command); } - i2c_send(bus, command); if (i2c_start_transfer(bus, addr, 1)) { - i2c_end_transfer(bus); + if (send_cmd) { + i2c_end_transfer(bus); + } return -1; } - len = i2c_recv(bus); - if (len > 32) { - len = 0; + if (recv_len) { + rlen = i2c_recv(bus); + } else { + rlen = len; } - for (i = 0; i < len; i++) { + if (rlen > len) { + rlen = 0; + } + for (i = 0; i < rlen; i++) { data[i] = i2c_recv(bus); } i2c_nack(bus); i2c_end_transfer(bus); - return len; + return rlen; } int smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data, - int len) + int len, bool send_len) { int i; @@ -338,7 +347,9 @@ int smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data, return -1; } i2c_send(bus, command); - i2c_send(bus, len); + if (send_len) { + i2c_send(bus, len); + } for (i = 0; i < len; i++) { i2c_send(bus, data[i]); } diff --git a/include/hw/i2c/smbus.h b/include/hw/i2c/smbus.h index 544bbc1..f1b8078 100644 --- a/include/hw/i2c/smbus.h +++ b/include/hw/i2c/smbus.h @@ -73,9 +73,22 @@ int smbus_read_byte(I2CBus *bus, uint8_t addr, uint8_t command); int smbus_write_byte(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t data); int smbus_read_word(I2CBus *bus, uint8_t addr, uint8_t command); int smbus_write_word(I2CBus *bus, uint8_t addr, uint8_t command, uint16_t data); -int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data); + +/* + * Do a block transfer from an I2C device. If recv_len is set, then the + * first received byte is a length field and is used to know how much data + * to receive. Otherwise receive "len" bytes. If send_cmd is set, send + * the command byte first before receiving the data. + */ +int smbus_read_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data, + int len, bool recv_len, bool send_cmd); + +/* + * Do a block transfer to an I2C device. If send_len is set, send the + * "len" value before the data. + */ int smbus_write_block(I2CBus *bus, uint8_t addr, uint8_t command, uint8_t *data, - int len); + int len, bool send_len); void smbus_eeprom_init(I2CBus *smbus, int nb_eeprom, const uint8_t *eeprom_spd, int size);