Merge pull request #513 from Joshua-Dickens/master

Backports for Input Wacom 1.7.0 Release

Author: Pinglinux

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        kernel: ["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,26 @@ 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
     steps:
       - name: Install dependencies
         run: |
@@ -41,7 +52,7 @@ jobs:
           gcc -print-file-name=plugin
 
       - name: Checkout the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
 
       - name: Download and extract v${{ matrix.kernel }} kernel
         run: |
@@ -94,7 +105,7 @@ jobs:
 
       - name: Save build directory as artifact
         if: '!cancelled()'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: input-wacom-${{ matrix.kernel }}
           retention-days: 7

.github/workflows/tagged-release.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       # ...
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           ref: ${{ github.ref }}
           fetch-tags: 'true'

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 __maybe_unused 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,11 +364,15 @@ static int __maybe_unused 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", 0 },
-	{ },
+	{ "WAC_I2C_EMR" },
+	{ }
 };
 MODULE_DEVICE_TABLE(i2c, wacom_i2c_id);
 
@@ -375,7 +387,11 @@ MODULE_DEVICE_TABLE(of, wacom_i2c_of_match_table);
 static struct i2c_driver wacom_i2c_driver = {
 	.driver	= {
 		.name	= "wacom_i2c",
-		.pm	= &wacom_i2c_pm,
+#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

@@ -60,27 +60,41 @@ static void wacom_wac_queue_insert(struct hid_device *hdev,
 {
 	bool warned = false;
 
-	while (kfifo_avail(fifo) < size) {
+	while (kfifo_avail(fifo) < size && !kfifo_is_empty(fifo)) {
 		if (!warned)
 			hid_warn(hdev, "%s: kfifo has filled, starting to drop events\n", __func__);
 		warned = true;
 
 		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;
 
-		buf = kzalloc(size, GFP_KERNEL);
+#ifdef WACOM_CLEANUP_FREE
+#else
+		buf = kzalloc(size, GFP_ATOMIC);
+#endif
+
 		if (!buf) {
 			kfifo_skip(fifo);
 			continue;
@@ -91,9 +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",
+		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,8 +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
 	}
 }
 
@@ -371,6 +390,7 @@ static void wacom_feature_mapping(struct hid_device *hdev,
 
 		hid_data->inputmode = field->report->id;
 		hid_data->inputmode_index = usage->usage_index;
+		hid_data->inputmode_field_index = field->index;
 		break;
 
 	case HID_UP_DIGITIZER:
@@ -591,9 +611,14 @@ static int wacom_hid_set_device_mode(struct hid_device *hdev)
 
 	re = &(hdev->report_enum[HID_FEATURE_REPORT]);
 	r = re->report_id_hash[hid_data->inputmode];
-	if (r) {
-		r->field[0]->value[hid_data->inputmode_index] = 2;
-		hid_hw_request(hdev, r, HID_REQ_SET_REPORT);
+	if (r && hid_data->inputmode_field_index >= 0 &&
+		hid_data->inputmode_field_index < r->maxfield) {
+		struct hid_field *field = r->field[hid_data->inputmode_field_index];
+
+		if (field && hid_data->inputmode_index < field->report_count) {
+			field->value[hid_data->inputmode_index] = 2;
+			hid_hw_request(hdev, r, HID_REQ_SET_REPORT);
+		}
 	}
 	return 0;
 }
@@ -928,7 +953,11 @@ static int wacom_add_shared_data(struct hid_device *hdev)
 
 	data = wacom_get_hdev_data(hdev);
 	if (!data) {
+#ifdef WACOM_KZALLOC_OBJ
+		data = kzalloc_obj(struct wacom_hdev_data);
+#else
 		data = kzalloc(sizeof(struct wacom_hdev_data), GFP_KERNEL);
+#endif
 		if (!data) {
 			mutex_unlock(&wacom_udev_list_lock);
 			return -ENOMEM;
@@ -2487,16 +2516,16 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
 
 	error = wacom_register_inputs(wacom);
 	if (error)
-		goto fail;
+		goto fail_hw_stop;
 
 	if (wacom->wacom_wac.features.device_type & WACOM_DEVICETYPE_PAD) {
 		error = wacom_initialize_leds(wacom);
 		if (error)
-			goto fail;
+			goto fail_hw_stop;
 
 		error = wacom_initialize_remotes(wacom);
 		if (error)
-			goto fail;
+			goto fail_hw_stop;
 	}
 
 	if (!wireless) {
@@ -2510,14 +2539,14 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
 		cancel_delayed_work_sync(&wacom->init_work);
 		_wacom_query_tablet_data(wacom);
 		error = -ENODEV;
-		goto fail_quirks;
+		goto fail_hw_stop;
 	}
 
 	if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR) {
 		error = hid_hw_open(hdev);
 		if (error) {
 			hid_err(hdev, "hw open failed\n");
-			goto fail_quirks;
+			goto fail_hw_stop;
 		}
 	}
 
@@ -2526,7 +2555,7 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
 
 	return 0;
 
-fail_quirks:
+fail_hw_stop:
 	hid_hw_stop(hdev);
 fail:
 	wacom_release_resources(wacom);
@@ -2877,6 +2906,7 @@ static int wacom_probe(struct hid_device *hdev,
 		return -ENODEV;
 
 	wacom_wac->hid_data.inputmode = -1;
+	wacom_wac->hid_data.inputmode_field_index = -1;
 	wacom_wac->mode_report = -1;
 
 	if (wacom_is_using_usb_driver(hdev)) {

4.18/wacom_w8001.c

@@ -375,6 +375,26 @@ 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);
+	int err;
+
+	scoped_guard(mutex_intr, &w8001->mutex) {
+		if (w8001->open_count == 0) {
+			err = w8001_command(w8001, W8001_CMD_START, false);
+			if (err)
+				return err;
+		}
+
+		w8001->open_count++;
+		return 0;
+	}
+
+	return -EINTR;
+}
+#else
 static int w8001_open(struct input_dev *dev)
 {
 	struct w8001 *w8001 = input_get_drvdata(dev);
@@ -393,17 +413,23 @@ static int w8001_open(struct input_dev *dev)
 	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)
@@ -598,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) {

4.18/wacom_wac.c

@@ -1208,8 +1208,11 @@ static int int_dist(int x1, int y1, int x2, int y2)
 static void wacom_intuos_bt_process_data(struct wacom_wac *wacom,
 		unsigned char *data)
 {
-	memcpy(wacom->data, data, 10);
+	u8 *saved_data = wacom->data;
+
+	wacom->data = data;
 	wacom_intuos_irq(wacom);
+	wacom->data = saved_data;
 
 	input_sync(wacom->pen_input);
 	if (wacom->pad_input)
@@ -1218,7 +1221,7 @@ static void wacom_intuos_bt_process_data(struct wacom_wac *wacom,
 
 static int wacom_intuos_bt_irq(struct wacom_wac *wacom, size_t len)
 {
-	u8 *data = kmemdup(wacom->data, len, GFP_KERNEL);
+	u8 *data = wacom->data;
 	int i = 1;
 	unsigned power_raw, battery_capacity, bat_charging, ps_connected;
 
@@ -1258,7 +1261,6 @@ static int wacom_intuos_bt_irq(struct wacom_wac *wacom, size_t len)
 		break;
 	}
 
-	kfree(data);
 	return 0;
 }
 

4.18/wacom_wac.h

@@ -322,6 +322,7 @@ struct wacom_shared {
 struct hid_data {
 	__s16 inputmode;	/* InputMode HID feature, -1 if non-existent */
 	__s16 inputmode_index;	/* InputMode HID feature index in the report */
+	__s16 inputmode_field_index; /* InputMode HID feature field index in the report */
 	bool sense_state;
 	bool inrange_state;
 	bool eraser;