Skip to contentSkip to conversation

There are several eeprom drivers

PATCH Superseded Jean Delvare 2 participants 5 messages Aug 27, 2020 – Aug 29, 2020 I2C subsystem host drivers

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 There are several eeprom drivers

There used to be only 1 eeprom driver (named "eeprom") but now there are 3 and the legacy "eeprom" driver is not the preferred option. So list all 3 drivers in our documentation to prevent confusion.

---
 README           |    3 ++-
 eeprom/Module.mk |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
README +2 -1
@@ -20,7 +20,8 @@ The various tools included in this packa
 
 * eeprom
   Perl scripts for decoding different types of EEPROMs (SPD, EDID...) These
-  scripts rely on the "eeprom" kernel driver. They are installed by default.
+  scripts rely on the eeprom kernel drivers ("at24" and "ee1004", "eeprom" on
+  older kernels). They are installed by default.
 
 * eeprog, eepromer
   Tools for writing to EEPROMs. These tools rely on the "i2c-dev" kernel
eeprom/Module.mk +2 -2
@@ -1,6 +1,6 @@
-# EEPROM decoding scripts for the Linux eeprom driver
+# EEPROM decoding scripts for the Linux eeprom drivers
 #
-# Copyright (C) 2007-2013  Jean Delvare <[email protected]>
+# Copyright (C) 2007-2020  Jean Delvare <[email protected]>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
Signature · 2 lines
Jean Delvare
SUSE L3 Support
#1 lore raw

PATCH 2/2 decode-vaio: Add support for the at24 driver

We have just added support for the VAIO EEPROM to the at24 kernel driver, so let this script handle it.

---
 eeprom/decode-vaio |   40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)
eeprom/decode-vaio +36 -4
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 #
-# Copyright (C) 2002-2008  Jean Delvare <[email protected]>
+# Copyright (C) 2002-2020  Jean Delvare <[email protected]>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #
 # EEPROM data decoding for Sony Vaio laptops.
 #
-# The eeprom driver must be loaded. For kernels older than 2.6.0, the
+# The at24 or eeprom driver must be loaded. For kernels older than 2.6.0, the
 # eeprom driver can be found in the lm-sensors package.
 #
 # Please note that this is a guess-only work.  Sony support refused to help
@@ -53,11 +53,39 @@
 
 use strict;
 use Fcntl qw(:DEFAULT :seek);
+use File::Basename;
 use vars qw($sysfs $found);
 
-use constant VERSION	=> "1.6";
+use constant VERSION	=> "1.7";
 use constant ONLYROOT	=> "Readable only by root";
 
+# From a sysfs device path and an attribute name, return the attribute
+# value, or undef (stolen from sensors-detect)
+sub sysfs_device_attribute
+{
+	my ($device, $attr) = @_;
+	my $value;
+
+	open(local *FILE, "$device/$attr") or return "";
+	$value = <FILE>;
+	close(FILE);
+	return unless defined $value;
+
+	chomp($value);
+	return $value;
+}
+
+# From a sysfs device path, return the driver name, or undef (stolen from
+# sensors-detect)
+sub sysfs_device_driver
+{
+	my $device = shift;
+
+	my $link = readlink("$device/driver");
+	return unless defined $link;
+	return basename($link);
+}
+
 sub print_item
 {
 	my ($label,$value) = @_;
@@ -209,10 +237,14 @@ END
 	print("\n");
 }
 
-for (my $i = 0, $found=0; $i <= 4 && !$found; $i++)
+for (my $i = 0, $found=0; $i <= 31 && !$found; $i++)
 {
 	if (-r "/sys/bus/i2c/devices/$i-0057/eeprom")
 	{
+		my $driver = sysfs_device_driver("/sys/bus/i2c/devices/$i-0057");
+		my $name = sysfs_device_attribute("/sys/bus/i2c/devices/$i-0057", "name");
+		next if ($driver eq "at24" && $name ne "24c02-vaio");
+
 		$sysfs = 1;
 		$found += vaio_decode($i, '57');
 	}
Signature · 2 lines
Jean Delvare
SUSE L3 Support
#2 lore raw

Re: [PATCH 2/2] decode-vaio: Add support for the at24 driver

eeprom/decode-vaio END · line 240

Quoted 3 lines
eeprom/decode-vaio +1 -1
-for (my $i = 0, $found=0; $i <= 4 && !$found; $i++)
+for (my $i = 0, $found=0; $i <= 31 && !$found; $i++)

Isn't this an unrelated change, scanning more busses? Should be at least mentioned in the commit message, if so.

#3 lore raw

Re: [PATCH 2/2] decode-vaio: Add support for the at24 driver

Quoted 5 lines · Wolfram Sang

eeprom/decode-vaio END · line 240

Quoted 2 lines
eeprom/decode-vaio +1 -1
-for (my $i = 0, $found=0; $i <= 4 && !$found; $i++)
+for (my $i = 0, $found=0; $i <= 31 && !$found; $i++)  

Isn't this an unrelated change, scanning more busses? Should be at least mentioned in the commit message, if so.

You're right, it should be a separate commit. I had to do this to be able to test my changes with i2c-stub instead of using the actual old Sony laptop. Then I forgot the change was there. I'll push that change anyway as it can't hurt and everything that makes testing easier is welcome.

Thanks,

Signature · 2 lines
Jean Delvare
SUSE L3 Support