Boot halts on Thinkpad X220 (Sandy Bridge)

[Xin LI]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Try this patch?

(I'm still opted to disable the typematic rate detection by default at
least for amd64, as we don't do it in the past for amd64)

Cheers,
- -- 
Xin LI <delphij at delphij.net>	http://www.delphij.net/
FreeBSD - The Power to Serve!	       Live free or die
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (FreeBSD)

iQEcBAEBCAAGBQJN1ASPAAoJEATO+BI/yjfBmsMH/0/VmxTyIAK2maoihg+/BhGR
5hwWnlCrW7i8a5If77o9e6apishlIgUMuf71WBAIVG+BF71I2QyEWNz+NsR9A+DM
N2YPok+oUVASyUIMHvvPC5gNEctcEnaFDOQ1fUWjPeQBoIZajxm0LYeRF7PDKA6R
n3HfstrQRwfzzRms96gkwCXdmffOuokqPK0EMwub+Dd+1NkLcnv/VaaJFR9OwlBd
cxayhNbTMSbW92x9GBz4O9HrQ1UBhYdi+jru2GBTbeNegh8bZGppoV8rfZQXvq5x
MU37Wgt0DolJY05BB58TTVW8weKRPiqUkHBc1aCK9X0AojXo76aXSUwdk40xSfs=
=+die
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: sys/dev/atkbdc/atkbd.c
===================================================================
--- sys/dev/atkbdc/atkbd.c	(revision 221536)
+++ sys/dev/atkbdc/atkbd.c	(working copy)
@@ -1097,6 +1097,9 @@
 	x86regs_t regs;
 	uint8_t *p;
 
+	if (!(kbd->kb_config & KB_CONF_PROBE_TYPEMATIC))
+		return (ENODEV);
+
 	if (x86bios_get_intr(0x15) == 0 || x86bios_get_intr(0x16) == 0)
 		return (ENODEV);
 
Index: sys/dev/atkbdc/atkbdreg.h
===================================================================
--- sys/dev/atkbdc/atkbdreg.h	(revision 221536)
+++ sys/dev/atkbdc/atkbdreg.h	(working copy)
@@ -36,6 +36,7 @@
 #define KB_CONF_NO_RESET	(1 << 1) /* don't reset the keyboard */
 #define KB_CONF_ALT_SCANCODESET	(1 << 2) /* assume the XT type keyboard */
 #define	KB_CONF_NO_PROBE_TEST	(1 << 3) /* don't test keyboard during probe */
+#define	KB_CONF_PROBE_TYPEMATIC	(1 << 4) /* probe keyboard typematic */
 
 #ifdef _KERNEL