[Deepin-Kernel-SIG] [linux 6.18.y] [Upstream] Sync Input atkbd fixup from mainline#1852
Open
opsiff wants to merge 2 commits into
Open
[Deepin-Kernel-SIG] [linux 6.18.y] [Upstream] Sync Input atkbd fixup from mainline#1852opsiff wants to merge 2 commits into
opsiff wants to merge 2 commits into
Conversation
mainline inclusion from mainline-v7.1-rc7 category: bugfix The Lenovo Yoga Air 14 (83QK) laptop keyboard becomes unresponsive after the standard atkbd init sequence. Controlled testing on the actual hardware shows the F5 (ATKBD_CMD_RESET_DIS / deactivate) command specifically corrupts the EC state, causing zero IRQ1 interrupts after init. Skipping only the deactivate command (while keeping F4 ENABLE) resolves the issue completely: both keystroke input and CapsLock LED toggle work correctly. The reverse test - skipping only F4 while keeping F5 - makes the problem worse (zero keystroke interrupts), confirming F5 is the sole culprit. Add a DMI quirk entry for LENOVO/83QK using the existing atkbd_deactivate_fixup callback, consistent with the existing entries for LG Electronics and HONOR FMB-P that address the same EC F5 deactivate issue. Signed-off-by: Zeyu WANG <zeyu.thomas.wang@gmail.com> Link: https://patch.msgid.link/20260602170909.14725-1-zeyu.thomas.wang@gmail.com Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> (cherry picked from commit ad0979fe053e9f2db82da82188256ef6eb41095a) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
mainline inclusion from mainline-v7.1-rc7 category: bugfix After commit 9cf6e24 ("Input: atkbd - do not skip atkbd_deactivate() when skipping ATKBD_CMD_GETID"), HONOR BCC-N, aka HONOR MagicBook 14 2026's internal keyboard stops working. Adding the atkbd_deactivate_fixup quirk fixes it. DMI: HONOR BCC-N/BCC-N-PCB, BIOS 1.04 04/07/2026 Fixes: 9cf6e24 ("Input: atkbd - do not skip atkbd_deactivate() when skipping ATKBD_CMD_GETID") Reported-by: Hongfei Ren <lcrhf@outlook.com> Link: colorcube/Linux-on-Honor-Magicbook-14-Pro#1 (comment) Tested-by: Hongfei Ren <lcrhf@outlook.com> Cc: stable@kernel.org Signed-off-by: Cryolitia PukNgae <cryolitia.pukngae@linux.dev> Link: https://patch.msgid.link/20260605-honor-v1-1-78e05e491193@linux.dev Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> (cherry picked from commit fb402386af4cdce108ff991a796386de55439735) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>
Reviewer's guide (collapsed on small PRs)Reviewer's GuideAdds new DMI-based atkbd deactivation quirks for specific Lenovo and HONOR laptops so the PS/2 keyboard controller is properly handled on these models. Sequence diagram for DMI-based atkbd_deactivate_fixup on specific laptopssequenceDiagram
participant Firmware as DMI
participant Kernel as InputCore
participant ATKBD as atkbd_driver
participant PS2 as PS2_Controller
Firmware->>Kernel: provide_DMI_system_info()
Kernel->>ATKBD: atkbd_dmi_quirk_table_lookup()
alt Lenovo_Yoga_Air_14_83QK_or_HONOR_BCC_N
ATKBD->>ATKBD: atkbd_deactivate_fixup()
ATKBD->>PS2: disable_ps2_keyboard_controller()
else Other_models
ATKBD-->>PS2: no_fixup_applied
end
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
Member
|
/approve linux-6.6.y needs this too |
There was a problem hiding this comment.
Pull request overview
This PR syncs an upstream fix to the atkbd driver’s DMI-based quirk table to disable the i8042 keyboard controller on additional affected laptop models, addressing keyboard/controller issues on those systems.
Changes:
- Add a DMI quirk entry to apply
atkbd_deactivate_fixupon Lenovo Yoga Air 14 (product name83QK). - Add a DMI quirk entry to apply
atkbd_deactivate_fixupon HONOR systems with product nameBCC-N.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary by Sourcery
Extend atkbd DMI quirk handling to deactivate the keyboard controller on additional laptop models.
Bug Fixes: