From 8609fd7acbcd1565ddf6b1be09be1ff5df7ce007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ondrej=20=C4=8Cerman?= Date: Fri, 19 Jul 2019 19:32:13 +0200 Subject: [PATCH] New version: added PCI device for new Zen CPUs --- Makefile | 10 +++++----- README.md | 10 +++++++++- dkms.conf | 2 +- zenpower.c | 5 +++++ 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index da1d1b2..9b0ba31 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ TARGET := $(shell uname -r) -DKMS_ROOT_PATH := /usr/src/zenpower-0.1.0 +DKMS_ROOT_PATH := /usr/src/zenpower-0.1.1 ifneq ("","$(wildcard /usr/src/linux-headers-$(TARGET)/*)") # Ubuntu @@ -31,10 +31,10 @@ dkms-install: cp $(CURDIR)/dkms.conf $(DKMS_ROOT_PATH) cp $(CURDIR)/Makefile $(DKMS_ROOT_PATH) cp $(CURDIR)/zenpower.c $(DKMS_ROOT_PATH) - dkms add zenpower/0.1.0 - dkms build zenpower/0.1.0 - dkms install zenpower/0.1.0 + dkms add zenpower/0.1.1 + dkms build zenpower/0.1.1 + dkms install zenpower/0.1.1 dkms-uninstall: - dkms remove zenpower/0.1.0 --all + dkms remove zenpower/0.1.1 --all rm -rf $(DKMS_ROOT_PATH) diff --git a/README.md b/README.md index 162909d..f99a249 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,12 @@ Because zenpower is using same PCI device as k10temp, you have to disable k10tem 4. Activate zenpower `sudo modprobe zenpower` ## Sensors monitoring -You can use this script: [zenmonitor](https://github.com/ocerman/zenmonitor), or your favourie sensors monitoring software +You can use this app: [zenmonitor](https://github.com/ocerman/zenmonitor), or your favourie sensors monitoring software + +## Update instructions +1. Unload zenpower `sudo modprobe -r zenpower` +2. Goto zenpower directory `cd ~/zenpower` +3. Uninstall old version `sudo make dkms-uninstall` +4. Update code from git `git pull` +5. Install new version `sudo make dkms-install` +6. Activate zenpower `sudo modprobe zenpower` diff --git a/dkms.conf b/dkms.conf index d3cda75..208915c 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,7 +1,7 @@ MAKE="make TARGET=${kernelver}" CLEAN="make clean" PACKAGE_NAME="zenpower" -PACKAGE_VERSION="0.1.0" +PACKAGE_VERSION="0.1.1" BUILT_MODULE_NAME[0]="zenpower" DEST_MODULE_LOCATION[0]="/kernel/drivers/hwmon/zenpower" AUTOINSTALL="yes" diff --git a/zenpower.c b/zenpower.c index 4169351..b4d3ec2 100644 --- a/zenpower.c +++ b/zenpower.c @@ -28,6 +28,10 @@ MODULE_LICENSE("GPL"); #define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb #endif +#ifndef PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 +#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493 +#endif + /* F17h M01h Access througn SMN */ #define F17H_M01H_REPORTED_TEMP_CTRL_OFFSET 0x00059800 #define F17H_M01H_SVI 0x0005A000 @@ -315,6 +319,7 @@ static int zenpower_probe(struct pci_dev *pdev, const struct pci_device_id *id) static const struct pci_device_id zenpower_id_table[] = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_DF_F3) }, { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) }, {} }; MODULE_DEVICE_TABLE(pci, zenpower_id_table);