Commit 0b028189 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull HID fixes from Benjamin Tissoires:

 - fix potential infinite loop with a badly crafted HID device (Xin
   Zhao)

 - fix regression from 6.1 in USB logitech devices potentially making
   their mouse wheel not working (Bastien Nocera)

 - clean up in AMD sensors, which fixes a long time resume bug (Mario
   Limonciello)

 - few device small fixes and quirks

* tag 'for-linus-2023020901' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid:
  HID: Ignore battery for ELAN touchscreen 29DF on HP
  HID: amd_sfh: if no sensors are enabled, clean up
  HID: logitech: Disable hi-res scrolling on USB
  HID: core: Fix deadloop in hid_apply_multiplier.
  HID: Ignore battery for Elan touchscreen on Asus TP420IA
  HID: elecom: add support for TrackBall 056E:011C
parents 94a1f56d ebebf05a

drivers/hid/amd-sfh-hid/amd_sfh_client.c

+11 −2
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata) 
	cl_data->num_hid_devices = amd_mp2_get_sensor_num(privdata, &cl_data->sensor_idx[0]);

	if (cl_data->num_hid_devices == 0)

		return -ENODEV;

	cl_data->is_any_sensor_enabled = false;



	INIT_DELAYED_WORK(&cl_data->work, amd_sfh_work);

	INIT_DELAYED_WORK(&cl_data->work_buffer, amd_sfh_work_buffer);
@@ -287,6 +288,7 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata) 
		status = amd_sfh_wait_for_response

				(privdata, cl_data->sensor_idx[i], SENSOR_ENABLED);

		if (status == SENSOR_ENABLED) {

			cl_data->is_any_sensor_enabled = true;

			cl_data->sensor_sts[i] = SENSOR_ENABLED;

			rc = amdtp_hid_probe(cl_data->cur_hid_dev, cl_data);

			if (rc) {
@@ -301,19 +303,26 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata) 
					cl_data->sensor_sts[i]);

				goto cleanup;

			}

		} else {

			cl_data->sensor_sts[i] = SENSOR_DISABLED;

			dev_dbg(dev, "sid 0x%x (%s) status 0x%x\n",

				cl_data->sensor_idx[i],

				get_sensor_name(cl_data->sensor_idx[i]),

				cl_data->sensor_sts[i]);

		}

		dev_dbg(dev, "sid 0x%x (%s) status 0x%x\n",

			cl_data->sensor_idx[i], get_sensor_name(cl_data->sensor_idx[i]),

			cl_data->sensor_sts[i]);

	}

	if (mp2_ops->discovery_status && mp2_ops->discovery_status(privdata) == 0) {

	if (!cl_data->is_any_sensor_enabled ||

	   (mp2_ops->discovery_status && mp2_ops->discovery_status(privdata) == 0)) {

		amd_sfh_hid_client_deinit(privdata);

		for (i = 0; i < cl_data->num_hid_devices; i++) {

			devm_kfree(dev, cl_data->feature_report[i]);

			devm_kfree(dev, in_data->input_report[i]);

			devm_kfree(dev, cl_data->report_descr[i]);

		}

		dev_warn(dev, "Failed to discover, sensors not enabled\n");

		dev_warn(dev, "Failed to discover, sensors not enabled is %d\n", cl_data->is_any_sensor_enabled);

		return -EOPNOTSUPP;

	}

	schedule_delayed_work(&cl_data->work_buffer, msecs_to_jiffies(AMD_SFH_IDLE_LOOP));

drivers/hid/amd-sfh-hid/amd_sfh_hid.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ struct amd_input_data { 
struct amdtp_cl_data {

	u8 init_done;

	u32 cur_hid_dev;

	bool is_any_sensor_enabled;

	u32 hid_dev_count;

	u32 num_hid_devices;

	struct device_info *hid_devices;

drivers/hid/hid-core.c

+3 −0
Original line number Diff line number Diff line
@@ -1202,6 +1202,7 @@ int hid_open_report(struct hid_device *device) 
	__u8 *end;

	__u8 *next;

	int ret;

	int i;

	static int (*dispatch_type[])(struct hid_parser *parser,

				      struct hid_item *item) = {

		hid_parser_main,
@@ -1252,6 +1253,8 @@ int hid_open_report(struct hid_device *device) 
		goto err;

	}

	device->collection_size = HID_DEFAULT_NUM_COLLECTIONS;

	for (i = 0; i < HID_DEFAULT_NUM_COLLECTIONS; i++)

		device->collection[i].parent_idx = -1;



	ret = -EINVAL;

	while ((next = fetch_item(start, end, &item)) != NULL) {

drivers/hid/hid-elecom.c

+14 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 *  Copyright (c) 2017 Alex Manoussakis <amanou@gnu.org>

 *  Copyright (c) 2017 Tomasz Kramkowski <tk@the-tk.com>

 *  Copyright (c) 2020 YOSHIOKA Takuma <lo48576@hard-wi.red>

 *  Copyright (c) 2022 Takahiro Fujii <fujii@xaxxi.net>

 */



/*
@@ -89,7 +90,7 @@ static __u8 *elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
	case USB_DEVICE_ID_ELECOM_M_DT1URBK:

	case USB_DEVICE_ID_ELECOM_M_DT1DRBK:

	case USB_DEVICE_ID_ELECOM_M_HT1URBK:

	case USB_DEVICE_ID_ELECOM_M_HT1DRBK:

	case USB_DEVICE_ID_ELECOM_M_HT1DRBK_010D:

		/*

		 * Report descriptor format:

		 * 12: button bit count
@@ -99,6 +100,16 @@ static __u8 *elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
		 */

		mouse_button_fixup(hdev, rdesc, *rsize, 12, 30, 14, 20, 8);

		break;

	case USB_DEVICE_ID_ELECOM_M_HT1DRBK_011C:

		/*

		 * Report descriptor format:

		 * 22: button bit count

		 * 30: padding bit count

		 * 24: button report size

		 * 16: button usage maximum

		 */

		mouse_button_fixup(hdev, rdesc, *rsize, 22, 30, 24, 16, 8);

		break;

	}

	return rdesc;

}
@@ -112,7 +123,8 @@ static const struct hid_device_id elecom_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1URBK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_DT1DRBK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1URBK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1DRBK) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1DRBK_010D) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_M_HT1DRBK_011C) },

	{ }

};

MODULE_DEVICE_TABLE(hid, elecom_devices);

drivers/hid/hid-ids.h

+4 −1
Original line number Diff line number Diff line
@@ -413,6 +413,8 @@ 
#define I2C_DEVICE_ID_HP_ENVY_X360_15T_DR100	0x29CF

#define I2C_DEVICE_ID_HP_ENVY_X360_EU0009NV	0x2CF9

#define I2C_DEVICE_ID_HP_SPECTRE_X360_15	0x2817

#define I2C_DEVICE_ID_HP_SPECTRE_X360_13_AW0020NG  0x29DF

#define I2C_DEVICE_ID_ASUS_TP420IA_TOUCHSCREEN 0x2BC8

#define USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN	0x2544

#define USB_DEVICE_ID_ASUS_UX550_TOUCHSCREEN	0x2706

#define I2C_DEVICE_ID_SURFACE_GO_TOUCHSCREEN	0x261A
@@ -428,7 +430,8 @@ 
#define USB_DEVICE_ID_ELECOM_M_DT1URBK	0x00fe

#define USB_DEVICE_ID_ELECOM_M_DT1DRBK	0x00ff

#define USB_DEVICE_ID_ELECOM_M_HT1URBK	0x010c

#define USB_DEVICE_ID_ELECOM_M_HT1DRBK	0x010d

#define USB_DEVICE_ID_ELECOM_M_HT1DRBK_010D	0x010d

#define USB_DEVICE_ID_ELECOM_M_HT1DRBK_011C	0x011c



#define USB_VENDOR_ID_DREAM_CHEEKY	0x1d34

#define USB_DEVICE_ID_DREAM_CHEEKY_WN	0x0004