From patchwork Thu Aug 27 13:25:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 1352630 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bcm0Z711Qz9sSP for ; Fri, 28 Aug 2020 00:52:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726853AbgH0OwM (ORCPT ); Thu, 27 Aug 2020 10:52:12 -0400 Received: from mx2.suse.de ([195.135.220.15]:59070 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727850AbgH0N0W (ORCPT ); Thu, 27 Aug 2020 09:26:22 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id DEAB5ADC2 for ; Thu, 27 Aug 2020 13:25:56 +0000 (UTC) Date: Thu, 27 Aug 2020 15:25:23 +0200 From: Jean Delvare To: Linux I2C Subject: [PATCH 1/2] There are several eeprom drivers Message-ID: <20200827152523.6cc67392@endymion> Organization: SUSE Linux X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-suse-linux-gnu) MIME-Version: 1.0 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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. Signed-off-by: Jean Delvare Reviewed-by: Wolfram Sang --- README | 3 ++- eeprom/Module.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) --- i2c-tools.orig/README 2020-08-27 10:28:54.972629860 +0200 +++ i2c-tools/README 2020-08-27 10:41:42.169866472 +0200 @@ -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 --- i2c-tools.orig/eeprom/Module.mk 2020-08-27 10:28:54.972629860 +0200 +++ i2c-tools/eeprom/Module.mk 2020-08-27 10:56:11.760402361 +0200 @@ -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 +# Copyright (C) 2007-2020 Jean Delvare # # 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 From patchwork Thu Aug 27 13:28:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 1352554 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4Bck942TXJz9sRK for ; Thu, 27 Aug 2020 23:29:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727987AbgH0N3F (ORCPT ); Thu, 27 Aug 2020 09:29:05 -0400 Received: from mx2.suse.de ([195.135.220.15]:60460 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728056AbgH0N2u (ORCPT ); Thu, 27 Aug 2020 09:28:50 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id ADB01ADC2 for ; Thu, 27 Aug 2020 13:29:15 +0000 (UTC) Date: Thu, 27 Aug 2020 15:28:42 +0200 From: Jean Delvare To: Linux I2C Subject: [PATCH 2/2] decode-vaio: Add support for the at24 driver Message-ID: <20200827152842.44105002@endymion> In-Reply-To: <20200827152523.6cc67392@endymion> References: <20200827152523.6cc67392@endymion> Organization: SUSE Linux X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-suse-linux-gnu) MIME-Version: 1.0 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org We have just added support for the VAIO EEPROM to the at24 kernel driver, so let this script handle it. Signed-off-by: Jean Delvare --- eeprom/decode-vaio | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) --- i2c-tools.orig/eeprom/decode-vaio 2020-08-27 10:55:47.615109809 +0200 +++ i2c-tools/eeprom/decode-vaio 2020-08-27 15:23:21.874934933 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# Copyright (C) 2002-2008 Jean Delvare +# Copyright (C) 2002-2020 Jean Delvare # # 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 = ; + 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'); }