From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pz2-f41.google.com (mail-pz2-f41.google.com [74.125.228.41]) (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 BEF12529410 for ; Tue, 29 Sep 2026 13:45:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.228.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790689550; cv=none; b=FE+mPo8h2kjOokddJ4QuPyAZDy79MO+DzJa/0RNu6SoE+gxBP0Q2dQ5hFfDU/Gf8u4UPtl4pN+HOF8NjKEA3lCXQzIvG/jNvpuQS0MqDC9Qex9L/4z5C9DfoEaGnQODe93odetFSUpk48np50Byh2+qLRhhcYaj1v9KjQU/WTRQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790689550; c=relaxed/simple; bh=bpchTysybU56LQWL9AKqRH5XzeEHLu8YCRZSZ1N51f4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l46KaX7Kbv+ioJ7tNNfug94OtZwkLgaPD5U1tHR+iPgxwZiIOKI+CD0op8IVlVY6HbYDbf9alqxgLd8bRewffCk2xShCQQENnCSyiiWwO62F+0MO3HbV7QaoSPLxCD81CzTj9nGQBZybqEZY7DqviMHAXHIMTPYTjUZuvn7Kf0U= 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=JIQfx3A9; arc=none smtp.client-ip=74.125.228.41 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="JIQfx3A9" Received: by mail-pz2-f41.google.com with SMTP id d2e1a72fcca58-8631d0023daso2117602b3a.2 for ; Tue, 29 Sep 2026 06:45:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790689548; x=1791294348; 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=o6cB0hhLRXzjQq/s96YCADj9vckGIlHHoNzX0TUnO+s=; b=JIQfx3A9H1/xcS9NFxwNh9h1i4qqe9BgN7TkI5tftRc7vzls5ujWVQAtfFH17g3jAo QZG9xnEoFNGUdYFEFkD2uYi16mIDLYTe04UBUrm/X70d8AXpDfVhv9i1aeuaHBdvf6pE 38WzI81ej+zZpehI/gD87Re5F68NJ2zKBeN8XcnKgPv1xmQPaazh6oSL+RZI9RBdn5iQ axhfoQ5Ng1W7oJEkl7rxYs1UhH4j8LQK+gpxUlrpoRfB/t+edKypOOzIIn0hLSMtT3ko wym0Oitqk8CG71gM+/x3+9OihL8M7Rkr1wwS5/+lFHp0AqCRH8zWkEF+8CAJVJy6ziNJ CJVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790689548; x=1791294348; 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=o6cB0hhLRXzjQq/s96YCADj9vckGIlHHoNzX0TUnO+s=; b=i0/kpKx0apo+oT/ERgLcZQFHbHLQGVAeq3VI544w0f2gWi1y8+aYfgcYW6UsdIozpk E8cxD1QCEUfEB8oluWVB9pkJav5wcg2TQfm5QueaUllQQCIQz1r9d959OA6jwvV+jN5m yYhvLMQKUpvobAJTp/ceVpc45gzDlhrjjDMHiA0YkEuEM3jiO5AnMm7lfIZ/Q3XNAYG3 qS0xU5q8ARX4GCoRAs1td+AV8hP7cZGpEWma+3y0iv3duoH2YGPAsvpR31ebg0xWKjNX PS8RnMVOBjjXA/z4A5Suvuav4L60ehtosGvoYQGKAyhE18+xYDyEzP7BH+iYm4dPPOqV epuw== X-Forwarded-Encrypted: i=1; AKwUvByyPc1otObxPZIPMBQBvWoKGT7hwdDgDCE26/hZDwNiTD7oYJIhlijN+BN88V4be0yN4SrqV/Zz9yJJVYIwhwNh9qMl@vger.kernel.org X-Gm-Message-State: AFuF++mQ7v854mbF1NdRxrqWDBsb1jxWRmSR+h9zT2qHW5fGg17pEmVZ qAq1hg6NxjOSIp1M813Rh8zBqlljtkdmDSm4snzhhF5AmkUEbKNQqCON X-Gm-Gg: AYBFou3P2AEM6xrSoK4uCRojr44BrL98wyh+KZZ9oAOrQxhwWnbIRqrY+Wnsz/ibqsH X9Q4HErC2wEBL2KERPnLGp65ZuVmcCdk9yb4Qsuf+S54DCSzNTMiJG4CYalaBgPvppBWGmWpgpc JQXi/yrprcwBmzY9n/8nv6l8BCoaDXs0a6KNPiYqAsV3jXq/GKaLXrg7VLsnOmCNqmDNsyrUaTD rtUaA2HR4QZVaP43krUgn1jaIWUiCK3z0btudbGu2yc1jDa84THsFmujANBjrByCkRUeJzfmIJW OoWMzrQOC2T3nr/Zah4nUcEUR2iXEGFG58cSVGDZbCgJdwty3WtB0OO+TyguGHUdTRaCBccmjA7 /02XVTyVvuFFCm0N1uwJlg6iUcuP0H3LMgSX0tkHoOmVbZz9bVEERRIKppnonfYTlyT7/VD6lMg TiddO0lbUiMizedFx9/Lr7lhU0wz4NA1VHtbeg+/RBlnE8NbtM7iTT X-Received: by 2002:a05:6a00:298a:b0:882:a8cd:c2f6 with SMTP id d2e1a72fcca58-882a8cdc785mr5333870b3a.50.1790689547780; Tue, 29 Sep 2026 06:45:47 -0700 (PDT) Received: from qby-nixos-laptop ([2a13:edc0:18:16f::a]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-885defd736csm919555b3a.8.2026.09.29.06.45.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Sep 2026 06:45:47 -0700 (PDT) From: Mingyou Chen To: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Hans de Goede Cc: KentoNion , platform-driver-x86@vger.kernel.org, ted eric , Armin Wolf , linux-kernel@vger.kernel.org, Chris Taraszka , Matias Civadda , =?UTF-8?q?=E9=AB=98=20=E4=BF=8A=E6=96=87?= , powerfullz , =?UTF-8?q?=E5=AD=99=20=E8=AA=89=E9=93=AD?= , =?UTF-8?q?Milo=C5=A1=20Vlku?= , Rsplwe , Bozhen Peng , Mingyou Chen , Nika Krasnova Subject: [PATCH v6 2/5] platform/x86: bitland-mifs-wmi: Merge the function of redmi-wmi into the bitland driver Date: Tue, 29 Sep 2026 13:45:00 +0000 Message-ID: <20260929134503.17249-3-qby140326@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260929134503.17249-1-qby140326@gmail.com> References: <20260929134503.17249-1-qby140326@gmail.com> Precedence: bulk X-Mailing-List: platform-driver-x86@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The bitland-mifs-wmi and legacy redmi-wmi drivers both attempt to bind to the same WMI GUID (46C93E13-EE9B-4262-8488-563BCA757FEF). This overlap causes a device registration conflict, preventing one of the drivers from loading properly depending on the module initialization order. Merge the event handling logic from redmi-wmi into bitland-mifs-wmi. By handling both device layouts within a single driver, we eliminate the GUID ownership conflict. Tested-by: Nika Krasnova Signed-off-by: Mingyou Chen --- drivers/platform/x86/bitland-mifs-wmi.c | 139 ++++++++++++++++-------- 1 file changed, 96 insertions(+), 43 deletions(-) diff --git a/drivers/platform/x86/bitland-mifs-wmi.c b/drivers/platform/x86/bitland-mifs-wmi.c index dd1648b7de77..e1a81e89856e 100644 --- a/drivers/platform/x86/bitland-mifs-wmi.c +++ b/drivers/platform/x86/bitland-mifs-wmi.c @@ -35,6 +35,11 @@ #include #include +#define BI_HOTKEY_CODE(id, low, high) \ + (((u32)(high) << 24) | ((u32)(low) << 16) | ((u32)(id) << 8) | WMI_EVENT_TYPE_HOTKEY) + +#define AI_KEY_VALUE_MASK BIT(8) + #define DRV_NAME "bitland-mifs-wmi" #define BITLAND_MIFS_GUID "B60BFB48-3E5B-49E4-A0E9-8CFFE1B3434B" #define BITLAND_EVENT_GUID "46C93E13-EE9B-4262-8488-563BCA757FEF" @@ -607,18 +612,59 @@ static const struct attribute *const laptop_attrs[] = { ATTRIBUTE_GROUPS(laptop); static const struct key_entry bitland_mifs_wmi_keymap[] = { - { KE_KEY, WMI_EVENT_OPEN_APP, { KEY_PROG1 } }, - { KE_KEY, WMI_EVENT_CALCULATOR_START, { KEY_CALC } }, - { KE_KEY, WMI_EVENT_BROWSER_START, { KEY_WWW } }, - { KE_IGNORE, WMI_EVENT_FN_J, { KEY_RESERVED } }, - { KE_IGNORE, WMI_EVENT_FN_F, { KEY_RESERVED } }, - { KE_IGNORE, WMI_EVENT_FN_0, { KEY_RESERVED } }, - { KE_IGNORE, WMI_EVENT_FN_1, { KEY_RESERVED } }, - { KE_IGNORE, WMI_EVENT_FN_2, { KEY_RESERVED } }, - { KE_IGNORE, WMI_EVENT_FN_3, { KEY_RESERVED } }, - { KE_IGNORE, WMI_EVENT_FN_4, { KEY_RESERVED } }, - { KE_IGNORE, WMI_EVENT_FN_5, { KEY_RESERVED } }, - { KE_END, 0 } + { KE_KEY, BI_HOTKEY_CODE(WMI_EVENT_OPEN_APP, 1, 0), { KEY_PROG1 } }, + + { KE_KEY, BI_HOTKEY_CODE(WMI_EVENT_CALCULATOR_START, 1, 0), { KEY_CALC } }, + + { KE_KEY, BI_HOTKEY_CODE(WMI_EVENT_BROWSER_START, 1, 0), { KEY_WWW } }, + + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_FN_J, 0, 0), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_FN_F, 0, 0), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_FN_0, 0, 0), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_FN_1, 0, 0), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_FN_2, 0, 0), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_FN_3, 0, 0), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_FN_4, 0, 0), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_FN_5, 0, 0), {} }, + + { KE_KEY, BI_HOTKEY_CODE(WMI_EVENT_RESERVED_2, 0, 0), { KEY_SELECTIVE_SCREENSHOT } }, + { KE_KEY, BI_HOTKEY_CODE(WMI_EVENT_RESERVED_3, 0, 0), { KEY_ALL_APPLICATIONS } }, + { KE_KEY, BI_HOTKEY_CODE(0x1b, 0, 0), { KEY_CONFIG } }, + { KE_KEY, BI_HOTKEY_CODE(0x1b, 1, 0), { KEY_CONFIG } }, + { KE_KEY, BI_HOTKEY_CODE(WMI_EVENT_RESERVED_1, 1, 0), { KEY_SWITCHVIDEOMODE } }, + { KE_KEY, BI_HOTKEY_CODE(WMI_EVENT_REFRESH_RATE, 0, 0), { KEY_REFRESH_RATE_TOGGLE } }, + + /* AI button has code for each position */ + { KE_KEY, BI_HOTKEY_CODE(WMI_EVENT_FN_5, 1, 0), { KEY_ASSISTANT } }, + + { KE_KEY, BI_HOTKEY_CODE(0x19, 1, 0), { KEY_ASSISTANT } }, + + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_KBD_BRIGHTNESS, 0, 0), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_KBD_BRIGHTNESS, 0, 0x80), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_KBD_BRIGHTNESS, 5, 0), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_KBD_BRIGHTNESS, 0x0a, 0), {} }, + + /* Xiaomi G Command Center */ + { KE_KEY, BI_HOTKEY_CODE(0x0a, 1, 0), { KEY_VENDOR } }, + + /* OEM preset power mode */ + { KE_IGNORE, BI_HOTKEY_CODE(0x16, 1, 0), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(0x16, 2, 0), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(0x16, 3, 0), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(0x16, 4, 0), {} }, + + /* Fn Lock state */ + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_FNLOCK_STATE, 0, 0), {} }, + { KE_IGNORE, BI_HOTKEY_CODE(WMI_EVENT_FNLOCK_STATE, 1, 0), {} }, + + /* Fn+`/1/2/3/4 */ + { KE_KEY, BI_HOTKEY_CODE(WMI_EVENT_FN_F, 1, 0), { KEY_F13 } }, + { KE_KEY, BI_HOTKEY_CODE(WMI_EVENT_FN_0, 1, 0), { KEY_F14 } }, + { KE_KEY, BI_HOTKEY_CODE(WMI_EVENT_FN_1, 1, 0), { KEY_F15 } }, + { KE_KEY, BI_HOTKEY_CODE(WMI_EVENT_FN_2, 1, 0), { KEY_F16 } }, + { KE_KEY, BI_HOTKEY_CODE(WMI_EVENT_FN_3, 1, 0), { KEY_F17 } }, + + { KE_END } }; static void bitland_notifier_unregister(void *data) @@ -736,12 +782,35 @@ static int bitland_mifs_wmi_probe(struct wmi_device *wdev, const void *context) &drv_data->notifier); } +static void bitland_mifs_wmi_report_key(struct wmi_device *wdev, u32 payload) +{ + struct bitland_mifs_wmi_data *data = dev_get_drvdata(&wdev->dev); + struct key_entry *entry; + bool autorelease = true; + int value = 1; + + entry = sparse_keymap_entry_from_scancode(data->input_dev, payload); + if (!entry) { + dev_dbg(&wdev->dev, "Unknown WMI hotkey with payload 0x%08x\n", payload); + return; + } + + /* AI key quirk */ + if (entry->keycode == KEY_ASSISTANT) { + value = !(payload & AI_KEY_VALUE_MASK); + autorelease = false; + } + + guard(mutex)(&data->lock); + sparse_keymap_report_entry(data->input_dev, entry, value, autorelease); +} + static void bitland_mifs_wmi_notify(struct wmi_device *wdev, const struct wmi_buffer *buffer) { - struct bitland_mifs_wmi_data *data = dev_get_drvdata(&wdev->dev); const struct bitland_mifs_event *event = buffer->data; struct bitland_fan_notify_data fan_data; + u32 payload; u8 brightness; /* Validate event type */ @@ -758,24 +827,13 @@ static void bitland_mifs_wmi_notify(struct wmi_device *wdev, blocking_notifier_call_chain(&bitland_notifier_list, BITLAND_NOTIFY_KBD_BRIGHTNESS, &brightness); - break; + return; case WMI_EVENT_PERFORMANCE_PLAN: blocking_notifier_call_chain(&bitland_notifier_list, BITLAND_NOTIFY_PLATFORM_PROFILE, NULL); - break; - - case WMI_EVENT_OPEN_APP: - case WMI_EVENT_CALCULATOR_START: - case WMI_EVENT_BROWSER_START: { - guard(mutex)(&data->lock); - if (!sparse_keymap_report_event(data->input_dev, - event->event_id, 1, true)) - dev_warn(&wdev->dev, "Unknown key pressed: 0x%02x\n", - event->event_id); - break; - } + return; /* * The device has 3 fans (CPU, GPU, SYS), @@ -783,6 +841,14 @@ static void bitland_mifs_wmi_notify(struct wmi_device *wdev, */ case WMI_EVENT_CPU_FAN_SPEED: case WMI_EVENT_GPU_FAN_SPEED: + /* Redmi refresh rate toggle quirk */ + if (event->event_id == WMI_EVENT_CPU_FAN_SPEED && + event->value_low == 0 && event->value_high == 0) { + payload = BI_HOTKEY_CODE(WMI_EVENT_REFRESH_RATE, 0, 0); + bitland_mifs_wmi_report_key(wdev, payload); + return; + } + if (event->event_id == WMI_EVENT_CPU_FAN_SPEED) fan_data.channel = 0; else @@ -793,27 +859,14 @@ static void bitland_mifs_wmi_notify(struct wmi_device *wdev, blocking_notifier_call_chain(&bitland_notifier_list, BITLAND_NOTIFY_HWMON, &fan_data); - break; - - case WMI_EVENT_AIRPLANE_MODE: - case WMI_EVENT_TOUCHPAD_STATE: - case WMI_EVENT_FNLOCK_STATE: - case WMI_EVENT_KBD_MODE: - case WMI_EVENT_CAPSLOCK_STATE: - case WMI_EVENT_NUMLOCK_STATE: - case WMI_EVENT_SCROLLLOCK_STATE: - case WMI_EVENT_REFRESH_RATE: - case WMI_EVENT_WIN_KEY_LOCK: - /* These events are informational or handled by firmware */ - dev_dbg(&wdev->dev, "State change event: id=%d value=%d\n", - event->event_id, event->value_low); - break; + return; default: - dev_dbg(&wdev->dev, "Unknown event: id=0x%02x value=0x%02x\n", - event->event_id, event->value_low); break; } + + payload = get_unaligned_le32(buffer->data); + bitland_mifs_wmi_report_key(wdev, payload); } static const struct wmi_device_id bitland_mifs_wmi_id_table[] = { -- 2.55.0