From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
To: Wolfram Sang <wsa@the-dreams.de>
Cc: linux-i2c <linux-i2c@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [RESEND PATCH v2 5/9] eeprom: at24: export the serial number through sysfs
Date: Wed, 2 Dec 2015 11:25:22 +0100 [thread overview]
Message-ID: <1449051926-21918-6-git-send-email-bgolaszewski@baylibre.com> (raw)
In-Reply-To: <1449051926-21918-1-git-send-email-bgolaszewski@baylibre.com>
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 <bgolaszewski@baylibre.com>
---
drivers/misc/eeprom/at24.c | 44 ++++++++++++++++++++++++++++++++++++++++----
1 file changed, 40 insertions(+), 4 deletions(-)
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]);
--
2.1.4
next prev parent reply other threads:[~2015-12-02 10:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-02 10:25 [RESEND PATCH v2 0/9] eeprom: at24: at24cs series serial number read Bartosz Golaszewski
2015-12-02 10:25 ` [RESEND PATCH v2 1/9] eeprom: at24: platform_data: use BIT() macro Bartosz Golaszewski
2015-12-02 10:25 ` [RESEND PATCH v2 2/9] eeprom: at24: new flag in platform_data Bartosz Golaszewski
2015-12-02 10:25 ` [RESEND PATCH v2 3/9] eeprom: at24: tie up an additional address for at24cs series Bartosz Golaszewski
2015-12-02 10:25 ` [RESEND PATCH v2 4/9] eeprom: at24: support reading of the serial number Bartosz Golaszewski
2015-12-02 10:25 ` Bartosz Golaszewski [this message]
2015-12-02 10:25 ` [RESEND PATCH v2 6/9] eeprom: at24: improve the device_id table readability Bartosz Golaszewski
2015-12-02 10:25 ` [RESEND PATCH v2 7/9] eeprom: at24: add the at24cs series to the list of supported devices Bartosz Golaszewski
2015-12-02 10:25 ` [RESEND PATCH v2 8/9] eeprom: at24: remove a reduntant if Bartosz Golaszewski
2015-12-02 10:25 ` [RESEND PATCH v2 9/9] eeprom: at24: readability tweaks Bartosz Golaszewski
2015-12-11 12:08 ` [RESEND PATCH v2 0/9] eeprom: at24: at24cs series serial number read Wolfram Sang
2015-12-11 13:55 ` Bartosz Golaszewski
2015-12-21 14:29 ` Bartosz Golaszewski
2016-01-02 20:50 ` Wolfram Sang
2016-01-04 14:01 ` Bartosz Golaszewski
2016-01-05 18:58 ` Wolfram Sang
2016-01-07 16:10 ` Bartosz Golaszewski
2016-01-09 21:09 ` Wolfram Sang
2016-01-11 13:57 ` Bartosz Golaszewski
-- strict thread matches above, loose matches on Subject: below --
2015-11-24 9:44 Bartosz Golaszewski
2015-11-24 9:44 ` [RESEND PATCH v2 5/9] eeprom: at24: export the serial number through sysfs Bartosz Golaszewski
2015-11-17 9:52 [RESEND PATCH v2 0/9] eeprom: at24: at24cs series serial number read Bartosz Golaszewski
2015-11-17 9:52 ` [RESEND PATCH v2 5/9] eeprom: at24: export the serial number through sysfs Bartosz Golaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1449051926-21918-6-git-send-email-bgolaszewski@baylibre.com \
--to=bgolaszewski@baylibre.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).