blob: b554c49775ae6a16871e68ccc395d5a30a76d893 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
From 787bf530888d15f78f21cf28c4f32da6c48dc881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
<gonegrier.duarte@gmail.com>
Date: Sat, 16 May 2026 13:59:58 +0100
Subject: [PATCH] Implement amd_pci_dev_to_node_id from Kernel 6.14 and
asm/amd/nb.h from kernel 6.16
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
---
zenpower.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/zenpower.c b/zenpower.c
index 6d47732..9f6e7aa 100644
--- a/zenpower.c
+++ b/zenpower.c
@@ -35,7 +35,12 @@
#include <linux/hwmon.h>
#include <linux/module.h>
#include <linux/pci.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(6, 16, 0)
#include <asm/amd_nb.h>
+#else
+#include <asm/amd/nb.h>
+#endif
MODULE_DESCRIPTION("AMD ZEN family CPU Sensors Driver");
MODULE_AUTHOR("Anthony Wang");
@@ -150,6 +155,13 @@ static const struct tctl_offset tctl_offset_table[] = {
static DEFINE_MUTEX(nb_smu_ind_mutex);
static bool multicpu = false;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)
+static u16 amd_pci_dev_to_node_id(struct pci_dev *pdev)
+{
+ return PCI_SLOT(pdev->devfn) - AMD_NODE0_PCI_SLOT;
+}
+#endif
+
static umode_t zenpower_is_visible(const void *rdata,
enum hwmon_sensor_types type,
u32 attr, int channel)
--
2.53.0
|
