From patchwork Mon Jun 6 08:48:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 69379 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1376743qgf; Mon, 6 Jun 2016 01:54:07 -0700 (PDT) X-Received: by 10.66.2.168 with SMTP id 8mr23593244pav.152.1465203247325; Mon, 06 Jun 2016 01:54:07 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t123si27228084pfb.239.2016.06.06.01.54.06; Mon, 06 Jun 2016 01:54:07 -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 S1752404AbcFFIyB (ORCPT + 31 others); Mon, 6 Jun 2016 04:54:01 -0400 Received: from mail-wm0-f42.google.com ([74.125.82.42]:33632 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751017AbcFFItO (ORCPT ); Mon, 6 Jun 2016 04:49:14 -0400 Received: by mail-wm0-f42.google.com with SMTP id r5so1223772wmr.0 for ; Mon, 06 Jun 2016 01:49:13 -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=Qt8ZfHpg2JSKur/TV3rgMdCmW09vHS2IQF8XtuwON7iKGbWTEHVUL39wIgr/W8I6Wr 5wV04J/2DbLG6qnOewl41ZHws9MQZ87yAjaYz4b5Ma0Yn0MEdEONG5aZZEst87keqb0I MA9+cvWJ0NJeG2d0YDPbUZcT2HV1uBtHwLRBemPwF6JPRmYMRyJMBG0KzMwmeOZq09JE 0K1+Avmf02LdKV5ktyr+jq7p3mZL+FTUWRvJ0o7Pzg6XROZnP2l3VxXos1cfhC7idldn py1ikT/pEBwPo1u/gZQyt3LloSodJDb3hHpQdeEVSeiYFptNF2OQA3IeBv8D8LLA6sF4 0UFg== 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=j6UP+c3vdT0G9c4qr6pdS10mzJb30RomM4zQ/M91yhPqUfp8fuvaFwuFMV/UNT1svQ PEcNNrt9J4UvZMuTML9GXXXXf7W0ReE5WXQbglynttxHh9rmrQU5S8xSidKBm5eEH2ly Z0GHwN8YKkHBchWO3UepIcaEjS8a80IYN+Eo5CqGDUST19w0fDbMlw8L9yNOc79JGyv4 Re5Ftu2bm6QJN9Wc/Ncdbu8JHUZGOLooqXSPxqg+pI7aez7UmCXEvqjVIJ8ZgSXyBS84 nrwKBi5DcXMVOVPbvgEaVeovDnajdE7ccrRuCm0FWRe2frjbKbwKu4QdHtYELhaa7NRe oJAg== X-Gm-Message-State: ALyK8tLEtAMf/u+swmcpSG2htAdwJVntwK3XqAVLr7xJogR4r/cwUziMTH/9+c4dmuw/kYIV X-Received: by 10.28.169.2 with SMTP id s2mr10798676wme.78.1465202952629; Mon, 06 Jun 2016 01:49:12 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id dd7sm19090384wjb.22.2016.06.06.01.49.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Jun 2016 01:49:12 -0700 (PDT) From: Bartosz Golaszewski To: Wolfram Sang , linux-i2c , LKML , Andrew Lunn , Srinivas Kandagatla , Maxime Ripard , GregKH Cc: Bartosz Golaszewski Subject: [RESEND PATCH 06/14] eeprom: at24: split at24_eeprom_read() into specialized functions Date: Mon, 6 Jun 2016 10:48:48 +0200 Message-Id: <1465202936-16832-7-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1465202936-16832-1-git-send-email-bgolaszewski@baylibre.com> References: <1465202936-16832-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);