From patchwork Sun May 29 21:53:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 68798 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp1113229qge; Sun, 29 May 2016 14:54:43 -0700 (PDT) X-Received: by 10.66.248.169 with SMTP id yn9mr20296139pac.13.1464558883120; Sun, 29 May 2016 14:54:43 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o123si31805656pfb.55.2016.05.29.14.54.42; Sun, 29 May 2016 14:54:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932709AbcE2Vya (ORCPT + 30 others); Sun, 29 May 2016 17:54:30 -0400 Received: from mail-wm0-f47.google.com ([74.125.82.47]:35468 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753313AbcE2VyU (ORCPT ); Sun, 29 May 2016 17:54:20 -0400 Received: by mail-wm0-f47.google.com with SMTP id a136so61560986wme.0 for ; Sun, 29 May 2016 14:54:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oEIPI0NtlC9Ci6dMZMNfmJCdezUSOlXBUXLgaFid3Ck=; b=W82nSgC7w7JVyWwlqhTHkHy8RKLhE3StDrEARnT7fT929+PIDdSiUHvSPG9aRf5aVs B90lBT5mwMrqP8sPIS6EBDFwxn2LaYwo9M1KJRr2i2y0Zwha/U4JGIcr+GRA6/c8xjdr AY5VvEe0oAMI2JajqPGc+0BVfIXM4SIU+Z63dzGr4La9x1nvDVVnoVQ+6BNxTnPRBXSe nllW9SGp/Qk1G7qRf4UyV/D356Ws3ssGmqasOSkwFXFEssBixwkxdIAPTYPZvsKUeq4x TzBNxo1w7FKqeazUT5exH7lT6zn93ukf7yE22xDwyIufl99auC3DQoAh++4H98DOFy6N plKg== 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=oEIPI0NtlC9Ci6dMZMNfmJCdezUSOlXBUXLgaFid3Ck=; b=THEN7pqQ5YvPWQ9qunt/ZT++zh+RoEx7n0T0em54PanswtYL2r3oypUnF31zS+OHBI WY0bC3kUsL2j+xITrwxzZwyaO2E7qcAIwEK0EXMUqev3oLPHsRVXF/g165DMp59J79w4 x8XS9gg/L8pwmQ5bJTrCSMn03ln6XU95f+XPuKtbrq1Ebu2RVFFsCHez4OGeXRWHu39s tSCJe3Xp7Nm2ktFvPZBlLDxsY0vTcXYogaxC88iT10b3d+64xk6MOnptLXKxpJjt+RbU AHq6z3wRoSGg0aeHRSLelQH6hSCj5DhYAarZ39P8YZHcLVS+Mh7mk4oT15nxw5WG9E89 Q2Eg== X-Gm-Message-State: ALyK8tIOF1BRvPiF9tmQG5hqPNleFhZ04ypYS8VDtdbzcw5QvhXROlrMk8et1JPEbYh8wtaV X-Received: by 10.28.35.67 with SMTP id j64mr8425144wmj.77.1464558858346; Sun, 29 May 2016 14:54:18 -0700 (PDT) Received: from bgdev-debian.lan (jua06-1-82-242-157-225.fbx.proxad.net. [82.242.157.225]) by smtp.gmail.com with ESMTPSA id a128sm20490367wme.16.2016.05.29.14.54.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 May 2016 14:54:17 -0700 (PDT) From: Bartosz Golaszewski To: Wolfram Sang , linux-i2c , LKML , Andrew Lunn , Srinivas Kandagatla , Maxime Ripard , GregKH Cc: Bartosz Golaszewski Subject: [PATCH 06/14] eeprom: at24: split at24_eeprom_read() into specialized functions Date: Sun, 29 May 2016 23:53:44 +0200 Message-Id: <1464558832-2262-7-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1464558832-2262-1-git-send-email-bgolaszewski@baylibre.com> References: <1464558832-2262-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Split at24_eeprom_read() into two smaller functions - one for the i2c operations and one for the smbus extensions. Assign them in at24_probe() depending on the bus capabilities. Also: in order to avoid duplications move the comments related to offset calculations above the at24_translate_offset() routine. Signed-off-by: Bartosz Golaszewski --- drivers/misc/eeprom/at24.c | 125 +++++++++++++++++++++++++-------------------- 1 file changed, 71 insertions(+), 54 deletions(-) -- 2.7.4 diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 2efb572..e7db137 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -165,6 +165,19 @@ MODULE_DEVICE_TABLE(acpi, at24_acpi_ids); * This routine supports chips which consume multiple I2C addresses. It * computes the addressing information to be used for a given r/w request. * Assumes that sanity checks for offset happened at sysfs-layer. + * + * Slave address and byte offset derive from the offset. Always + * set the byte address; on a multi-master board, another master + * may have changed the chip's "current" address pointer. + * + * REVISIT some multi-address chips don't rollover page reads to + * the next slave address, so we may need to truncate the count. + * Those chips might need another quirk flag. + * + * If the real hardware used four adjacent 24c02 chips and that + * were misconfigured as one 24c08, that would be a similar effect: + * one "eeprom" file not four, but larger reads would fail when + * they crossed certain pages. */ static struct i2c_client *at24_translate_offset(struct at24_data *at24, unsigned int *offset) @@ -182,74 +195,77 @@ static struct i2c_client *at24_translate_offset(struct at24_data *at24, return at24->client[i]; } -static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf, - unsigned int offset, size_t count) +static ssize_t at24_eeprom_read_smbus(struct at24_data *at24, char *buf, + unsigned int offset, size_t count) { - struct i2c_msg msg[2]; - u8 msgbuf[2]; + unsigned long timeout, read_time; struct i2c_client *client; + int status; + + client = at24_translate_offset(at24, &offset); + + if (count > io_limit) + count = io_limit; + + /* Smaller eeproms can work given some SMBus extension calls */ + if (count > I2C_SMBUS_BLOCK_MAX) + count = I2C_SMBUS_BLOCK_MAX; + + loop_until_timeout(timeout, read_time) { + status = i2c_smbus_read_i2c_block_data_or_emulated(client, + offset, + count, buf); + + dev_dbg(&client->dev, "read %zu@%d --> %d (%ld)\n", + count, offset, status, jiffies); + + if (status == count) + return count; + } + + return -ETIMEDOUT; +} + +static ssize_t at24_eeprom_read_i2c(struct at24_data *at24, char *buf, + unsigned int offset, size_t count) +{ unsigned long timeout, read_time; + struct i2c_client *client; + struct i2c_msg msg[2]; int status, i; + u8 msgbuf[2]; memset(msg, 0, sizeof(msg)); - - /* - * REVISIT some multi-address chips don't rollover page reads to - * the next slave address, so we may need to truncate the count. - * Those chips might need another quirk flag. - * - * If the real hardware used four adjacent 24c02 chips and that - * were misconfigured as one 24c08, that would be a similar effect: - * one "eeprom" file not four, but larger reads would fail when - * they crossed certain pages. - */ - - /* - * Slave address and byte offset derive from the offset. Always - * set the byte address; on a multi-master board, another master - * may have changed the chip's "current" address pointer. - */ client = at24_translate_offset(at24, &offset); if (count > io_limit) count = io_limit; - if (at24->use_smbus) { - /* Smaller eeproms can work given some SMBus extension calls */ - if (count > I2C_SMBUS_BLOCK_MAX) - count = I2C_SMBUS_BLOCK_MAX; - } else { - /* - * When we have a better choice than SMBus calls, use a - * combined I2C message. Write address; then read up to - * io_limit data bytes. Note that read page rollover helps us - * here (unlike writes). msgbuf is u8 and will cast to our - * needs. - */ - i = 0; - if (at24->chip.flags & AT24_FLAG_ADDR16) - msgbuf[i++] = offset >> 8; - msgbuf[i++] = offset; + /* + * When we have a better choice than SMBus calls, use a combined I2C + * message. Write address; then read up to io_limit data bytes. Note + * that read page rollover helps us here (unlike writes). msgbuf is + * u8 and will cast to our needs. + */ + i = 0; + if (at24->chip.flags & AT24_FLAG_ADDR16) + msgbuf[i++] = offset >> 8; + msgbuf[i++] = offset; - msg[0].addr = client->addr; - msg[0].buf = msgbuf; - msg[0].len = i; + msg[0].addr = client->addr; + msg[0].buf = msgbuf; + msg[0].len = i; - msg[1].addr = client->addr; - msg[1].flags = I2C_M_RD; - msg[1].buf = buf; - msg[1].len = count; - } + msg[1].addr = client->addr; + msg[1].flags = I2C_M_RD; + msg[1].buf = buf; + msg[1].len = count; loop_until_timeout(timeout, read_time) { - if (at24->use_smbus) { - status = i2c_smbus_read_i2c_block_data_or_emulated(client, offset, - count, buf); - } else { - status = i2c_transfer(client->adapter, msg, 2); - if (status == 2) - status = count; - } + status = i2c_transfer(client->adapter, msg, 2); + if (status == 2) + status = count; + dev_dbg(&client->dev, "read %zu@%d --> %d (%ld)\n", count, offset, status, jiffies); @@ -520,7 +536,8 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) at24->chip = chip; at24->num_addresses = num_addresses; - at24->read_func = at24_eeprom_read; + at24->read_func = at24->use_smbus ? at24_eeprom_read_smbus + : at24_eeprom_read_i2c; at24->write_func = at24_eeprom_write; writable = !(chip.flags & AT24_FLAG_READONLY);