pool/gasket-driver
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1099600 from home:chrBrd:branches:hardware

Browse Source 
Patch to fix bulds with kernel version >= 6.4

OBS-URL: https://build.opensuse.org/request/show/1099600
OBS-URL: https://build.opensuse.org/package/show/hardware/gasket-driver?expand=0&rev=11
This commit is contained in:
Chris Bradbury 2023-07-19 23:58:24 +00:00 committed by Git OBS Bridge
parent b50bf8a044
commit 81ccaa1f4b
3 changed files with 70 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
fix-kernel-gte-6.4.patch Normal file
View File

@ -0,0 +1,43 @@
From 83cbe8264fc63511e4e6250f2426749951a340c8 Mon Sep 17 00:00:00 2001
From: Chris Bradbury <chris@binaryspanner.com>
Date: Fri, 14 Jul 2023 18:55:56 +0100
Subject: [PATCH] Amend use of `class_create()` for kernels >= 6.4
The function signature for `class_create()` was changed in kernels >= 6.4.x to only accept a single argument (see kernel commit #dcfbb67).
This change will conditionally modify how `class_create()` is called depending on the kernel version.
---
src/gasket_core.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/gasket_core.c b/src/gasket_core.c
index 139616b..b1c2726 100644
--- a/src/gasket_core.c
+++ b/src/gasket_core.c
@@ -27,6 +27,7 @@
#include <linux/platform_device.h>
#include <linux/printk.h>
#include <linux/sched.h>
+#include <linux/version.h>
#ifdef GASKET_KERNEL_TRACE_SUPPORT
#define CREATE_TRACE_POINTS
@@ -1837,8 +1838,15 @@ int gasket_register_device(const struct gasket_driver_desc *driver_desc)
internal = &g_descs[desc_idx];
mutex_init(&internal->mutex);
memset(internal->devs, 0, sizeof(struct gasket_dev *) * GASKET_DEV_MAX);
- internal->class =
- class_create(driver_desc->module, driver_desc->name);
+
+ /* Function signature for `class_create()` is changed in kernel >= 6.4.x
+ * to only accept a single argument.
+ * */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)
+ internal->class = class_create(driver_desc->module, driver_desc->name);
+#else
+ internal->class = class_create(driver_desc->name);
+#endif
if (IS_ERR(internal->class)) {
pr_err("Cannot register %s class [ret=%ld]\n",

5
gasket-driver.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jul 19 23:18:19 UTC 2023 - Chris Bradbury <opensuse@chrbrd.com>
- Patch to fix bulds with kernel version >= 6.4
-------------------------------------------------------------------
Thu May 11 19:12:53 UTC 2023 - Chris Bradbury <obs@chrbrd.com>

31
gasket-driver.spec
View File

@ -11,8 +11,10 @@
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
#===
# Packaging Notes:
@ -43,8 +45,8 @@ Source1: group.conf
Source2: preamble
Source3: gasket-driver-rpmlintrc
BuildRequires: %kernel_module_package_buildreqs
BuildRequires: sysuser-tools
BuildRequires: pesign-obs-integration
BuildRequires: sysuser-tools
Requires: %{name}-kmp
%sysusers_requires
@ -57,7 +59,12 @@ Requires: %{name}-kmp
# https://github.com/google/gasket-driver/pull/10
# https://github.com/google/gasket-driver/commit/a87c105c14e826dafd4b25c36fa7c7c657a7ad03.patch
# PATCH-FIX-OPENSUSE fix-for-backported-dma-buf-ns.patch gh#google/gasket-driver!10
Patch0: fix-for-backported-dma-buf-ns.patch
Patch0: fix-for-backported-dma-buf-ns.patch
# The function signature for `class_create()` was changed in kernels >= 6.4.x to only accept a
# single argument (see kernel commit #dcfbb67).
# This patch conditionally modifies how `class_create()` is called depending on the kernel version.
Patch1: fix-kernel-gte-6.4.patch
# This directive instructs the build service to temporarily save the project's
# certificate as %%_sourcedir/_projectcert.crt. See:
@ -74,15 +81,19 @@ Patch0: fix-for-backported-dma-buf-ns.patch
%description
The Coral Gasket Driver allows usage of the Coral EdgeTPU on Linux systems.
The driver contains two modules:
The driver contains two modules:
- Gasket (Google ASIC Software, Kernel Extensions, and Tools) is a top level driver
for lightweight communication with Google ASICs.
- Apex refers to the EdgeTPU v1.
# This magic "KMP" subpackage is documented in
# This magic "KMP" subpackage is documented in
# https://en.opensuse.org/Kernel_Module_Packages#Specfile_mechanisms
%package KMP
Summary: Gasket Driver kernel modules
Summary: Gasket Driver kernel modules
Group: System/Kernel
%description KMP
@ -93,11 +104,14 @@ The Linux Kernel Module Package for the Coral Gasket Driver.
mkdir -p obj
# The `DMA_BUF` module namespace has been backported to the 5.14 kernel used
# in Leap 15.5, so apply the relevant patch.
# in Leap 15.5, so apply the relevant patch.
%if 0%{?sle_version} == 150500
%patch0 -p1
%endif
# Apply patches without conditions.
%patch1 -p1
%build
# Build the kernel modules.
for flavor in %flavors_to_build; do
@ -118,7 +132,7 @@ export INSTALL_MOD_DIR=updates
for flavor in %flavors_to_build; do
make -C %{kernel_source $flavor} modules_install M=$PWD/obj/$flavor
done
# Install the system group used by the driver.
# Install the system group used by the driver.
mkdir -p %{buildroot}%{_sysusersdir}
install -m 0644 %{SOURCE1} -D %{buildroot}%{_sysusersdir}/group-apex.conf
# Install the udev rules defined in the module source.
@ -136,4 +150,3 @@ export BRP_PESIGN_COMPRESS_MODULE="xz"
%{_udevrulesdir}/70-apex.rules
%changelog