mirrors/meta-ti
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-ti synced 2026-04-18 10:42:32 +00:00
Code Issues Projects Releases Wiki Activity

debugss-module-drv: Add patch for kernel 6.11 change

Browse Source 
There was a change to the return value for a function pointer in the
kernel v6.11.  This patch adapts the module to the kernel change.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
This commit is contained in:
Ryan Eatmon
2024-10-04 10:18:57 -05:00
parent e6a4429404
commit fa3fe0413f
2 changed files with 61 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
meta-ti-extras/recipes-bsp/dsptop/debugss-module-drv_git.bb
View File

@@ -18,4 +18,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
include dsptop.inc
SRC_URI += "file://0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch"
SRC_URI += "\
file://0001-debugss_kmodule-Add-include-for-mod_devicetable.h.patch \
file://0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch \
"

57
meta-ti-extras/recipes-bsp/dsptop/files/0002-debugss_kmodule-kernel-6.11-changed-return-value-for.patch Normal file
View File

@@ -0,0 +1,57 @@
From aaddf1fa8b92db23ae2ebc83826c2bb5f5c87c35 Mon Sep 17 00:00:00 2001
From: Ryan Eatmon <reatmon@ti.com>
Date: Thu, 3 Oct 2024 14:25:18 -0500
Subject: [PATCH] debugss_kmodule: kernel 6.11 changed return value for remove
slot
In kernel version 6.11 the function footprint changed for the remove
slot to return a void instead of an int. [1]
Add ifdef checking code to look for kernel version and pick the correct
return code.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/include/linux/platform_device.h?id=0edb555a65d1ef047a9805051c36922b52a38a9d
Upstream-Status: Inactive-Upstream [lastcommit: 2021-04-20]
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
debugss_kmodule.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/debugss_kmodule.c b/debugss_kmodule.c
index 9e084eb..4191be8 100644
--- a/debugss_kmodule.c
+++ b/debugss_kmodule.c
@@ -27,6 +27,7 @@
#include "debugss_kmodule.h"
#include <linux/mod_devicetable.h>
+#include <linux/version.h>
/* un-comment the line below to enable printing for kernel debug messages */
//#define DEBUGSS_DRV_DEBUG
@@ -1132,7 +1133,11 @@ static int dra7xx_debugss_probe(struct platform_device *pdev)
return retval;
}
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0))
static int dra7xx_debugss_remove(struct platform_device *pdev)
+#else
+static void dra7xx_debugss_remove(struct platform_device *pdev)
+#endif
{
__D("%s:\n",__FUNCTION__);
@@ -1145,7 +1150,9 @@ static int dra7xx_debugss_remove(struct platform_device *pdev)
/* Un-prepare debugSS clock */
clk_disable_unprepare(sys_clk_in1);
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0))
return 0;
+#endif
}
static const struct of_device_id dra7xx_debugss_of_match[] = {
--
2.17.1