pool/sensors
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 803015 from Base:System

Browse Source 
Point owners of Nuvoton W83677HG-I and compatible chipsets to the nct6775 driver, as support was just removed from the w83627ehf driver (bsc#1169316)

OBS-URL: https://build.opensuse.org/request/show/803015
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sensors?expand=0&rev=104
This commit is contained in:
Dominique Leuenberger 2020-05-14 21:24:53 +00:00 committed by Git OBS Bridge
commit 54d546df91
3 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lm_sensors-3.6.0-sensors-detect-fix-driver-for-w83677hgi.patch Normal file
View File

@ -0,0 +1,45 @@
From: Jean Delvare <jdelvare@suse.de>
Subject: sensors-detect: Fix the driver for Nuvoton W83677HG-I
Originally, support for the Nuvoton W83677HG-I and derivatives was
first added to the w83627ehf driver, so that's the driver recommended
by sensors-detect. Later, support for the same device was added to
the nct6775 driver. In kernel v5.6, support was removed from the
w83627ehf driver to get rid of the duplicate code.
So sensors-detect should now point users of this device to the
nct6775 driver. We can't do that for very old kernels though, as this
driver did not exist back then. I chose v3.10 for the cut-over, as
this is when support for the Nuvoton W83677HG-I was finalized in the
nct6775 driver, at least according to git log.
Signed-off-by: Jean Delvare <jdelvare@suse.de>
---
Changes since v1:
* Enable run-time driver decision for Super-I/O devices
prog/detect/sensors-detect | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- lm-sensors.orig/prog/detect/sensors-detect 2020-05-07 14:29:34.731733274 +0200
+++ lm-sensors/prog/detect/sensors-detect 2020-05-12 11:08:07.989885399 +0200
@@ -2273,7 +2273,7 @@ use constant FEAT_SMBUS => (1 << 7);
features => FEAT_IN | FEAT_FAN | FEAT_TEMP,
}, {
name => "Nuvoton W83677HG-I (NCT5572D/NCT6771F/NCT6772F/NCT6775F) Super IO Sensors",
- driver => "w83627ehf",
+ driver => sub { kernel_version_at_least(3, 10, 0) ? "nct6775" : "w83627ehf" },
devid => 0xB470,
devid_mask => 0xFFF0,
logdev => 0x0b,
@@ -4574,7 +4574,9 @@ sub scan_cpu
sub chip_special_cases
{
# Some chip to driver mappings depend on the environment
- foreach my $chip (@chip_ids) {
+ foreach my $chip (@chip_ids, @superio_ids_natsemi, @superio_ids_smsc,
+ @superio_ids_smsc_ns, @superio_ids_winbond,
+ @superio_ids_ite) {
if (ref($chip->{driver}) eq 'CODE') {
$chip->{driver} = $chip->{driver}->();
}

8
sensors.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 12 09:12:56 UTC 2020 - Jean Delvare <jdelvare@suse.com>
- lm_sensors-3.6.0-sensors-detect-fix-driver-for-w83677hgi.patch:
Point owners of Nuvoton W83677HG-I and compatible chipsets to
the nct6775 driver, as support was just removed from the
w83627ehf driver (bsc#1169316).
-------------------------------------------------------------------
Tue Dec 3 08:30:17 UTC 2019 - Samu Voutilainen <smar@smar.fi>

5
sensors.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package sensors
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -43,6 +43,8 @@ Patch6: lm_sensors-3.4.0-sensord-service-extra-args.patch
#PATCH-FEATURE-UPSTREAM add ftsteutates support
Patch7: lm_sensors-3.4.0-sensors-detect-add-ftsteutates-support.patch
Patch8: lm_sensors-3.5.0-libsensors-fix-soname.patch
#PATCH-FEATURE-UPSTREAM add ftsteutates support
Patch9: lm_sensors-3.6.0-sensors-detect-fix-driver-for-w83677hgi.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: rrdtool-devel
@ -111,6 +113,7 @@ sense to the user.
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%build
RPM_OPT_FLAGS="%{optflags}"