github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-06 21:58:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

HID: wacom: Advertise SW_MUTE_DEVICE capability prior to registration

Browse Source 
Input subsystem guidelines require that device capabilities are advertised
before the input device is registered.  The Wacom driver was violating
this by advertising the SW_MUTE_DEVICE capability post-registration in
wacom_set_shared_values() (and duplicating it in device-specific setup
cases).

Resolve this by moving the SW_MUTE_DEVICE capability setup to
wacom_setup_touch_input_capabilities() for all touch devices that support
it.

For generic touch devices whose capabilities depend on mute switch
usages parsed from a sibling Pen/Pad interface, defer registration
with -EPROBE_DEFER until the sibling has parsed its descriptors and
initialized shared capabilities.

Cc: stable@vger.kernel.org
Fixes: d2ec58aee8 ("HID: wacom: generic: support generic touch switch")
Signed-off-by: Lee Jones <lee@kernel.org>
Acked-by: Ping Cheng <ping.cheng@wacom.com>
Tested-by: Ping Cheng <ping.cheng@wacom.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
This commit is contained in:
Lee Jones 2026-09-09 11:12:24 +00:00 committed by Jiri Kosina
parent 86472508a7
commit ba16e5ffba
2 changed files with 80 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
drivers/hid/wacom_sys.c
View File

@ -907,19 +907,14 @@ static int wacom_add_shared_data(struct hid_device *hdev)
list_add_tail(&data->list, &wacom_udev_list);
}
mutex_unlock(&wacom_udev_list_lock);
wacom_wac->shared = &data->shared;
if (wacom_wac->has_mute_touch_switch)
WRITE_ONCE(wacom_wac->shared->has_mute_touch_switch, true);
mutex_unlock(&wacom_udev_list_lock);
retval = devm_add_action_or_reset(&hdev->dev, wacom_remove_shared_data, wacom);
if (retval)
return retval;
if (wacom_wac->features.device_type & WACOM_DEVICETYPE_TOUCH)
wacom_wac->shared->touch = hdev;
else if (wacom_wac->features.device_type & WACOM_DEVICETYPE_PEN)
wacom_wac->shared->pen = hdev;
return retval;
}
@ -2343,13 +2338,12 @@ static void wacom_release_resources(struct wacom *wacom)
static void wacom_set_shared_values(struct wacom_wac *wacom_wac)
{
if (wacom_wac->features.device_type & WACOM_DEVICETYPE_TOUCH) {
wacom_wac->shared->type = wacom_wac->features.type;
wacom_wac->shared->touch_input = wacom_wac->touch_input;
}
struct wacom *wacom = container_of(wacom_wac, struct wacom, wacom_wac);
guard(mutex)(&wacom_udev_list_lock);
if (wacom_wac->has_mute_touch_switch) {
wacom_wac->shared->has_mute_touch_switch = true;
WRITE_ONCE(wacom_wac->shared->has_mute_touch_switch, true);
/* Hardware touch switch may be off. Wait until
* we know the switch state to decide is_touch_on.
* Softkey state should be initialized to "on" to
@ -2359,14 +2353,69 @@ static void wacom_set_shared_values(struct wacom_wac *wacom_wac)
wacom_wac->shared->is_touch_on = true;
}
if (wacom_wac->shared->has_mute_touch_switch &&
wacom_wac->shared->touch_input) {
set_bit(EV_SW, wacom_wac->shared->touch_input->evbit);
input_set_capability(wacom_wac->shared->touch_input, EV_SW,
SW_MUTE_DEVICE);
if (wacom_wac->features.device_type & WACOM_DEVICETYPE_TOUCH) {
wacom_wac->shared->type = wacom_wac->features.type;
wacom_wac->shared->touch_input = wacom_wac->touch_input;
wacom_wac->shared->touch = wacom->hdev;
} else if (wacom_wac->features.device_type & WACOM_DEVICETYPE_PEN) {
/* Pairs with smp_load_acquire() in wacom_sibling_pending() */
smp_store_release(&wacom_wac->shared->pen, wacom->hdev);
}
}
static bool wacom_sibling_pending(struct wacom *wacom)
{
const struct wacom_features *features = &wacom->wacom_wac.features;
struct hid_device *hdev = wacom->hdev;
struct usb_interface *sibling_intf;
int ifnum;
if (features->type != HID_GENERIC ||
!(features->device_type & WACOM_DEVICETYPE_TOUCH))
return false;
if (wacom->wacom_wac.shared) {
/* Pairs with smp_store_release() in wacom_set_shared_values() */
if (smp_load_acquire(&wacom->wacom_wac.shared->pen))
return false;
}
if (!hid_is_usb(hdev) || !wacom->usbdev || !wacom->intf ||
!wacom->intf->cur_altsetting)
return false;
ifnum = wacom->intf->cur_altsetting->desc.bInterfaceNumber;
/*
* On composite Wacom devices, the Pen interface is always interface 0.
* If the Touch interface is interface 0, there is no sibling Pen
* interface on this device (standalone touch device).
*/
if (ifnum == 0)
return false;
/* Look for the sibling Pen interface at interface 0 */
sibling_intf = usb_ifnum_to_if(wacom->usbdev, 0);
if (!sibling_intf || !sibling_intf->cur_altsetting)
return false;
if (sibling_intf->cur_altsetting->desc.bInterfaceClass !=
USB_INTERFACE_CLASS_HID)
return false;
if (sibling_intf->cur_altsetting->desc.bInterfaceSubClass == 1 &&
(sibling_intf->cur_altsetting->desc.bInterfaceProtocol == 1 ||
sibling_intf->cur_altsetting->desc.bInterfaceProtocol == 2))
return false;
/*
* Interface 0 is a candidate HID interface on this composite device
* whose probe has not completed yet (shared->pen is NULL). Defer until
* interface 0 finishes probing and registers shared values.
*/
return true;
}
static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
{
struct wacom_wac *wacom_wac = &wacom->wacom_wac;
@ -2444,6 +2493,11 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
if (error)
goto fail;
if (wacom_sibling_pending(wacom)) {
error = -EPROBE_DEFER;
goto fail;
}
error = wacom_setup_inputs(wacom);
if (error)
goto fail;
@ -2501,6 +2555,7 @@ static int wacom_parse_and_register(struct wacom *wacom, bool wireless)
fail_hw_stop:
hid_hw_stop(hdev);
cancel_delayed_work_sync(&wacom->init_work);
fail:
wacom_release_resources(wacom);
return error;

5
drivers/hid/wacom_wac.c
View File

@ -3978,6 +3978,11 @@ int wacom_setup_touch_input_capabilities(struct input_dev *input_dev,
if (features->type == HID_GENERIC) {
hid_dbg(hdev, "generic touch setup\n");
if (wacom_wac->has_mute_touch_switch ||
(wacom_wac->shared && READ_ONCE(wacom_wac->shared->has_mute_touch_switch))) {
input_set_capability(input_dev, EV_SW, SW_MUTE_DEVICE);
wacom_wac->has_mute_touch_switch = true;
}
/* setup has already been done */
return 0;
}