Add multiple flags for newly defined methods and utilities

Adding a flag for the definition of hid_warn_ratelimited introduced
in kernel v6.17

Adding a flag for the usage of __free which was introduced in kernel
version v6.5.

Adding flags for the new guard and secure_guard methods implemented
in kernel v6.5

Adding flag for DEFINE_SIMPLE_DEV_PM_OPS definition implemented
in kernel v5.17

Author: Joshua-Dickens

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        kernel: ["7.0", "6.12", "6.10", "6.3", "5.15", "5.10", "5.4", "5.0", "4.19"]
+        kernel: ["7.0", "6.17", "6.12", "6.10", "6.5", "6.3", "5.17", "5.15", "5.10", "5.4", "5.0", "4.19"]
         include:
           - kernel: "4.19"
             compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
@@ -24,15 +24,23 @@ jobs:
             compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
           - kernel: "5.15"
             compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
+          - kernel: "5.17"
+            compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
           - kernel: "6.3"
             compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
             build_makeflags: KBUILD_MODPOST_WARN=1
+          - kernel: "6.5"
+            compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
+            build_makeflags: KBUILD_MODPOST_WARN=1
           - kernel: "6.10"
             compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
             build_makeflags: KBUILD_MODPOST_WARN=1
           - kernel: "6.12"
             compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
             build_makeflags: KBUILD_MODPOST_WARN=1
+          - kernel: "6.17"
+            compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
+            build_makeflags: KBUILD_MODPOST_WARN=1
           - kernel: "7.0"
             compile_cflags: -Wno-error=format-truncation -Wno-error=pointer-sign
             build_makeflags: KBUILD_MODPOST_WARN=1

4.18/wacom_i2c.c

@@ -338,7 +338,11 @@ static int wacom_i2c_probe(struct i2c_client *client)
 	return 0;
 }
 
+#ifdef WACOM_DEFINE_SIMPLE_DEV_PM_OPS
 static int wacom_i2c_suspend(struct device *dev)
+#else
+static int __maybe_unused wacom_i2c_suspend(struct device *dev)
+#endif
 {
 	struct i2c_client *client = to_i2c_client(dev);
 
@@ -347,7 +351,11 @@ static int wacom_i2c_suspend(struct device *dev)
 	return 0;
 }
 
+#ifdef WACOM_DEFINE_SIMPLE_DEV_PM_OPS
 static int wacom_i2c_resume(struct device *dev)
+#else
+static int __maybe_unused wacom_i2c_resume(struct device *dev)
+#endif
 {
 	struct i2c_client *client = to_i2c_client(dev);
 
@@ -356,7 +364,11 @@ static int wacom_i2c_resume(struct device *dev)
 	return 0;
 }
 
+#ifdef WACOM_DEFINE_SIMPLE_DEV_PM_OPS
 static DEFINE_SIMPLE_DEV_PM_OPS(wacom_i2c_pm, wacom_i2c_suspend, wacom_i2c_resume);
+#else
+static SIMPLE_DEV_PM_OPS(wacom_i2c_pm, wacom_i2c_suspend, wacom_i2c_resume);
+#endif
 
 static const struct i2c_device_id wacom_i2c_id[] = {
 	{ "WAC_I2C_EMR" },
@@ -375,7 +387,11 @@ MODULE_DEVICE_TABLE(of, wacom_i2c_of_match_table);
 static struct i2c_driver wacom_i2c_driver = {
 	.driver	= {
 		.name	= "wacom_i2c",
+#ifdef WACOM_DEFINE_SIMPLE_DEV_PM_OPS
 		.pm	= pm_sleep_ptr(&wacom_i2c_pm),
+#else
+		.pm = &wacom_i2c_pm,
+#endif
 
 #ifdef CONFIG_OF
 		.of_match_table = of_match_ptr(wacom_i2c_of_match_table),

4.18/wacom_sys.c

@@ -68,20 +68,33 @@ static void wacom_wac_queue_insert(struct hid_device *hdev,
 		kfifo_skip(fifo);
 	}
 
+#ifdef WACOM_HID_WARN_RATELIMITED
 	if (!kfifo_in(fifo, raw_data, size))
 		hid_warn_ratelimited(hdev, "%s: report is too large (%d)\n",
 				     __func__, size);
+#else
+	kfifo_in(fifo, raw_data, size);
+#endif
 }
 
 static void wacom_wac_queue_flush(struct hid_device *hdev,
 				  struct kfifo_rec_ptr_2 *fifo)
 {
 	while (!kfifo_is_empty(fifo)) {
 		int size = kfifo_peek_len(fifo);
+#ifdef WACOM_CLEANUP_FREE
 		u8 *buf __free(kfree) = kzalloc(size, GFP_ATOMIC);
+#else
+		u8 *buf;
+#endif
 		unsigned int count;
 		int err;
 
+#ifdef WACOM_CLEANUP_FREE
+#else
+		buf = kzalloc(size, GFP_ATOMIC);
+#endif
+
 		if (!buf) {
 			kfifo_skip(fifo);
 			continue;
@@ -92,8 +105,12 @@ static void wacom_wac_queue_flush(struct hid_device *hdev,
 			// Hard to say what is the "right" action in this
 			// circumstance. Skipping the entry and continuing
 			// to flush seems reasonable enough, however.
-			hid_warn(hdev, "%s: removed fifo entry with unexpected size\n",
-				 __func__);\
+		hid_warn(hdev, "%s: removed fifo entry with unexpected size\n",
+				 __func__);
+#ifdef WACOM_CLEANUP_FREE
+#else
+			kfree(buf);
+#endif
 			continue;
 		}
 #ifdef WACOM_HID_REPORT_RAW_EVENT_BUFSIZE
@@ -105,6 +122,10 @@ static void wacom_wac_queue_flush(struct hid_device *hdev,
 			hid_warn(hdev, "%s: unable to flush event due to error %d\n",
 				 __func__, err);
 		}
+#ifdef WACOM_CLEANUP_FREE
+#else
+		kfree(buf);
+#endif
 	}
 }
 

4.18/wacom_w8001.c

@@ -375,6 +375,7 @@ static int w8001_command(struct w8001 *w8001, unsigned char command,
 	return rc;
 }
 
+#ifdef WACOM_SCOPED_GUARD
 static int w8001_open(struct input_dev *dev)
 {
 	struct w8001 *w8001 = input_get_drvdata(dev);
@@ -393,15 +394,42 @@ static int w8001_open(struct input_dev *dev)
 
 	return -EINTR;
 }
+#else
+static int w8001_open(struct input_dev *dev)
+{
+	struct w8001 *w8001 = input_get_drvdata(dev);
+	int err;
+
+	err = mutex_lock_interruptible(&w8001->mutex);
+	if (err)
+		return err;
+
+	if (w8001->open_count++ == 0) {
+		err = w8001_command(w8001, W8001_CMD_START, false);
+		if (err)
+			w8001->open_count--;
+	}
+
+	mutex_unlock(&w8001->mutex);
+	return err;
+}
+#endif
 
 static void w8001_close(struct input_dev *dev)
 {
 	struct w8001 *w8001 = input_get_drvdata(dev);
-
+#ifdef WACOM_GUARD
 	guard(mutex)(&w8001->mutex);
+#else
+	mutex_lock(&w8001->mutex);
+#endif
 
 	if (--w8001->open_count == 0)
 		w8001_command(w8001, W8001_CMD_STOP, false);
+#ifdef WACOM_GUARD
+#else
+	mutex_unlock(&w8001->mutex);
+#endif
 }
 
 static int w8001_detect(struct w8001 *w8001)
@@ -596,7 +624,11 @@ static int w8001_connect(struct serio *serio, struct serio_driver *drv)
 	char basename[64] = "Wacom Serial";
 	int err, err_pen, err_touch;
 
+#ifdef WACOM_KZALLOC_OBJ
 	w8001 = kzalloc_obj(*w8001);
+#else
+	w8001 = kzalloc(sizeof(*w8001), GFP_KERNEL);
+#endif
 	input_dev_pen = input_allocate_device();
 	input_dev_touch = input_allocate_device();
 	if (!w8001 || !input_dev_pen || !input_dev_touch) {

configure.ac

@@ -385,6 +385,91 @@ WACOM_LINUX_TRY_COMPILE([
 	AC_MSG_RESULT([no])
 ])
 
+dnl Check if hid_warn_ratelimited exists
+AC_MSG_CHECKING(hid_warn_ratelimited)
+WACOM_LINUX_TRY_COMPILE([
+#include <linux/hid.h>
+#ifndef hid_warn_ratelimited
+#error "hid_warn_ratelimited is not defined"
+#endif
+],[
+],[
+	HAVE_HID_WARN_RATELIMITED=yes
+	AC_MSG_RESULT([yes])
+	AC_DEFINE([WACOM_HID_WARN_RATELIMITED], [], [kernel defines hid_warn_ratelimited from v6.17])
+],[
+	HAVE_HID_WARN_RATELIMITED=no
+	AC_MSG_RESULT([no])
+])
+
+dnl Check if __free exists
+AC_MSG_CHECKING(__free)
+WACOM_LINUX_TRY_COMPILE([
+#include <linux/cleanup.h>
+#ifndef __free
+#error "__free is not defined"
+#endif
+],[
+],[
+	HAVE_CLEANUP_FREE=yes
+	AC_MSG_RESULT([yes])
+	AC_DEFINE([WACOM_CLEANUP_FREE], [], [kernel defines __free from v6.5])
+],[
+	HAVE_CLEANUP_FREE=no
+	AC_MSG_RESULT([no])
+])
+
+dnl Check if scoped_guard exists
+AC_MSG_CHECKING(scoped_guard)
+WACOM_LINUX_TRY_COMPILE([
+#include <linux/cleanup.h>
+#ifndef scoped_guard
+#error "scoped_guard is not defined"
+#endif
+],[
+],[
+	HAVE_SCOPED_GUARD=yes
+	AC_MSG_RESULT([yes])
+	AC_DEFINE([WACOM_SCOPED_GUARD], [], [kernel defines scoped_guard from v6.5])
+],[
+	HAVE_SCOPED_GUARD=no
+	AC_MSG_RESULT([no])
+])
+
+dnl Check if guard exists
+AC_MSG_CHECKING(guard)
+WACOM_LINUX_TRY_COMPILE([
+#include <linux/cleanup.h>
+#ifndef guard
+#error "guard is not defined"
+#endif
+],[
+],[
+	HAVE_GUARD=yes
+	AC_MSG_RESULT([yes])
+	AC_DEFINE([WACOM_GUARD], [], [kernel defines guard from v6.5])
+],[
+	HAVE_GUARD=no
+	AC_MSG_RESULT([no])
+])
+
+dnl Check if define_simple_dev_pm_ops exists
+AC_MSG_CHECKING(define_simple_dev_pm_ops)
+WACOM_LINUX_TRY_COMPILE([
+#include <linux/pm.h>
+#ifndef DEFINE_SIMPLE_DEV_PM_OPS
+#error "define_simple_dev_pm_ops is not defined"
+#endif
+],[
+],[
+	HAVE_DEFINE_SIMPLE_DEV_PM_OPS=yes
+	AC_MSG_RESULT([yes])
+	AC_DEFINE([WACOM_DEFINE_SIMPLE_DEV_PM_OPS], [], [kernel defines define_simple_dev_pm_ops from v5.17])
+],[
+	HAVE_DEFINE_SIMPLE_DEV_PM_OPS=no
+	AC_MSG_RESULT([no])
+])
+
 dnl Check which version of the driver we should compile
 AC_DEFUN([WCM_EXPLODE], [$(echo "$1" | awk '{split($[0],x,"[[^0-9]]"); printf("%03d%03d%03d\n",x[[1]],x[[2]],x[[3]]);}')])
 EXPLODED_VER="WCM_EXPLODE($MODUTS)"