[PATCH] Input: i8042 - add Xiaomi Book Pro 14 to dumbkbd quirk list

[PATCH] Input: i8042 - add Xiaomi Book Pro 14 to dumbkbd quirk list

[Andrew Zhou]

The Xiaomi Book Pro 14's built-in keyboard doesn't work by default.

Add the device to the quirk table with SERIO_QUIRK_DUMBKBD so the keyboard
works out of the box without needing i8042.dumbkbd on the kernel command line.

Tested on a Xiaomi Book Pro 14.

Signed-off-by: Andrew Zhou <zhoulol888@gmail.com>
---
 drivers/input/serio/i8042-acpipnpio.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/input/serio/i8042-acpipnpio.h b/drivers/input/serio/i8042-acpipnpio.h
index 412f82d7a..6b18014e2 100644
--- a/drivers/input/serio/i8042-acpipnpio.h
+++ b/drivers/input/serio/i8042-acpipnpio.h
@@ -1430,6 +1430,18 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = {
 		},
 		.driver_data = (void *)(SERIO_QUIRK_DIRECT)
 	},
+	/*
+	 * Some laptops have a broken keyboard controller that reports
+	 * incorrect data. SERIO_QUIRK_DUMBKBD bypasses the intelligent
+	 * probing and forces a basic PS/2 keyboard assumption.
+	 */
+	{
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "XIAOMI"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Xiaomi Book Pro 14"),
+		},
+		.driver_data = (void *)(SERIO_QUIRK_DUMBKBD)
+	},
 	{ }
 };
 
-- 
2.54.0

Re: [PATCH] Input: i8042 - add Xiaomi Book Pro 14 to dumbkbd quirk list

[Andrew Zhou]

Gentle ping, since there was no response for 2 weeks.

Re: [PATCH] Input: i8042 - add Xiaomi Book Pro 14 to dumbkbd quirk list

[Zhefu Zhang]

Hi Andrew,

I have the same machine and sent an alternative fix today, "Input: atkbd -
skip deactivate for Xiaomi Book Pro 14's internal keyboard".

On this machine atkbd deactivates the keyboard at the end of atkbd_probe();
the EC acknowledges the ATKBD_CMD_ENABLE issued afterwards but never resumes
scanning, so no key is ever reported. Setting the existing
atkbd_deactivate_fixup quirk avoids the deactivation and the internal
keyboard works.

Compared to SERIO_QUIRK_DUMBKBD this also keeps the keyboard LED working:
with dumbkbd the driver never writes to the keyboard at all, so the Caps Lock
LED is not available.

Tested on Xiaomi Book Pro 14, board TM2424.

Thanks,
Zhefu Zhang

Re: [PATCH] Input: i8042 - add Xiaomi Book Pro 14 to dumbkbd quirk list

[Andrew Zhou]

Hi Zhefu,

Thanks for looking into this. Your approach is superior.

Please feel free to add:
  Reviewed-by: Andrew Zhou <zhoulol888@gmail.com>

I'll drop my patch in favor of yours.

Thanks,
Andrew