From 8e3eb9c963fb6eb42b5ce7c96be418700af77b46 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 30 Mar 2021 15:13:32 -0400
Subject: [PATCH] import lm_sensors-3.4.0-22.20180522git70f7e08.el8

---
 ...t-Add-support-for-AMD-CPU-Family-19h.patch | 26 +++++++++++++++++++
 SPECS/lm_sensors.spec                         |  9 ++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch

diff --git a/SOURCES/0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch b/SOURCES/0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch
new file mode 100644
index 0000000..dea46fa
--- /dev/null
+++ b/SOURCES/0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch
@@ -0,0 +1,26 @@
+From 0ed0dcd43556598c657dc527e3a8e5c04621e64b Mon Sep 17 00:00:00 2001
+From: a b <a@b.c>
+Date: Thu, 29 Oct 2020 17:25:38 +0100
+Subject: [PATCH] Add support for AMD CPU Family 19h
+
+---
+ prog/detect/sensors-detect | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
+index 8ee1c1b..3bcb547 100755
+--- a/prog/detect/sensors-detect
++++ b/prog/detect/sensors-detect
+@@ -2779,6 +2779,10 @@ use vars qw(@cpu_ids);
+		name => "AMD Family 16h power sensors",
+		driver => "fam15h_power",
+		detect => sub { amd_pci_detect('1534') },
++	}, {
++		name => "AMD Family 19h thermal sensors",
++		driver => "k10temp",
++		detect => sub { amd_pci_detect('1653') },
+	}, {
+		name => "Intel digital thermal sensor",
+		driver => "coretemp",
+--
+2.26.2
diff --git a/SPECS/lm_sensors.spec b/SPECS/lm_sensors.spec
index 32cef28..98998eb 100644
--- a/SPECS/lm_sensors.spec
+++ b/SPECS/lm_sensors.spec
@@ -7,7 +7,7 @@
 
 Name: lm_sensors
 Version: 3.4.0
-Release: 21.%{date}git%{shortcommit}%{?dist}
+Release: 22.%{date}git%{shortcommit}%{?dist}
 Summary: Hardware monitoring tools
 Group: Applications/System
 
@@ -40,6 +40,8 @@ Patch3: 0001-sensors-detect-Fix-printing-CPU-info-on-ppc-and-arm.patch
 # with the version string modified from 3.5.0+git to 3.4.0+git. Drop/modify
 # this patch on rebase.
 Patch4: fix-unexpanded-revision-strings.patch
+# Upstream commit 5deee7d0c301df779:
+Patch5: 0001-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch
 
 Requires: /usr/sbin/modprobe
 %ifarch %{ix86} x86_64
@@ -99,6 +101,7 @@ database, and warns of sensor alarms.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -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
@@ -220,6 +223,10 @@ fi
 
 
 %changelog
+* Fri Oct 30 2020 Artem Egorenkov <aegorenk@redhat.com> - 3.4.0-22.20180522git70f7e08
+- Add support for AMD CPU Family 19h
+- Resolves: rhbz#1846847
+
 * Fri Oct 18 2019 Ondřej Lysoněk <olysonek@redhat.com> - 3.4.0-21.20180522git70f7e08
 - Fix printing CPU info on non-x86 architectures in sensors-detect
 - Resolves: rhbz#1752854