From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f175.google.com (mail-qk1-f175.google.com [209.85.222.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF1E23644C3 for ; Tue, 14 Jul 2026 10:12:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784023968; cv=none; b=JJ59XZurDyoME4SMlOW01YFiL/ihTY/GkZBP3pTvpReFcyYMhQM1yCE8OCqiv0nM0rmoFAbvPZ8qd/VQe5+fDCHMy+2QfywzXiqnsQKW9UIGbTkPs0Wpetac/qDfwQZqmXPLj9PVULH+1QNqVqaKD9N8ChTIMwdrINV4xFEhWrA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784023968; c=relaxed/simple; bh=2rfBDz6/aloAhda8Bjfwnb+C9SSh/0BYfqyneCTuzHE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ac3g+wvNaiRiz2+iSRB2l0H4yfp+hE1zZ/N94OxB2id4YTH08xd7vQ2yEjpd7up79ZQ4FD9JatI3z43qREtUhnpZIETTKNuE3H/9gTvhmBbgCT5JC0u0FOp68rI2cjpqLA5RO0fvYRFiYR8hrgrI9BuleZvzZ6WI1UXYheta5r0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=aHLPBcCx; arc=none smtp.client-ip=209.85.222.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="aHLPBcCx" Received: by mail-qk1-f175.google.com with SMTP id af79cd13be357-92e5cb052edso65087785a.2 for ; Tue, 14 Jul 2026 03:12:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784023965; x=1784628765; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=fYpfVNjMZg6VKmRPIHIJ/7Pqr/xSIkWL+N548aPvh7g=; b=aHLPBcCxuQVJjBfL7xnqp28wn4koh70LBcUjbdAS6ZLisC+LpHQme7JMV16jF9lLW9 lq3f7TlJTLFc5XSRNCAxlEUvTHwcW2211/BErjeqGjNYBP/e+F684jd6u4t4ROMQGCdP NQtkozEBArPyv7NBuxou2UFQ+/JbeY2dKVRsknjQCckqDBL/R9NruO7mzoXNIRCJil0l TN8BMnLNOYXNikOLIUqBiMXR/Va89e3eLi6KbRzoVy6fDGAaEBI9znojcD90Rgk4UyIL tIaj/B0iLUpsJzKeZT19vRVyLmCaaSM7Pgt32THT4zkS+cONc4grZjKIbknkED1+vf6p 5ccg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784023965; x=1784628765; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=fYpfVNjMZg6VKmRPIHIJ/7Pqr/xSIkWL+N548aPvh7g=; b=DvLe7GFV0me85YukvpoVqwwI+gQb9WGh+ME3Vekp2h31OHpgz3vJSdNyNMtLzxFDM0 VvEzFFGaKmD/l0WhSiNkOq8gVt83AI+V6KejJTsKv2lYUH1S1AWsbd/WXipPBtbVEIAA 0H9I1bRQQ/GtU91Gn9wOYfQlCz4cvwlo07zrK8MegwsiDcTAMrfmdVqGlN3WrIEEJsau Y7vLZP8S8GYpvvRmDdgur387cBvp4C4tx/R6hh9QhakGf+xu2oKD/7L/wsIChCkhv+PZ 8y9k0hGJQvuF/C51IX1n1canYKzWE3APW/vBAuPtUYJQnC+DmD7PU10OhwkgBHcgmDAJ Z9ng== X-Gm-Message-State: AOJu0YySxOSP6tixnpoTah15g5QAalhXZS+Q4v7OHgQJuLQY1VgXk+bt lR3yDL4Rj6vk0JndwnagjWTvjbLuixdCvZk1yBy1iI8cDOKs3FWaNNhq X-Gm-Gg: AfdE7cmA7KYTCfmrq4gxScwaITEQnGf29X1sPrC6EHsqzGUJwz1Btcyq5Ruo8T9AFfh jzq6+6+GAXIu+TDG3eRHqboBP+1vpKBSk7ucO8xyaz+H+BbXlVG0M/fhO4bWrvRi3JRG95r/A5I wwGZCTED+LcWv0frCp2ekEXXhGdlr6Fz9swlSlpOwHiAPoQIZCGOCokXQloOWjDQXH2Xl9REY8+ 563lGaMXaFNQtzXm0ATA2otFIw7icpKoClvIBNM3N9aJ18s72jitFXapvD99mWVX0uvolUDOQ1Z gxJyqYXFHPmuWjcT2TLEwskNVet9uWEOWyaCS40tCyrJKUHRqV8WkIuVNbZ7BL01nfbcgvdV1iI 9NTxrho2INnss1eVNpdYgWUPiuOv7Di6zuD30X1nH1TwEv4r118oXhSF9lt/Z1FKGcSqXIh8rfB 3QV6ji8weq9nE/67S5xpah0nmuDGx4uGJ697eVnS6Rep85 X-Received: by 2002:a05:620a:1991:b0:916:1806:302d with SMTP id af79cd13be357-92ef2bc9bc6mr1331703885a.58.1784023965571; Tue, 14 Jul 2026 03:12:45 -0700 (PDT) Received: from FairplayBox ([2601:5cf:837e:d920::f9a2]) by smtp.gmail.com with ESMTPSA id af79cd13be357-92ee5cfcb0dsm1463056185a.25.2026.07.14.03.12.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Jul 2026 03:12:45 -0700 (PDT) From: Alec Hall To: Jiri Kosina , Benjamin Tissoires , linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alec Hall Subject: [PATCH 3/3] HID: magicmouse: report charge status over Bluetooth Date: Tue, 14 Jul 2026 06:12:35 -0400 Message-ID: <20260714101235.99447-4-signshop.alec@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260714101235.99447-1-signshop.alec@gmail.com> References: <20260714101235.99447-1-signshop.alec@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Battery input report 0x90 carries a status byte that the generic HID battery code does not map to HID_BAT_CHARGING, so charge_status keeps its POWER_SUPPLY_STATUS_DISCHARGING default and user space never learns whether the device is on external power (e.g. a Magic Trackpad 2 shows "discharging" by default even while charging, and cannot report "discharging" the moment the cable is pulled at 100%). Parse the status byte in raw_event and set the battery charge status accordingly (bit 1 = external power, bit 0 = charge complete), notifying user space with power_supply_changed(). The bit meanings were determined by observation on a Magic Trackpad 2 rather than from documentation. Assisted-by: Claude:claude-opus-4-8 Signed-off-by: Alec Hall --- drivers/hid/hid-magicmouse.c | 37 ++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 6d0e76314b10..8bb791efef3a 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c @@ -17,6 +17,7 @@ #include #include #include +#include #include "hid-ids.h" @@ -60,6 +61,10 @@ MODULE_PARM_DESC(report_undeciphered, "Report undeciphered multi-touch state fie #define MOUSE_REPORT_ID 0x29 #define MOUSE2_REPORT_ID 0x12 #define DOUBLE_REPORT_ID 0xf7 +/* Battery Input Report 0x90 = [report_id, status, capacity]. */ +#define MAGICMOUSE_BATTERY_REPORT_ID 0x90 +#define MAGICMOUSE_BATTERY_POWERED 0x02 /* external power connected */ +#define MAGICMOUSE_BATTERY_CHARGED 0x01 /* charge complete (on charger) */ #define USB_BATTERY_TIMEOUT_SEC 60 /* These definitions are not precise, but they're close enough. (Bits @@ -383,6 +388,35 @@ static void magicmouse_emit_touch(struct magicmouse_sc *msc, int raw_id, u8 *tda } } +/* + * The battery report carries a charge-status byte the generic HID battery code + * doesn't map, so translate the vendor status bits into a power_supply status. + * This makes charging/discharging honest -- e.g. "discharging" as soon as the + * cable is pulled, even at 100%. + */ +static void magicmouse_report_charge_status(struct hid_device *hdev, u8 status) +{ +#ifdef CONFIG_HID_BATTERY_STRENGTH + struct hid_battery *bat = hid_get_battery(hdev); + int cs; + + if (!bat || !bat->ps) + return; + + if (!(status & MAGICMOUSE_BATTERY_POWERED)) + cs = POWER_SUPPLY_STATUS_DISCHARGING; + else if (status & MAGICMOUSE_BATTERY_CHARGED) + cs = POWER_SUPPLY_STATUS_FULL; + else + cs = POWER_SUPPLY_STATUS_CHARGING; + + if (bat->charge_status != cs) { + bat->charge_status = cs; + power_supply_changed(bat->ps); + } +#endif +} + static int magicmouse_raw_event(struct hid_device *hdev, struct hid_report *report, u8 *data, int size) { @@ -394,6 +428,9 @@ static int magicmouse_raw_event(struct hid_device *hdev, if (size < 1) return 0; + if (data[0] == MAGICMOUSE_BATTERY_REPORT_ID && size >= 3) + magicmouse_report_charge_status(hdev, data[1]); + switch (data[0]) { case TRACKPAD_REPORT_ID: case TRACKPAD2_BT_REPORT_ID: -- 2.55.0