From patchwork Wed Dec 2 10:25:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 57545 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp2772191lbb; Wed, 2 Dec 2015 02:25:58 -0800 (PST) X-Received: by 10.98.74.129 with SMTP id c1mr3416617pfj.124.1449051958207; Wed, 02 Dec 2015 02:25:58 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fn8si3827830pab.123.2015.12.02.02.25.57; Wed, 02 Dec 2015 02:25:58 -0800 (PST) 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; 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; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756177AbbLBKZq (ORCPT + 28 others); Wed, 2 Dec 2015 05:25:46 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:37463 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752040AbbLBKZl (ORCPT ); Wed, 2 Dec 2015 05:25:41 -0500 Received: by wmww144 with SMTP id w144so50311339wmw.0 for ; Wed, 02 Dec 2015 02:25:39 -0800 (PST) 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=xDjxP05kaVMd6VvurLaiYsnZ8jYzGtXl3z90bs/vjhE=; b=ee5gCymgVIgXkq1748KeDKsKOwijQHLf4AUaOR2d6sp96AnJzOvuJe6Zz71KDlw8RF toZVZ/EybHj+FOhtnQ7Wp9qbOXEY96RZeUdNM1tt8OpefdyZzp28Os9MfXmZm5eInYHg K5mpK156JbtfoIosorRxmAJAol5HEPpKpXfx0IvGv3gNpiyEU6lf57MYllz65DPW54mN TLD8tjWZuqU7ERcnNljlm4Sr09P2JfSX7MfgMZlcH6lMYlJJpThoRG4W5levucyqVh/2 RPQOJbIQqU/xBGge96Gz0cwUE73Rs1TILV/6P/g3ZbaG77jXxrsJkCWHizIOBb5+YoAS XIcw== 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=xDjxP05kaVMd6VvurLaiYsnZ8jYzGtXl3z90bs/vjhE=; b=EOzyB7H8vLIJps9QJdjaO42oxKBCjJkmnb867xcsuQMW9BcruYjM/iiroyYYZK5DVF YYKJOn9Sa941qpPqWWLJ5YH9pTcQ0Kk23xvhWTUk9BIcsbBuHp3puAP7cXB81WI4aMsW xzsWmuutwDbOqr70YoRb1vQcNNs+dQ1ASWOSLW3zRcyINaccUnBoz09sXmWs/IymDZ38 3JY5r1XAuN46Gt/rJZuuNLN3vFvo4wMz7DADZ5sftggr9SSVqoRC6G4phebaii0/1FI0 b5H7caA80iSOhrjyvKTrgrIUDz/q9Ddr09eHELfzXmE4JrlEg9OYCUNNrfOBxfWe9Ve4 ubXw== X-Gm-Message-State: ALoCoQnTjd0XLfDdQzkfVLD6r8hhO4bVdTavQ1PpogX6b4ymn0vKm7rysDSXisg5MhjzUC7mg7L5 X-Received: by 10.28.129.131 with SMTP id c125mr41368027wmd.21.1449051939541; Wed, 02 Dec 2015 02:25:39 -0800 (PST) Received: from bgdev-debian.home ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id bg10sm2077707wjb.46.2015.12.02.02.25.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Dec 2015 02:25:38 -0800 (PST) From: Bartosz Golaszewski To: Wolfram Sang Cc: linux-i2c , LKML , Bartosz Golaszewski Subject: [RESEND PATCH v2 5/9] eeprom: at24: export the serial number through sysfs Date: Wed, 2 Dec 2015 11:25:22 +0100 Message-Id: <1449051926-21918-6-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1449051926-21918-1-git-send-email-bgolaszewski@baylibre.com> References: <1449051926-21918-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 The at24 driver is now capable of reading the serial number from at24cs EEPROM chips. Export the serial number through sysfs. Signed-off-by: Bartosz Golaszewski --- drivers/misc/eeprom/at24.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 6182f47..65fca1e 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -65,6 +65,7 @@ struct at24_data { */ struct mutex lock; struct bin_attribute bin; + struct bin_attribute *bin_serial; u8 *writebuf; unsigned write_max; @@ -103,6 +104,7 @@ MODULE_PARM_DESC(write_timeout, "Time (in ms) to try writes (default 25)"); #define AT24_BITMASK(x) (BIT(x) - 1) +#define AT24CS_SERIAL_SIZE 16 #define AT24CS_SERIAL_ADDR(addr) (addr + 0x08) /* create non-zero magic value for given eeprom parameters */ @@ -163,10 +165,8 @@ static struct i2c_client *at24_translate_offset(struct at24_data *at24, return at24->client[i]; } -static int __attribute__((unused)) at24cs_eeprom_serial_read( - struct at24_data *at24, - char *buf, unsigned offset, - size_t count) +static int at24cs_eeprom_serial_read(struct at24_data *at24, char *buf, + unsigned offset, size_t count) { unsigned long timeout, read_time; struct i2c_client *client; @@ -234,6 +234,16 @@ static int __attribute__((unused)) at24cs_eeprom_serial_read( return -ETIMEDOUT; } +static ssize_t at24cs_bin_serial_read(struct file *filp, struct kobject *kobj, + struct bin_attribute *attr, + char *buf, loff_t off, size_t count) +{ + struct at24_data *at24; + + at24 = dev_get_drvdata(container_of(kobj, struct device, kobj)); + return at24cs_eeprom_serial_read(at24, buf, off, count); +} + static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf, unsigned offset, size_t count) { @@ -658,6 +668,30 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) at24->bin.read = at24_bin_read; at24->bin.size = chip.byte_len; + if (at24->chip.flags & AT24_FLAG_SERIAL) { + /* + * For EEPROMs containing the serial number export an + * additional file allowing allowing convenvient access + * to it from user-space. + */ + at24->bin_serial = devm_kzalloc(&client->dev, + sizeof(struct bin_attribute), + GFP_KERNEL); + if (!at24->bin_serial) + return -ENOMEM; + + sysfs_bin_attr_init(at24->bin_serial); + at24->bin_serial->attr.name = "serial"; + at24->bin_serial->attr.mode = S_IRUSR; + at24->bin_serial->read = at24cs_bin_serial_read; + at24->bin_serial->size = AT24CS_SERIAL_SIZE; + + err = sysfs_create_bin_file(&client->dev.kobj, + at24->bin_serial); + if (err) + goto err_clients; + } + at24->macc.read = at24_macc_read; writable = !(chip.flags & AT24_FLAG_READONLY); @@ -757,6 +791,8 @@ static int at24_remove(struct i2c_client *client) at24 = i2c_get_clientdata(client); sysfs_remove_bin_file(&client->dev.kobj, &at24->bin); + if (at24->bin_serial) + sysfs_remove_bin_file(&client->dev.kobj, at24->bin_serial); for (i = 1; i < at24->num_addresses; i++) i2c_unregister_device(at24->client[i]);