public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: sys-kernel/zenpower3/files/, sys-kernel/zenpower3/
@ 2023-12-23 22:04 Gonçalo Negrier Duarte
  0 siblings, 0 replies; 2+ messages in thread
From: Gonçalo Negrier Duarte @ 2023-12-23 22:04 UTC (permalink / raw
  To: gentoo-commits

commit:     8df6f982540df61b08d4e37abaad499eb196b4bc
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Sat Dec 23 22:02:23 2023 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Sat Dec 23 22:04:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8df6f982

sys-kernel/zenpower3: update EAPI 7 -> 8; migrate linux-mod -> linux-mod-r1

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 ...r3-0.2.0-use-symlink-to-detect-kernel-version.patch |  9 ---------
 sys-kernel/zenpower3/zenpower3-0.2.0.ebuild            | 18 ++++++++----------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/sys-kernel/zenpower3/files/zenpower3-0.2.0-use-symlink-to-detect-kernel-version.patch b/sys-kernel/zenpower3/files/zenpower3-0.2.0-use-symlink-to-detect-kernel-version.patch
deleted file mode 100644
index 07414cd717..0000000000
--- a/sys-kernel/zenpower3/files/zenpower3-0.2.0-use-symlink-to-detect-kernel-version.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -1,5 +1,5 @@
- VERSION         := 0.2.0
--TARGET          := $(shell uname -r)
-+TARGET          := $(KV_FULL)
- DKMS_ROOT_PATH  := /usr/src/zenpower-$(VERSION)
- 
- KERNEL_MODULES	:= /lib/modules/$(TARGET)

diff --git a/sys-kernel/zenpower3/zenpower3-0.2.0.ebuild b/sys-kernel/zenpower3/zenpower3-0.2.0.ebuild
index 3d44019c83..5225717938 100644
--- a/sys-kernel/zenpower3/zenpower3-0.2.0.ebuild
+++ b/sys-kernel/zenpower3/zenpower3-0.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2020-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit linux-info linux-mod
+inherit linux-info linux-mod-r1
 
 DESCRIPTION="Linux kernel driver for reading sensors of AMD Zen family CPUs"
 HOMEPAGE="https://github.com/Ta180m/zenpower3"
@@ -18,20 +18,18 @@ DEPEND=""
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
-PATCHES="${FILESDIR}/${P}-use-symlink-to-detect-kernel-version.patch"
-
 CONFIG_CHECK="HWMON PCI AMD_NB"
 
-BUILD_TARGETS="modules"
-MODULE_NAMES="zenpower(misc:${S})"
-
 src_compile() {
-	export KV_FULL
-	linux-mod_src_compile
+	export KERNELVERSION=${KV_FULL}
+	local modlist=(
+		zenpower=misc:::all
+	)
+	linux-mod-r1_src_compile
 }
 
 src_install() {
-	linux-mod_src_install
+	linux-mod-r1_src_install
 	dobin zp_read_debug.sh
 	dodoc README.md
 }


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-kernel/zenpower3/files/, sys-kernel/zenpower3/
@ 2025-04-29 15:07 Gonçalo Negrier Duarte
  0 siblings, 0 replies; 2+ messages in thread
From: Gonçalo Negrier Duarte @ 2025-04-29 15:07 UTC (permalink / raw
  To: gentoo-commits

commit:     13291fc3f7a8b1ef5b3ccf7dce0942c52d7747ee
Author:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
AuthorDate: Tue Apr 29 12:52:38 2025 +0000
Commit:     Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> com>
CommitDate: Tue Apr 29 15:07:15 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=13291fc3

zenpower3: add patch to fix amd_pci_dev_to_node_id() no longer
available since kernel 6.14
* also add use KV_FULL to detect the kernel to 0.2.0

Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail.com>

 ...2.0-use-symlink-to-detect-kernel-version.patch} | 25 ++++---------
 ...999-use-symlink-to-detect-kernel-version.patch} |  0
 ...power3-amd_pci_dev_to_node_id-kernel-6.14.patch | 43 ++++++++++++++++++++++
 ...3-0.2.0-r2.ebuild => zenpower3-0.2.0-r3.ebuild} |  7 +++-
 sys-kernel/zenpower3/zenpower3-9999.ebuild         |  7 +++-
 5 files changed, 62 insertions(+), 20 deletions(-)

diff --git a/sys-kernel/zenpower3/files/zenpower3-use-symlink-to-detect-kernel-version.patch b/sys-kernel/zenpower3/files/zenpower3-0.2.0-use-symlink-to-detect-kernel-version.patch
similarity index 56%
copy from sys-kernel/zenpower3/files/zenpower3-use-symlink-to-detect-kernel-version.patch
copy to sys-kernel/zenpower3/files/zenpower3-0.2.0-use-symlink-to-detect-kernel-version.patch
index 3d3a04f7b..6cbdd79ea 100644
--- a/sys-kernel/zenpower3/files/zenpower3-use-symlink-to-detect-kernel-version.patch
+++ b/sys-kernel/zenpower3/files/zenpower3-0.2.0-use-symlink-to-detect-kernel-version.patch
@@ -1,37 +1,28 @@
-From f575836deb3221cde127cb06390dc192d5099455 Mon Sep 17 00:00:00 2001
+From 07dd08e27ecd4580040a9acf2c1d3b910cf23131 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
  <gonegrier.duarte@gmail.com>
-Date: Sun, 9 Mar 2025 20:57:53 +0000
-Subject: [PATCH] zenpower3: use KV_FULL to detect kernel version. * fix CFLAGS
- for clang
+Date: Tue, 29 Apr 2025 13:40:28 +0100
+Subject: [PATCH] zenpower3: use KV_FULL to detect kernel version.
 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>
 ---
- Makefile | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index d108729..37a58ba 100644
+index 0dcb668..b24c7be 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,8 +1,12 @@
+@@ -1,5 +1,5 @@
  VERSION         := 0.2.0
 -TARGET          := $(shell uname -r)
 +TARGET          := ${KV_FULL}
  DKMS_ROOT_PATH  := /usr/src/zenpower-$(VERSION)
  
--KBUILD_CFLAGS   += -Wimplicit-fallthrough=3
-+ifeq ($(CC),clang)
-+    CXXFLAGS += -Wimplicit-fallthrough
-+else ifeq ($(CC),gcc)
-+    CXXFLAGS += -Wimplicit-fallthrough=3
-+endif
- 
  KERNEL_MODULES	:= /lib/modules/$(TARGET)
- 
 -- 
-2.48.1
+2.49.0
 

diff --git a/sys-kernel/zenpower3/files/zenpower3-use-symlink-to-detect-kernel-version.patch b/sys-kernel/zenpower3/files/zenpower3-9999-use-symlink-to-detect-kernel-version.patch
similarity index 100%
rename from sys-kernel/zenpower3/files/zenpower3-use-symlink-to-detect-kernel-version.patch
rename to sys-kernel/zenpower3/files/zenpower3-9999-use-symlink-to-detect-kernel-version.patch

diff --git a/sys-kernel/zenpower3/files/zenpower3-amd_pci_dev_to_node_id-kernel-6.14.patch b/sys-kernel/zenpower3/files/zenpower3-amd_pci_dev_to_node_id-kernel-6.14.patch
new file mode 100644
index 000000000..b1f7e1b22
--- /dev/null
+++ b/sys-kernel/zenpower3/files/zenpower3-amd_pci_dev_to_node_id-kernel-6.14.patch
@@ -0,0 +1,43 @@
+From c3f5b941864c978f39e91199abc8b8445924c8b3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
+ <gonegrier.duarte@gmail.com>
+Date: Tue, 29 Apr 2025 13:47:47 +0100
+Subject: [PATCH] Implement amd_pci_dev_to_node_id from Kernel 6.14
+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 | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/zenpower.c b/zenpower.c
+index 6d47732..dedba5c 100644
+--- a/zenpower.c
++++ b/zenpower.c
+@@ -35,6 +35,7 @@
+ #include <linux/hwmon.h>
+ #include <linux/module.h>
+ #include <linux/pci.h>
++#include <linux/version.h>
+ #include <asm/amd_nb.h>
+ 
+ MODULE_DESCRIPTION("AMD ZEN family CPU Sensors Driver");
+@@ -150,6 +151,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.49.0
+

diff --git a/sys-kernel/zenpower3/zenpower3-0.2.0-r2.ebuild b/sys-kernel/zenpower3/zenpower3-0.2.0-r3.ebuild
similarity index 79%
rename from sys-kernel/zenpower3/zenpower3-0.2.0-r2.ebuild
rename to sys-kernel/zenpower3/zenpower3-0.2.0-r3.ebuild
index a7e4064f6..25df5cc6b 100644
--- a/sys-kernel/zenpower3/zenpower3-0.2.0-r2.ebuild
+++ b/sys-kernel/zenpower3/zenpower3-0.2.0-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	# Mantain fork of zenpower3
 	EGIT_REPO_URI="https://github.com/koweda/zenpower3"
 else
-	SRC_URI="https://github.com/koweda/zenpower3/archive/v0.2.0.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/koweda/zenpower3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P}"
 	KEYWORDS="~amd64"
 fi
@@ -26,6 +26,11 @@ SLOT="0"
 
 CONFIG_CHECK="HWMON PCI AMD_NB"
 
+PATCHES="
+	${FILESDIR}/${P}-use-symlink-to-detect-kernel-version.patch
+	${FILESDIR}/${PN}-amd_pci_dev_to_node_id-kernel-6.14.patch
+"
+
 src_compile() {
 	MODULES_MAKEARGS+=(
 		TARGET="${KV_FULL}"

diff --git a/sys-kernel/zenpower3/zenpower3-9999.ebuild b/sys-kernel/zenpower3/zenpower3-9999.ebuild
index a96cf47a8..25df5cc6b 100644
--- a/sys-kernel/zenpower3/zenpower3-9999.ebuild
+++ b/sys-kernel/zenpower3/zenpower3-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	# Mantain fork of zenpower3
 	EGIT_REPO_URI="https://github.com/koweda/zenpower3"
 else
-	SRC_URI="https://github.com/koweda/zenpower3/archive/v0.2.0.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/koweda/zenpower3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${P}"
 	KEYWORDS="~amd64"
 fi
@@ -26,7 +26,10 @@ SLOT="0"
 
 CONFIG_CHECK="HWMON PCI AMD_NB"
 
-PATCHES="${FILESDIR}/${PN}-use-symlink-to-detect-kernel-version.patch"
+PATCHES="
+	${FILESDIR}/${P}-use-symlink-to-detect-kernel-version.patch
+	${FILESDIR}/${PN}-amd_pci_dev_to_node_id-kernel-6.14.patch
+"
 
 src_compile() {
 	MODULES_MAKEARGS+=(


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-04-29 15:07 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-04-29 15:07 [gentoo-commits] repo/proj/guru:dev commit in: sys-kernel/zenpower3/files/, sys-kernel/zenpower3/ Gonçalo Negrier Duarte
  -- strict thread matches above, loose matches on Subject: below --
2023-12-23 22:04 Gonçalo Negrier Duarte

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox