From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB351481FD9; Tue, 25 Aug 2026 13:46:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787665604; cv=none; b=ihAcHO8UWBsmxHApG0S3siXO+RF0Vjfh2LJZG08n176uwsfL3HMNzSkP0knevDw5U86FmtlTLV/vnVzxA5jfQBnnN3bySagLGx/9i5/Knlfxn2JcIFlXgAYKKMP2JdJuy/0TK+EmuuZydd41cUMiQcSc59dBf3CX6PKS/WEDZYU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787665604; c=relaxed/simple; bh=iEt7GYwwnaUiIm7UwYpbLfbhI/FAJGq7Z7i/QGf5twQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tsTkxMlf+RKfId2iBkESL29lsmQsks9tJFiDVAHv0Qd6S37xgzIDLtBs2vN8kA3Yl4B5TYr/j2ufgvHZU5iwv4EUu0MHYnWbnACdyAQHBPBUxfx6ytNKQQDxvkXHIBPKuAC9cnu3OJgnP4k5WgfFUtiJZadduFP01wdahQDWd4Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uDO00QeI; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="uDO00QeI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A42E1F000E9; Tue, 25 Aug 2026 13:46:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787665599; bh=wO7nnCf3ISXIw2AEZeHznyO8l+GdJhpVFR5qkx4ta0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uDO00QeIxEbQTOW4f/QkRsUucQGtYqgLieQzANpl2OnJZ3OtFfrfJ5KkowqMJixMc bPbb5qfCN/Buw2brfUOGi9dlcPBratSfNwUSPJc+i3a4G4QBgDUJfR1/FT0LJ91s4x uyNpfp/eMR7SnNDuiuH9iux7tvJ6An79Ky3q8Z+0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Christopher Kodama , Jiri Kosina Subject: [PATCH 6.12 58/77] HID: magicmouse: re-enable multitouch after reset-resume Date: Tue, 25 Aug 2026 15:26:20 +0200 Message-ID: <20260825132543.839707899@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260825132541.580275153@linuxfoundation.org> References: <20260825132541.580275153@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christopher Kodama commit 4253fe22b137c4ee68f36b707fdb1b44b191edc4 upstream. When the Apple Magic Trackpad 2 (USB) is reset across a power transition (e.g. resume from hibernation) it drops out of multitouch mode: it keeps sending report ID 0x02 on its HID_TYPE_USBMOUSE interface, but the packet shrinks from 21 to 8 bytes and the trackpad2 handler drops it (size < 12). Clicks still work but pointer motion is lost until the device is re-plugged or the driver reloaded. Re-enable multitouch from .reset_resume via the workqueue. Only .reset_resume is needed; suspend-to-idle keeps the device powered and retains multitouch. Fixes: 87a2f10395c8 ("HID: magicmouse: Apple Magic Trackpad 2 USB-C driver support") Cc: stable@vger.kernel.org Assisted-by: Claude-Code:claude-opus-4-8 Signed-off-by: Christopher Kodama Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman --- drivers/hid/hid-magicmouse.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -970,6 +970,22 @@ static void magicmouse_remove(struct hid hid_hw_stop(hdev); } +#ifdef CONFIG_PM +static int magicmouse_reset_resume(struct hid_device *hdev) +{ + struct magicmouse_sc *msc = hid_get_drvdata(hdev); + + /* The device drops out of multitouch mode on resume; re-send the + * enable report. Only the HID_TYPE_USBMOUSE interface accepts it, and + * it must be deferred. Sending it inline here is too early. + */ + if (msc && hdev->type == HID_TYPE_USBMOUSE) + schedule_delayed_work(&msc->work, msecs_to_jiffies(500)); + + return 0; +} +#endif + static const __u8 *magicmouse_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) { @@ -1029,6 +1045,9 @@ static struct hid_driver magicmouse_driv .event = magicmouse_event, .input_mapping = magicmouse_input_mapping, .input_configured = magicmouse_input_configured, +#ifdef CONFIG_PM + .reset_resume = magicmouse_reset_resume, +#endif }; module_hid_driver(magicmouse_driver);