From nobody Mon Jun 8 18:55:23 2026 Received: from mail-yw1-f169.google.com (mail-yw1-f169.google.com [209.85.128.169]) (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 B58AE3FD15E for ; Wed, 27 May 2026 12:27:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779884834; cv=none; b=Wl3Kd1wD7i27RL8z8/8hBIPfNaNRc2rMtU7+bWksh/JdOvZ46Qh/RYvmMIRoHcJrgyEGzGKg3lqTaQLXGEqO6NAInwKUt5zuEtUR6blEl1taiC1jAnLXaL4STSHeiBt6HKa9hLkqBPkl+kJoNIXBdf7gcb5L+u5uDSp8iKf358w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779884834; c=relaxed/simple; bh=E3MhODjW3GqLgnst8gUFBV/XIjmEV1CCo/PYzrNhjsw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rVeIXfssj/kC/CpOSUnFlUawWgdk5Vj0zrV8rYySJrgOLvys3r+AxvfkWMFgyoti5zlOsYR+syNEBjvuCAA3+cqi9eLHxX+nNsbk993N4X5Ud5fho3ew567B+tx2hOwV0zpaKBDK7AQLQrQpho3UbhcXEqVxc1eDXvXkIyDoqMI= 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=oBmHBNFm; arc=none smtp.client-ip=209.85.128.169 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="oBmHBNFm" Received: by mail-yw1-f169.google.com with SMTP id 00721157ae682-7d1bcb92072so66372597b3.1 for ; Wed, 27 May 2026 05:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779884831; x=1780489631; 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; bh=rWrEjBrl0vA7XJPIp0eMaT9Ioa30kwKnMaMfiWNApUY=; b=oBmHBNFmOpgnpsxyjBKfJi9M4JnTnkiHdGqNYUAO/eApYkIJmBIetpyHpR4tw9YWAR LHkOPBAi/WZx6OM90a0oeTtBF9ei10X/a6QqNIdkXtbxsAsGa4hmRcPxBkguPj2Ac8Qa 5gbJUSKgK5rSPBVFqohF8WDiqlfsDhkIQAgKcofJRN8dDfunUwZ8MZchjTvJqDMDZ6gu CmtYqV6AHDtu7j3QkKuVSZFYqQBB5vbCu7OtHVQQeAI6g5CHn0fz9n1l4zezOof/6uQB 9YMiANLqdlaJ+q7s2Mpa0ux6YeI7Yt3cNK8YL6UfZxKFeNYxsxE2LnfUlYHJJTQTOUd9 54Ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779884831; x=1780489631; 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; bh=rWrEjBrl0vA7XJPIp0eMaT9Ioa30kwKnMaMfiWNApUY=; b=jIoPDZ95cZnEifI3oVmtL8gRIm2d0QiK6ZyimvABYZp2OI6ecULssvhpkxDFSdidKJ k8OoQO6T8cEQsY6DTYLJ2OlbfN5ieGNqRi0R3CO4lhi9vTBHywizmF8zI9VNL6iIXYZh NZlHrGrAdmLbGw7Rh3tcfwpg9BYG43405YrDFcv/TLgBay0hDsHuwI7pyi8kcKiJX0np jO5bFqZwYvy9CR5NvKFvE7U4ODCTLCM6eieWP8hIUOGF5qv5vg3M6cJCvwmkzOvy3rEO NR+Dpa7pGCOdnpdHUibw0BPDwSoalVjSpqTSeBaa4hfIzXkVu48ffL6QDDWTGGWivTNw JocQ== X-Forwarded-Encrypted: i=1; AFNElJ/YBgT+DWFcfYKj9RoQEXT1BCZ4GgxRUrw3h8AK977ZET+njAEMlrY43GMaz4hb0e4urd4zC5DT6DQjBa4=@vger.kernel.org X-Gm-Message-State: AOJu0YwG1BDiBlob0kcNRYkVi36qNT8h8jdKmQs9LTQGzoQ/rYvdy7UG wtDs+FvErgJ9nQwEnZ/o3z4PYuLf7gWuikccQ1V5RX121YW9pj1ogLCC X-Gm-Gg: Acq92OG5id5N2cFCydIZcMkSIX/mcIFXx2NfC5Hw87M8CIH2KbxdS0kD62i2OU/1JFT lLlESWaiNxs5HZoUkdJ3gc0aMz/g638kziOxaKDBBLowlNJcx7KMUIiVpIS+OIqDY5O1S3/iBnB FRztyhDiuhVfJAHDUwYYd6O55lFE8SHUsDh1fLj+w/rDGttIGq3dbii4H6nkFK0+7h/TK7OW06g 6NB1E0yyMX42ZRpHPij7fRIJrNqn2GCQoucIoq3Y9+leBrYAmfxiR+yys06PDfEKe+dpdNVWds6 nzwV2GYLFJ8DLnvFieKqIq8nAZcVM9VxraxQ24LqiKu10DgvcNNq18QLGz01lTO+Yud16QGgCZY x3Za4NKtAIbGNKJqVFxT4wff0/ZeLaVW2j0NmXkxqkgT6mnI0IiNpRtdhGcCLJsAfLLf4zgTHVc miYPkNeaRELdyRkpoildzIkhdYzmaPONNUbmT61h9g8wQ= X-Received: by 2002:a05:690c:9516:b0:7da:150a:18b6 with SMTP id 00721157ae682-7da150a2bbbmr46747717b3.16.1779884830652; Wed, 27 May 2026 05:27:10 -0700 (PDT) Received: from fedora ([2600:382:9a04:67b3:d02d:af49:8dff:b33a]) by smtp.gmail.com with ESMTPSA id 00721157ae682-7d38c43645csm74902097b3.41.2026.05.27.05.27.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2026 05:27:09 -0700 (PDT) From: Dave Carey To: platform-driver-x86@vger.kernel.org Cc: hdegoede@redhat.com, ilpo.jarvinen@linux.intel.com, armin.wolf@outlook.de, linux-kernel@vger.kernel.org, Dave Carey Subject: [PATCH v5] platform/x86/lenovo: Add Yoga Book 9 keyboard dock detection driver Date: Wed, 27 May 2026 08:27:01 -0400 Message-ID: <20260527122701.242907-1-carvsdriver@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260521144034.282419-1-carvsdriver@gmail.com> References: <20260521144034.282419-1-carvsdriver@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The Lenovo Yoga Book 9 14IAH10 ships with a detachable Bluetooth keyboard that magnetically attaches to the bottom (secondary) screen in one of two positions. The Embedded Controller tracks the attachment state in a 2-bit field called BKBD and signals changes via WMI event GUID 806BD2A2-177B-481D-BFB5-3BA0BB4A2285 (notify ID 0xEB on the WM10 ACPI device, _UID "GMZN"). The device contains embedded BMOF data (WQDD, 20705 bytes) documenting both WMI interfaces used by this driver: LENOVO_BTKBD_EVENT (event GUID): WmiDataId(1) uint32 Status. The ACPI _WED(0xEB) method returns EC.BKBD directly as an integer, so the notify callback receives BKBD without a separate query. LENOVO_FEATURE_STATUS_DATA (block GUID, WQAF method): returns an 8-byte buffer {uint32 IDs=3D0x00060000, uint32 Status=3DBKBD}. Used for the initial state read on probe and after resume. BKBD encoding: 0 =3D keyboard detached 1 =3D keyboard docked on top half of bottom screen 2 =3D keyboard docked on bottom half of bottom screen 3 =3D reserved (not observed in practice) This driver: - Registers two WMI drivers: one on the event GUID (LENOVO_BTKBD_EVENT) and one on the block GUID (LENOVO_FEATURE_STATUS_DATA). - On probe, reads initial BKBD state via wmidev_block_query() on the block device; whichever driver probes last triggers the initial read. - On WMI notification, reads BKBD directly from the event data integer (ACPI _WED(0xEB) returns EC.BKBD) without a redundant WQAF call. - Reports SW_TABLET_MODE=3D1 when detached, SW_TABLET_MODE=3D0 when docked in either position (a physical keyboard is present in both cases). - Exposes the raw BKBD value via read-only sysfs attribute "keyboard_position". - Re-reads BKBD state on resume from suspend or hibernation. Tested on: Lenovo Yoga Book 9 14IAH10 (model 83KJ), kernel 7.0. Signed-off-by: Dave Carey --- v5: - Rewrote as two WMI drivers (event + block) to avoid the deprecated wmi_query_block() API: event driver owns the GUID that delivers notifications, block driver owns the GUID used for querying state. Either can probe first; both probe callbacks check whether the other has already probed and fire the initial read when both are ready. - Use wmidev_block_query() on the block wmi_device directly (replaces the deprecated wmi_query_block()). - In the notify callback, read BKBD directly from the event data integer passed by the WMI core (_WED(0xEB) returns EC.BKBD; confirmed by decoding the embedded BMOF from WQDD). Eliminates the redundant WQAF call that v4 made on every notification. - Documented the two BMOF classes (LENOVO_BTKBD_EVENT and LENOVO_FEATURE_STATUS_DATA) with field layouts in the commit message and file header. - sysfs keyboard_position: output bare integer, drop the parenthetical position-name suffix that a couple of reviewers found non-standard. - Set .no_singleton =3D true on both WMI drivers (was missing from block driver in v4). - Add PM resume callback (yb9_kbdock_resume) to re-read BKBD state after suspend/hibernation. v4: - Dropped module_wmi_driver(); registered two WMI drivers manually to allow sharing state. module_init/exit pair registers/unregisters both. - Added ATTRIBUTE_GROUPS() and .dev_groups for the sysfs attribute. - sysfs show: performed a live query instead of returning a cached value. v3: - Switched to devm_input_allocate_device(). - Added DMI guard (dmi_check_system) to reject non-YB9 machines. - Removed redundant MODULE_DEVICE_TABLE on block driver. v2: - Added .no_singleton =3D true on the event WMI driver. - Added PM suspend/resume skeleton. - Fixed MODULE_LICENSE to "GPL" (was "GPL v2"). .../testing/sysfs-driver-lenovo-yb9-kbdock | 19 + MAINTAINERS | 7 + drivers/platform/x86/lenovo/Kconfig | 14 + drivers/platform/x86/lenovo/Makefile | 1 + drivers/platform/x86/lenovo/yb9-kbdock.c | 324 ++++++++++++++++++ 5 files changed, 365 insertions(+) create mode 100644 Documentation/ABI/testing/sysfs-driver-lenovo-yb9-kbdock create mode 100644 drivers/platform/x86/lenovo/yb9-kbdock.c diff --git a/Documentation/ABI/testing/sysfs-driver-lenovo-yb9-kbdock b/Doc= umentation/ABI/testing/sysfs-driver-lenovo-yb9-kbdock new file mode 100644 index 0000000..04e5293 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-driver-lenovo-yb9-kbdock @@ -0,0 +1,19 @@ +What: /sys/bus/wmi/drivers/lenovo-yb9-kbdock//keyboard_position +Date: April 2026 +KernelVersion: 6.10 +Contact: Dave Carey +Description: + Read-only attribute reporting the current keyboard dock position + as reported by the Embedded Controller on the Lenovo Yoga Book 9 + 14IAH10. + + Possible values: + + =3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + 0 keyboard is not docked to any screen (detached) + 1 keyboard docked on the top half of the bottom screen + 2 keyboard docked on the bottom half of the bottom screen + =3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + + SW_TABLET_MODE input events are also emitted: 0 when the keyboard + is docked (either position), 1 when detached. diff --git a/MAINTAINERS b/MAINTAINERS index d1cc0e1..00e8275 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14479,6 +14479,13 @@ L: platform-driver-x86@vger.kernel.org S: Maintained F: drivers/platform/x86/lenovo/wmi-hotkey-utilities.c =20 +LENOVO YOGA BOOK 9 KEYBOARD DOCK DRIVER +M: Dave Carey +L: platform-driver-x86@vger.kernel.org +S: Maintained +F: Documentation/ABI/testing/sysfs-driver-lenovo-yb9-kbdock +F: drivers/platform/x86/lenovo/yb9-kbdock.c + LETSKETCH HID TABLET DRIVER M: Hans de Goede L: linux-input@vger.kernel.org diff --git a/drivers/platform/x86/lenovo/Kconfig b/drivers/platform/x86/len= ovo/Kconfig index 9c48487..938b361 100644 --- a/drivers/platform/x86/lenovo/Kconfig +++ b/drivers/platform/x86/lenovo/Kconfig @@ -43,6 +43,20 @@ config LENOVO_WMI_CAMERA To compile this driver as a module, choose M here: the module will be called lenovo-wmi-camera. =20 +config LENOVO_YB9_KBDOCK + tristate "Lenovo Yoga Book 9 keyboard dock detection" + depends on ACPI_WMI + depends on DMI + depends on INPUT + help + Say Y here to enable keyboard dock detection on the Lenovo Yoga Book 9 + 14IAH10. The detachable Bluetooth keyboard magnetically attaches to + either screen; this driver reports SW_TABLET_MODE input events based + on the attachment state and exposes the raw position in sysfs. + + To compile this driver as a module, choose M here: the module will be + called lenovo-yb9-kbdock. + config LENOVO_YMC tristate "Lenovo Yoga Tablet Mode Control" depends on ACPI_WMI diff --git a/drivers/platform/x86/lenovo/Makefile b/drivers/platform/x86/le= novo/Makefile index 7b2128e..2842d7d 100644 --- a/drivers/platform/x86/lenovo/Makefile +++ b/drivers/platform/x86/lenovo/Makefile @@ -8,6 +8,7 @@ obj-$(CONFIG_THINKPAD_LMI) +=3D think-lmi.o obj-$(CONFIG_THINKPAD_ACPI) +=3D thinkpad_acpi.o =20 lenovo-target-$(CONFIG_LENOVO_WMI_HOTKEY_UTILITIES) +=3D wmi-hotkey-utilit= ies.o +lenovo-target-$(CONFIG_LENOVO_YB9_KBDOCK) +=3D yb9-kbdock.o lenovo-target-$(CONFIG_LENOVO_YMC) +=3D ymc.o lenovo-target-$(CONFIG_YOGABOOK) +=3D yogabook.o lenovo-target-$(CONFIG_YT2_1380) +=3D yoga-tab2-pro-1380-fastcharger.o diff --git a/drivers/platform/x86/lenovo/yb9-kbdock.c b/drivers/platform/x8= 6/lenovo/yb9-kbdock.c new file mode 100644 index 0000000..28a3ec7 --- /dev/null +++ b/drivers/platform/x86/lenovo/yb9-kbdock.c @@ -0,0 +1,324 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Lenovo Yoga Book 9 keyboard-dock detection + * + * The Yoga Book 9 ships with a detachable Bluetooth keyboard that magneti= cally + * attaches to the bottom screen in one of two positions. The EC tracks + * attachment state in a 2-bit field called BKBD and signals changes via W= MI + * event 0xEB on the WM10 ACPI device (_UID "GMZN"). + * + * BKBD values: + * 0 =3D keyboard detached + * 1 =3D keyboard docked on the top half of the bottom screen + * 2 =3D keyboard docked on the bottom half of the bottom screen + * 3 =3D reserved / not observed + * + * Two WMI interfaces are used (documented in embedded BMOF, WQDD, 20705 b= ytes): + * + * LENOVO_BTKBD_EVENT (event GUID, 806BD2A2-...) + * WmiDataId(1) uint32 Status =E2=80=94 _WED(0xEB) returns EC.BKBD dir= ectly. + * The notify callback receives BKBD as an integer; no separate query = needed. + * + * LENOVO_FEATURE_STATUS_DATA (block GUID, E7F300FA-...) + * WmiDataId(1) uint32 IDs =3D 0x00060000 (feature selector) + * WmiDataId(2) uint32 Status =3D BKBD value + * Used on probe and resume to read initial state. + * + * SW_TABLET_MODE=3D1 is reported when the keyboard is detached; + * SW_TABLET_MODE=3D0 when docked in either position (keyboard present). + * The raw BKBD value is exposed via the sysfs attribute "keyboard_positio= n". + * + * Copyright (C) 2026 Dave Carey + */ + +#include +#include +#include +#include +#include +#include +#include + +#define YB9_KBDOCK_EVENT_GUID "806BD2A2-177B-481D-BFB5-3BA0BB4A2285" +#define YB9_KBDOCK_QUERY_GUID "E7F300FA-21CD-4003-ADAC-2696135982E6" + +/* BKBD encoding */ +#define BKBD_DETACHED 0 +#define BKBD_TOP_HALF 1 +#define BKBD_BOTTOM_HALF 2 + +static const struct dmi_system_id yb9_kbdock_dmi_table[] =3D { + { + /* Lenovo Yoga Book 9 14IAH10 */ + .matches =3D { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "83KJ"), + }, + }, + { } +}; + +/* + * Shared state between the event and block WMI drivers. Protected by loc= k. + * The lock may be held across wmidev_query_block() calls (which can sleep= ); + * block_remove() acquires the lock before clearing block_wdev, ensuring + * block_wdev remains valid for the duration of any in-progress query. + */ +static struct { + struct mutex lock; + struct input_dev *input_dev; /* set by event probe */ + struct wmi_device *block_wdev; /* set by block probe */ +} yb9; + +/* + * Read BKBD from the block device via wmidev_block_query(). + * Returns 0-3 on success, -errno on failure. Caller must hold yb9.lock. + */ +static int yb9_kbdock_query_locked(struct device *log_dev) +{ + union acpi_object *obj; + u32 bkbd; + + if (!yb9.block_wdev) + return -ENODEV; + + obj =3D wmidev_block_query(yb9.block_wdev, 0); + if (!obj) { + dev_warn(log_dev, "WQAF returned NULL\n"); + return -EIO; + } + + /* + * LENOVO_FEATURE_STATUS_DATA: 8-byte buffer {IDs=3D0x00060000, Status=3D= BKBD}. + */ + if (obj->type =3D=3D ACPI_TYPE_BUFFER && obj->buffer.length >=3D 8) { + memcpy(&bkbd, obj->buffer.pointer + 4, sizeof(bkbd)); + bkbd &=3D 0x3; + } else if (obj->type =3D=3D ACPI_TYPE_INTEGER) { + bkbd =3D obj->integer.value & 0x3; + } else { + dev_warn(log_dev, "WQAF: unexpected type %d len %u\n", + obj->type, + obj->type =3D=3D ACPI_TYPE_BUFFER ? obj->buffer.length : 0); + kfree(obj); + return -EIO; + } + + kfree(obj); + return (int)bkbd; +} + +/* Report SW_TABLET_MODE from BKBD. Caller must hold yb9.lock. */ +static void yb9_kbdock_report_locked(int bkbd, struct device *log_dev) +{ + int tablet =3D (bkbd =3D=3D BKBD_DETACHED) ? 1 : 0; + + input_report_switch(yb9.input_dev, SW_TABLET_MODE, tablet); + input_sync(yb9.input_dev); + dev_dbg(log_dev, "BKBD=3D%d SW_TABLET_MODE=3D%d\n", bkbd, tablet); +} + +/* ------------------------------------------------------------------ + * sysfs + * ------------------------------------------------------------------ */ + +static ssize_t keyboard_position_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + int bkbd; + + mutex_lock(&yb9.lock); + bkbd =3D yb9_kbdock_query_locked(dev); + mutex_unlock(&yb9.lock); + + if (bkbd < 0) + return bkbd; + return sysfs_emit(buf, "%u\n", (unsigned int)bkbd); +} +static DEVICE_ATTR_RO(keyboard_position); + +static struct attribute *yb9_kbdock_attrs[] =3D { + &dev_attr_keyboard_position.attr, + NULL, +}; +ATTRIBUTE_GROUPS(yb9_kbdock); + +/* ------------------------------------------------------------------ + * Event WMI driver =E2=80=94 LENOVO_BTKBD_EVENT + * ------------------------------------------------------------------ */ + +static void yb9_kbdock_notify(struct wmi_device *wdev, union acpi_object *= data) +{ + u32 bkbd; + + /* + * _WED(0xEB) returns EC.BKBD directly as an integer + * (LENOVO_BTKBD_EVENT WmiDataId(1) uint32 Status). + */ + if (!data || data->type !=3D ACPI_TYPE_INTEGER) { + dev_warn(&wdev->dev, "unexpected event data type %d\n", + data ? data->type : -1); + return; + } + bkbd =3D data->integer.value & 0x3; + + mutex_lock(&yb9.lock); + if (yb9.input_dev) + yb9_kbdock_report_locked(bkbd, &wdev->dev); + mutex_unlock(&yb9.lock); +} + +static int yb9_kbdock_event_probe(struct wmi_device *wdev, const void *ctx) +{ + struct input_dev *input_dev; + int bkbd, err; + + if (!dmi_check_system(yb9_kbdock_dmi_table)) + return -ENODEV; + + input_dev =3D devm_input_allocate_device(&wdev->dev); + if (!input_dev) + return -ENOMEM; + + input_dev->name =3D "Lenovo Yoga Book 9 keyboard dock switch"; + input_dev->phys =3D YB9_KBDOCK_EVENT_GUID "/input0"; + input_dev->id.bustype =3D BUS_HOST; + input_set_capability(input_dev, EV_SW, SW_TABLET_MODE); + + err =3D input_register_device(input_dev); + if (err) + return err; + + mutex_lock(&yb9.lock); + yb9.input_dev =3D input_dev; + /* Read initial state if the block device has already probed. */ + if (yb9.block_wdev) { + bkbd =3D yb9_kbdock_query_locked(&wdev->dev); + if (bkbd >=3D 0) + yb9_kbdock_report_locked(bkbd, &wdev->dev); + } + mutex_unlock(&yb9.lock); + + return 0; +} + +static void yb9_kbdock_event_remove(struct wmi_device *wdev) +{ + mutex_lock(&yb9.lock); + yb9.input_dev =3D NULL; + mutex_unlock(&yb9.lock); +} + +static int yb9_kbdock_resume(struct device *dev) +{ + int bkbd; + + mutex_lock(&yb9.lock); + if (yb9.input_dev && yb9.block_wdev) { + bkbd =3D yb9_kbdock_query_locked(dev); + if (bkbd >=3D 0) + yb9_kbdock_report_locked(bkbd, dev); + } + mutex_unlock(&yb9.lock); + return 0; +} + +static DEFINE_SIMPLE_DEV_PM_OPS(yb9_kbdock_pm_ops, NULL, yb9_kbdock_resume= ); + +static const struct wmi_device_id yb9_kbdock_event_id_table[] =3D { + { .guid_string =3D YB9_KBDOCK_EVENT_GUID }, + { } +}; +MODULE_DEVICE_TABLE(wmi, yb9_kbdock_event_id_table); + +static struct wmi_driver yb9_kbdock_event_driver =3D { + .driver =3D { + .name =3D "lenovo-yb9-kbdock", + .dev_groups =3D yb9_kbdock_groups, + .pm =3D pm_sleep_ptr(&yb9_kbdock_pm_ops), + }, + .id_table =3D yb9_kbdock_event_id_table, + .no_singleton =3D true, + .probe =3D yb9_kbdock_event_probe, + .remove =3D yb9_kbdock_event_remove, + .notify =3D yb9_kbdock_notify, +}; + +/* ------------------------------------------------------------------ + * Block WMI driver =E2=80=94 LENOVO_FEATURE_STATUS_DATA + * ------------------------------------------------------------------ */ + +static int yb9_kbdock_block_probe(struct wmi_device *wdev, const void *ctx) +{ + int bkbd; + + if (!dmi_check_system(yb9_kbdock_dmi_table)) + return -ENODEV; + + mutex_lock(&yb9.lock); + yb9.block_wdev =3D wdev; + /* Read initial state if the event device has already probed. */ + if (yb9.input_dev) { + bkbd =3D yb9_kbdock_query_locked(&wdev->dev); + if (bkbd >=3D 0) + yb9_kbdock_report_locked(bkbd, &wdev->dev); + } + mutex_unlock(&yb9.lock); + return 0; +} + +static void yb9_kbdock_block_remove(struct wmi_device *wdev) +{ + mutex_lock(&yb9.lock); + yb9.block_wdev =3D NULL; + mutex_unlock(&yb9.lock); +} + +static const struct wmi_device_id yb9_kbdock_block_id_table[] =3D { + { .guid_string =3D YB9_KBDOCK_QUERY_GUID }, + { } +}; + +static struct wmi_driver yb9_kbdock_block_driver =3D { + .driver =3D { + .name =3D "lenovo-yb9-kbdock-block", + }, + .id_table =3D yb9_kbdock_block_id_table, + .no_singleton =3D true, + .probe =3D yb9_kbdock_block_probe, + .remove =3D yb9_kbdock_block_remove, +}; + +/* ------------------------------------------------------------------ + * Module init / exit + * ------------------------------------------------------------------ */ + +static int __init yb9_kbdock_init(void) +{ + int ret; + + mutex_init(&yb9.lock); + + ret =3D wmi_driver_register(&yb9_kbdock_event_driver); + if (ret) + return ret; + + ret =3D wmi_driver_register(&yb9_kbdock_block_driver); + if (ret) { + wmi_driver_unregister(&yb9_kbdock_event_driver); + return ret; + } + return 0; +} +module_init(yb9_kbdock_init); + +static void __exit yb9_kbdock_exit(void) +{ + wmi_driver_unregister(&yb9_kbdock_block_driver); + wmi_driver_unregister(&yb9_kbdock_event_driver); +} +module_exit(yb9_kbdock_exit); + +MODULE_AUTHOR("Dave Carey "); +MODULE_DESCRIPTION("Lenovo Yoga Book 9 keyboard dock detection"); +MODULE_LICENSE("GPL"); --=20 2.54.0