a/zenpower3
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases 2 Wiki Activity

Added option to swap CORE and SOC

Browse source
This commit is contained in:
Ondrej Čerman 2019-09-29 11:43:26 +02:00
parent 966ae5b1b5
commit eb45c2d2a1
3 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Makefile
View file

@ -1,5 +1,6 @@
TARGET := $(shell uname -r) VERSION := 0.1.3
DKMS_ROOT_PATH := /usr/src/zenpower-0.1.2 TARGET := $(shell uname -r)
DKMS_ROOT_PATH := /usr/src/zenpower-0.1.3
ifneq ("","$(wildcard /usr/src/linux-headers-$(TARGET)/*)") ifneq ("","$(wildcard /usr/src/linux-headers-$(TARGET)/*)")
# Ubuntu # Ubuntu
@ -16,7 +17,7 @@ endif
obj-m := $(patsubst %,%.o,zenpower) obj-m := $(patsubst %,%.o,zenpower)
obj-ko := $(patsubst %,%.ko,zenpower) obj-ko := $(patsubst %,%.ko,zenpower)
.PHONY: all modules clean dkms-install dkms-uninstall .PHONY: all modules clean dkms-install dkms-install-swapped dkms-uninstall
all: modules all: modules
@ -31,10 +32,14 @@ dkms-install:
cp $(CURDIR)/dkms.conf $(DKMS_ROOT_PATH) cp $(CURDIR)/dkms.conf $(DKMS_ROOT_PATH)
cp $(CURDIR)/Makefile $(DKMS_ROOT_PATH) cp $(CURDIR)/Makefile $(DKMS_ROOT_PATH)
cp $(CURDIR)/zenpower.c $(DKMS_ROOT_PATH) cp $(CURDIR)/zenpower.c $(DKMS_ROOT_PATH)
dkms add zenpower/0.1.2
dkms build zenpower/0.1.2 sed -e "s/@CFLGS@/${MCFLAGS}/" \
dkms install zenpower/0.1.2 -i $(DKMS_ROOT_PATH)/dkms.conf
dkms add zenpower/$(VERSION)
dkms build zenpower/$(VERSION)
dkms install zenpower/$(VERSION)
dkms-uninstall: dkms-uninstall:
dkms remove zenpower/0.1.2 --all dkms remove zenpower/$(VERSION) --all
rm -rf $(DKMS_ROOT_PATH) rm -rf $(DKMS_ROOT_PATH)

4
dkms.conf
View file

@ -1,7 +1,7 @@
MAKE="make TARGET=${kernelver}" MAKE="make TARGET=${kernelver} CFLAGS_MODULE+=@CFLGS@"
CLEAN="make clean" CLEAN="make clean"
PACKAGE_NAME="zenpower" PACKAGE_NAME="zenpower"
PACKAGE_VERSION="0.1.2" PACKAGE_VERSION="0.1.3"
BUILT_MODULE_NAME[0]="zenpower" BUILT_MODULE_NAME[0]="zenpower"
DEST_MODULE_LOCATION[0]="/kernel/drivers/hwmon/zenpower" DEST_MODULE_LOCATION[0]="/kernel/drivers/hwmon/zenpower"
AUTOINSTALL="yes" AUTOINSTALL="yes"

9
zenpower.c
View file

@ -318,8 +318,13 @@ static int zenpower_probe(struct pci_dev *pdev, const struct pci_device_id *id)
data->pdev = pdev; data->pdev = pdev;
data->read_amdsmn_addr = read_amdsmn_addr; data->read_amdsmn_addr = read_amdsmn_addr;
data->svi_core_addr = F17H_M01H_SVI_TEL_PLANE0; #ifndef SWAP_CORE_SOC
data->svi_soc_addr = F17H_M01H_SVI_TEL_PLANE1; data->svi_core_addr = F17H_M01H_SVI_TEL_PLANE0;
data->svi_soc_addr = F17H_M01H_SVI_TEL_PLANE1;
#else
data->svi_core_addr = F17H_M01H_SVI_TEL_PLANE1;
data->svi_soc_addr = F17H_M01H_SVI_TEL_PLANE0;
#endif
for (i = 0; i < ARRAY_SIZE(tctl_offset_table); i++) { for (i = 0; i < ARRAY_SIZE(tctl_offset_table); i++) {
const struct tctl_offset *entry = &tctl_offset_table[i]; const struct tctl_offset *entry = &tctl_offset_table[i];