From 03187ba4f14e1859755cced66a406408b29fb183 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= Date: Thu, 15 Aug 2019 11:30:37 +0200 Subject: [PATCH] Add detection support for AMD family 17h model 70h, Nuvoton NCT6797D Resolves: rhbz#1740735 --- ...or-Nuvoton-NCT6797D-Super-IO-Sensors.patch | 30 ++++++++++++++++ ...dd-detection-of-AMD-family-17h-model.patch | 34 +++++++++++++++++++ lm_sensors.spec | 13 ++++++- 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 0001-Add-support-for-Nuvoton-NCT6797D-Super-IO-Sensors.patch create mode 100644 0001-sensors-detect-Add-detection-of-AMD-family-17h-model.patch diff --git a/0001-Add-support-for-Nuvoton-NCT6797D-Super-IO-Sensors.patch b/0001-Add-support-for-Nuvoton-NCT6797D-Super-IO-Sensors.patch new file mode 100644 index 0000000..e2b1548 --- /dev/null +++ b/0001-Add-support-for-Nuvoton-NCT6797D-Super-IO-Sensors.patch @@ -0,0 +1,30 @@ +From ed560047401c73571a65707ea2eec5c33ac77d4a Mon Sep 17 00:00:00 2001 +From: Luca Stefani +Date: Thu, 25 Jul 2019 23:49:39 +0200 +Subject: [PATCH] Add support for Nuvoton NCT6797D Super IO Sensors + +--- + prog/detect/sensors-detect | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect +index bb62068e..cb0a401d 100755 +--- a/prog/detect/sensors-detect ++++ b/prog/detect/sensors-detect +@@ -2336,6 +2336,13 @@ use constant FEAT_SMBUS => (1 << 7); + devid_mask => 0xFFF0, + logdev => 0x0b, + features => FEAT_IN | FEAT_FAN | FEAT_TEMP, ++ }, { ++ name => "Nuvoton NCT6797D Super IO Sensors", ++ driver => "nct6775", ++ devid => 0xD450, ++ devid_mask => 0xFFF0, ++ logdev => 0x0b, ++ features => FEAT_IN | FEAT_FAN | FEAT_TEMP, + }, { + name => "Nuvoton NCT6102D/NCT6104D/NCT6106D Super IO Sensors", + driver => "nct6775", +-- +2.20.1 + diff --git a/0001-sensors-detect-Add-detection-of-AMD-family-17h-model.patch b/0001-sensors-detect-Add-detection-of-AMD-family-17h-model.patch new file mode 100644 index 0000000..e617fc4 --- /dev/null +++ b/0001-sensors-detect-Add-detection-of-AMD-family-17h-model.patch @@ -0,0 +1,34 @@ +From 00e7d37b35f6264fc3c121db47fbcc1e90010d89 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= +Date: Tue, 23 Jul 2019 11:51:02 +0200 +Subject: [PATCH] sensors-detect: Add detection of AMD family 17h, model 70h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +k10temp support was added in groeck/hwmon-next commit +22cac1016a4831922d2. + +Fixes #187 + +Signed-off-by: Ondřej Lysoněk +--- + prog/detect/sensors-detect | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect +index bb2e93d3..bb62068e 100755 +--- a/prog/detect/sensors-detect ++++ b/prog/detect/sensors-detect +@@ -2773,7 +2773,7 @@ use vars qw(@cpu_ids); + }, { + name => "AMD Family 17h thermal sensors", + driver => "k10temp", +- detect => sub { amd_pci_detect('1463', '15d0', '1493') }, ++ detect => sub { amd_pci_detect('1463', '15d0', '1493', '1443') }, + }, { + name => "AMD Family 15h power sensors", + driver => "fam15h_power", +-- +2.20.1 + diff --git a/lm_sensors.spec b/lm_sensors.spec index 31914f8..9849388 100644 --- a/lm_sensors.spec +++ b/lm_sensors.spec @@ -1,6 +1,6 @@ Name: lm_sensors Version: 3.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Hardware monitoring tools %define upstream_version %(echo %{version} | sed -e 's/\\./-/g') @@ -28,6 +28,10 @@ Source7: lm_sensors.service Patch0: 0001-Revert-unnecessary-soname-bump.patch # Upstream patch: Patch1: 0001-sensors-detect-Add-detection-of-AMD-Family-17h-model.patch +# Upstream patch: +Patch2: 0001-Add-support-for-Nuvoton-NCT6797D-Super-IO-Sensors.patch +# Upstream patch: +Patch3: 0001-sensors-detect-Add-detection-of-AMD-family-17h-model.patch Requires: /usr/sbin/modprobe %ifarch %{ix86} x86_64 @@ -82,6 +86,8 @@ database, and warns of sensor alarms. %setup -q -n lm-sensors-%{upstream_version} %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 # Remove currently unused files to make sure we've got the license right rm -f prog/init/sysconfig-lm_sensors-convert prog/hotplug/unhide_ICH_SMBus @@ -202,6 +208,11 @@ fi %changelog +* Thu Aug 15 2019 Ondřej Lysoněk - 3.5.0-6 +- Add detection support for AMD family 17h model 70h +- Add detection support for Nuvoton NCT6797D +- Resolves: rhbz#1740735 + * Thu Jul 25 2019 Fedora Release Engineering - 3.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild