Merge tag 'for-linus-2023100502' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

Pull HID fixes from Jiri Kosina: - power management fix for intel-ish-hid (Srinivas Pandruvada) - power management fix for hid-nintendo (Martino Fontana) - error handling fixes for nvidia-shield (Christophe JAILLET) - memory leak fix for hid-sony (Christophe JAILLET) - fix for slab out-of-bound write in hid-holtek (Ma Ke) - other assorted smaller fixes and device ID / quirk entry additions * tag 'for-linus-2023100502' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: HID: Add quirk to ignore the touchscreen battery on HP ENVY 15-eu0556ng HID: intel-ish-hid: ipc: Disable and reenable ACPI GPE bit HID: sony: remove duplicate NULL check before calling usb_free_urb() HID: nintendo: reinitialize USB Pro Controller after resuming from suspend HID: nvidia-shield: Fix some missing function calls() in the probe error handling path HID: nvidia-shield: Fix a missing led_classdev_unregister() in the probe error handling path HID: multitouch: Add required quirk for Synaptics 0xcd7e device HID: nvidia-shield: Select POWER_SUPPLY Kconfig option HID: holtek: fix slab-out-of-bounds Write in holtek_kbd_input_event HID: nvidia-shield: add LEDS_CLASS dependency HID: logitech-hidpp: Add Bluetooth ID for the Logitech M720 Triathlon mouse HID: steelseries: Fix signedness bug in steelseries_headset_arctis_1_fetch_battery() HID: sony: Fix a potential memory leak in sony_probe()

Linus Torvalds committed 3 years ago

Commit 19fbf672 parents f291209 b009aa311 files · +135 −76Browse files

Unified · Split

11 files

drivers/hid/Kconfig +2 −0
drivers/hid/hid-holtek-kbd.c +4 −0
drivers/hid/hid-ids.h +1 −0
drivers/hid/hid-input.c +2 −0
drivers/hid/hid-logitech-hidpp.c +2 −0
drivers/hid/hid-multitouch.c +4 −0
drivers/hid/hid-nintendo.c +103 −72
drivers/hid/hid-nvidia-shield.c +6 −3
drivers/hid/hid-sony.c +2 −0
drivers/hid/hid-steelseries.c +1 −1
drivers/hid/intel-ish-hid/ipc/pci-ish.c +8 −0

drivers/hid/Kconfig+2−0

@@ -799,6 +799,8 @@ config HID_NVIDIA_SHIELD · 798 unmodified lines
799	tristate "NVIDIA SHIELD devices"	799	tristate "NVIDIA SHIELD devices"
800	depends on USB_HID	800	depends on USB_HID
801	depends on BT_HIDP	801	depends on BT_HIDP
		802	depends on LEDS_CLASS
		803	select POWER_SUPPLY
802	help	804	help
803	Support for NVIDIA SHIELD accessories.	805	Support for NVIDIA SHIELD accessories.
804		806

drivers/hid/hid-holtek-kbd.c+4−0

 		return -ENODEV;
 	boot_hid = usb_get_intfdata(boot_interface);
+	if (list_empty(&boot_hid->inputs)) {
+		hid_err(hid, "no inputs found\n");
+		return -ENODEV;
+	}
 	boot_hid_input = list_first_entry(&boot_hid->inputs,
 		struct hid_input, list);

drivers/hid/hid-ids.h+1−0

@@ -425,6 +425,7 @@ · 424 unmodified lines
425	#define I2C_DEVICE_ID_HP_SPECTRE_X360_13T_AW100 0x29F5	425	#define I2C_DEVICE_ID_HP_SPECTRE_X360_13T_AW100 0x29F5
426	#define I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V1 0x2BED	426	#define I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V1 0x2BED
427	#define I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V2 0x2BEE	427	#define I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V2 0x2BEE
		428	#define I2C_DEVICE_ID_HP_ENVY_X360_15_EU0556NG 0x2D02
428		429
429	#define USB_VENDOR_ID_ELECOM 0x056e	430	#define USB_VENDOR_ID_ELECOM 0x056e
430	#define USB_DEVICE_ID_ELECOM_BM084 0x0061	431	#define USB_DEVICE_ID_ELECOM_BM084 0x0061

drivers/hid/hid-input.c+2−0

@@ -409,6 +409,8 @@ static const struct hid_device_id hid_battery_quirks[] = { · 408 unmodified lines
409	HID_BATTERY_QUIRK_IGNORE },	409	HID_BATTERY_QUIRK_IGNORE },
410	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V2),	410	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_SPECTRE_X360_14T_EA100_V2),
411	HID_BATTERY_QUIRK_IGNORE },	411	HID_BATTERY_QUIRK_IGNORE },
		412	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15_EU0556NG),
		413	HID_BATTERY_QUIRK_IGNORE },
412	{}	414	{}
413	};	415	};
414		416

drivers/hid/hid-logitech-hidpp.c+2−0

 	  HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb008) },
 	{ /* MX Master mouse over Bluetooth */
 	  HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb012) },
+	{ /* M720 Triathlon mouse over Bluetooth */
+	  HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb015) },
 	{ /* MX Ergo trackball over Bluetooth */
 	  HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb01d) },
 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb01e) },

drivers/hid/hid-multitouch.c+4−0

 			USB_DEVICE_ID_MTP_STM)},
 	/* Synaptics devices */
+	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,
+		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
+			USB_VENDOR_ID_SYNAPTICS, 0xcd7e) },
 	{ .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT,
 		HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8,
 			USB_VENDOR_ID_SYNAPTICS, 0xce08) },

drivers/hid/hid-nintendo.c+103−72

 	struct joycon_input_report *report;
 	req.subcmd_id = JC_SUBCMD_REQ_DEV_INFO;
+	mutex_lock(&ctlr->output_mutex);
 	ret = joycon_send_subcmd(ctlr, &req, 0, HZ);
+	mutex_unlock(&ctlr->output_mutex);
 	if (ret) {
 		hid_err(ctlr->hdev, "Failed to get joycon info; ret=%d\n", ret);
 		return ret;
 	return 0;
 }
+static int joycon_init(struct hid_device *hdev)
+{
+	struct joycon_ctlr *ctlr = hid_get_drvdata(hdev);
+	int ret = 0;
+	mutex_lock(&ctlr->output_mutex);
+	/* if handshake command fails, assume ble pro controller */
+	if ((jc_type_is_procon(ctlr) || jc_type_is_chrggrip(ctlr)) &&
+	    !joycon_send_usb(ctlr, JC_USB_CMD_HANDSHAKE, HZ)) {
+		hid_dbg(hdev, "detected USB controller\n");
+		/* set baudrate for improved latency */
+		ret = joycon_send_usb(ctlr, JC_USB_CMD_BAUDRATE_3M, HZ);
+		if (ret) {
+			hid_err(hdev, "Failed to set baudrate; ret=%d\n", ret);
+			goto out_unlock;
+		}
+		/* handshake */
+		ret = joycon_send_usb(ctlr, JC_USB_CMD_HANDSHAKE, HZ);
+		if (ret) {
+			hid_err(hdev, "Failed handshake; ret=%d\n", ret);
+			goto out_unlock;
+		}
+		/*
+		 * Set no timeout (to keep controller in USB mode).
+		 * This doesn't send a response, so ignore the timeout.
+		 */
+		joycon_send_usb(ctlr, JC_USB_CMD_NO_TIMEOUT, HZ/10);
+	} else if (jc_type_is_chrggrip(ctlr)) {
+		hid_err(hdev, "Failed charging grip handshake\n");
+		ret = -ETIMEDOUT;
+		goto out_unlock;
+	}
+	/* get controller calibration data, and parse it */
+	ret = joycon_request_calibration(ctlr);
+	if (ret) {
+		/*
+		 * We can function with default calibration, but it may be
+		 * inaccurate. Provide a warning, and continue on.
+		 */
+		hid_warn(hdev, "Analog stick positions may be inaccurate\n");
+	}
+	/* get IMU calibration data, and parse it */
+	ret = joycon_request_imu_calibration(ctlr);
+	if (ret) {
+		/*
+		 * We can function with default calibration, but it may be
+		 * inaccurate. Provide a warning, and continue on.
+		 */
+		hid_warn(hdev, "Unable to read IMU calibration data\n");
+	}
+	/* Set the reporting mode to 0x30, which is the full report mode */
+	ret = joycon_set_report_mode(ctlr);
+	if (ret) {
+		hid_err(hdev, "Failed to set report mode; ret=%d\n", ret);
+		goto out_unlock;
+	}
+	/* Enable rumble */
+	ret = joycon_enable_rumble(ctlr);
+	if (ret) {
+		hid_err(hdev, "Failed to enable rumble; ret=%d\n", ret);
+		goto out_unlock;
+	}
+	/* Enable the IMU */
+	ret = joycon_enable_imu(ctlr);
+	if (ret) {
+		hid_err(hdev, "Failed to enable the IMU; ret=%d\n", ret);
+		goto out_unlock;
+	}
+out_unlock:
+	mutex_unlock(&ctlr->output_mutex);
+	return ret;
+}
 /* Common handler for parsing inputs */
 static int joycon_ctlr_read_handler(struct joycon_ctlr *ctlr, u8 *data,
 							      int size)
 	hid_device_io_start(hdev);
-	/* Initialize the controller */
+	ret = joycon_init(hdev);
-	mutex_lock(&ctlr->output_mutex);
-	/* if handshake command fails, assume ble pro controller */
-	if ((jc_type_is_procon(ctlr) || jc_type_is_chrggrip(ctlr)) &&
-	    !joycon_send_usb(ctlr, JC_USB_CMD_HANDSHAKE, HZ)) {
-		hid_dbg(hdev, "detected USB controller\n");
-		/* set baudrate for improved latency */
-		ret = joycon_send_usb(ctlr, JC_USB_CMD_BAUDRATE_3M, HZ);
-		if (ret) {
-			hid_err(hdev, "Failed to set baudrate; ret=%d\n", ret);
-			goto err_mutex;
-		}
-		/* handshake */
-		ret = joycon_send_usb(ctlr, JC_USB_CMD_HANDSHAKE, HZ);
-		if (ret) {
-			hid_err(hdev, "Failed handshake; ret=%d\n", ret);
-			goto err_mutex;
-		}
-		/*
-		 * Set no timeout (to keep controller in USB mode).
-		 * This doesn't send a response, so ignore the timeout.
-		 */
-		joycon_send_usb(ctlr, JC_USB_CMD_NO_TIMEOUT, HZ/10);
-	} else if (jc_type_is_chrggrip(ctlr)) {
-		hid_err(hdev, "Failed charging grip handshake\n");
-		ret = -ETIMEDOUT;
-		goto err_mutex;
-	}
-	/* get controller calibration data, and parse it */
-	ret = joycon_request_calibration(ctlr);
 	if (ret) {
-		/*
+		hid_err(hdev, "Failed to initialize controller; ret=%d\n", ret);
-		 * We can function with default calibration, but it may be
+		goto err_close;
-		 * inaccurate. Provide a warning, and continue on.
-		 */
-		hid_warn(hdev, "Analog stick positions may be inaccurate\n");
-	}
-	/* get IMU calibration data, and parse it */
-	ret = joycon_request_imu_calibration(ctlr);
-	if (ret) {
-		/*
-		 * We can function with default calibration, but it may be
-		 * inaccurate. Provide a warning, and continue on.
-		 */
-		hid_warn(hdev, "Unable to read IMU calibration data\n");
-	}
-	/* Set the reporting mode to 0x30, which is the full report mode */
-	ret = joycon_set_report_mode(ctlr);
-	if (ret) {
-		hid_err(hdev, "Failed to set report mode; ret=%d\n", ret);
-		goto err_mutex;
-	}
-	/* Enable rumble */
-	ret = joycon_enable_rumble(ctlr);
-	if (ret) {
-		hid_err(hdev, "Failed to enable rumble; ret=%d\n", ret);
-		goto err_mutex;
-	}
-	/* Enable the IMU */
-	ret = joycon_enable_imu(ctlr);
-	if (ret) {
-		hid_err(hdev, "Failed to enable the IMU; ret=%d\n", ret);
-		goto err_mutex;
 	}
 	ret = joycon_read_info(ctlr);
 	if (ret) {
 		hid_err(hdev, "Failed to retrieve controller info; ret=%d\n",
 			ret);
-		goto err_mutex;
+		goto err_close;
 	}
-	mutex_unlock(&ctlr->output_mutex);
 	/* Initialize the leds */
 	ret = joycon_leds_create(ctlr);
 	if (ret) {
 	hid_dbg(hdev, "probe - success\n");
 	return 0;
-err_mutex:
-	mutex_unlock(&ctlr->output_mutex);
 err_close:
 	hid_hw_close(hdev);
 err_stop:
 	hid_hw_stop(hdev);
 }
+#ifdef CONFIG_PM
+static int nintendo_hid_resume(struct hid_device *hdev)
+{
+	int ret = joycon_init(hdev);
+	if (ret)
+		hid_err(hdev, "Failed to restore controller after resume");
+	return ret;
+}
+#endif
 static const struct hid_device_id nintendo_hid_devices[] = {
 	{ HID_USB_DEVICE(USB_VENDOR_ID_NINTENDO,
 			 USB_DEVICE_ID_NINTENDO_PROCON) },
 	.probe		= nintendo_hid_probe,
 	.remove		= nintendo_hid_remove,
 	.raw_event	= nintendo_hid_event,
+#ifdef CONFIG_PM
+	.resume		= nintendo_hid_resume,
+#endif
 };
 module_hid_driver(nintendo_hid_driver);

drivers/hid/hid-nvidia-shield.c+6−3

 	led->name = devm_kasprintf(&ts->base.hdev->dev, GFP_KERNEL,
 				   "thunderstrike%d:blue:led", ts->id);
 	led->max_brightness = 1;
-	led->flags = LED_CORE_SUSPENDRESUME;
+	led->flags = LED_CORE_SUSPENDRESUME | LED_RETAIN_AT_SHUTDOWN;
 	led->brightness_get = &thunderstrike_led_get_brightness;
 	led->brightness_set = &thunderstrike_led_set_brightness;
 	ret = hid_hw_start(hdev, HID_CONNECT_HIDINPUT);
 	if (ret) {
 		hid_err(hdev, "Failed to start HID device\n");
-		goto err_haptics;
+		goto err_ts_create;
 	}
 	ret = hid_hw_open(hdev);
 err_stop:
 	hid_hw_stop(hdev);
-err_haptics:
+err_ts_create:
+	power_supply_unregister(ts->base.battery_dev.psy);
 	if (ts->haptics_dev)
 		input_unregister_device(ts->haptics_dev);
+	led_classdev_unregister(&ts->led_dev);
+	ida_free(&thunderstrike_ida, ts->id);
 	return ret;
 }

drivers/hid/hid-sony.c+2−0

@@ -2155,6 +2155,8 @@ static int sony_probe(struct hid_device hdev, const struct hid_device_id id) · 2154 unmodified lines
2155	return ret;	2155	return ret;
2156		2156
2157	err:	2157	err:
		2158	usb_free_urb(sc->ghl_urb);
		2159
2158	hid_hw_stop(hdev);	2160	hid_hw_stop(hdev);
2159	return ret;	2161	return ret;
2160	}	2162	}

drivers/hid/hid-steelseries.c+1−1

@@ -390,7 +390,7 @@ static int steelseries_headset_arctis_1_fetch_battery(struct hid_device *hdev) · 389 unmodified lines
390	ret = hid_hw_raw_request(hdev, arctis_1_battery_request[0],	390	ret = hid_hw_raw_request(hdev, arctis_1_battery_request[0],
391	write_buf, sizeof(arctis_1_battery_request),	391	write_buf, sizeof(arctis_1_battery_request),
392	HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);	392	HID_OUTPUT_REPORT, HID_REQ_SET_REPORT);
393	if (ret < sizeof(arctis_1_battery_request)) {	393	if (ret < (int)sizeof(arctis_1_battery_request)) {
394	hid_err(hdev, "hid_hw_raw_request() failed with %d\n", ret);	394	hid_err(hdev, "hid_hw_raw_request() failed with %d\n", ret);
395	ret = -ENODATA;	395	ret = -ENODATA;
396	}	396	}

drivers/hid/intel-ish-hid/ipc/pci-ish.c+8−0

@@ -133,6 +133,14 @@ static int enable_gpe(struct device *dev) · 132 unmodified lines
133	}	133	}
134	wakeup = &adev->wakeup;	134	wakeup = &adev->wakeup;
135		135
		136	/*
		137	* Call acpi_disable_gpe(), so that reference count
		138	* gpe_event_info->runtime_count doesn't overflow.
		139	* When gpe_event_info->runtime_count = 0, the call
		140	* to acpi_disable_gpe() simply return.
		141	*/
		142	acpi_disable_gpe(wakeup->gpe_device, wakeup->gpe_number);
		143
136	acpi_sts = acpi_enable_gpe(wakeup->gpe_device, wakeup->gpe_number);	144	acpi_sts = acpi_enable_gpe(wakeup->gpe_device, wakeup->gpe_number);
137	if (ACPI_FAILURE(acpi_sts)) {	145	if (ACPI_FAILURE(acpi_sts)) {
138	dev_err(dev, "enable ose_gpe failed\n");	146	dev_err(dev, "enable ose_gpe failed\n");

Merge tag 'for-linus-2023100502' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code