From owner-freebsd-current@FreeBSD.ORG Wed May 18 17:40:46 2011 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7955C106566B; Wed, 18 May 2011 17:40:46 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from tarsier.geekcn.org (tarsier.geekcn.org [IPv6:2001:470:a803::1]) by mx1.freebsd.org (Postfix) with ESMTP id 20B8E8FC16; Wed, 18 May 2011 17:40:46 +0000 (UTC) Received: from mail.geekcn.org (tarsier.geekcn.org [211.166.10.233]) by tarsier.geekcn.org (Postfix) with ESMTP id 30F6DA6A7E2; Thu, 19 May 2011 01:40:45 +0800 (CST) X-Virus-Scanned: amavisd-new at geekcn.org Received: from tarsier.geekcn.org ([211.166.10.233]) by mail.geekcn.org (mail.geekcn.org [211.166.10.233]) (amavisd-new, port 10024) with LMTP id v-b2Snop99dE; Thu, 19 May 2011 01:40:39 +0800 (CST) Received: from delta.delphij.net (drawbridge.ixsystems.com [206.40.55.65]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTPSA id 5CC0BA6A7DF; Thu, 19 May 2011 01:40:36 +0800 (CST) DomainKey-Signature: a=rsa-sha1; s=default; d=delphij.net; c=nofws; q=dns; h=message-id:date:from:reply-to:organization:user-agent: mime-version:to:cc:subject:references:in-reply-to: x-enigmail-version:openpgp:content-type; b=GyxO2Io8kjS5tzgROE1k4oBaMusBZ31dZSLZXzVTowY9FBFD3DbFUan1xTTLj62Ip SywydfMDxT0NCQX2ES2Ug== Message-ID: <4DD4048F.8030207@delphij.net> Date: Wed, 18 May 2011 10:40:31 -0700 From: Xin LI Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US; rv:1.9.2.17) Gecko/20110502 Thunderbird/3.1.10 ThunderBrowse/3.3.5 MIME-Version: 1.0 To: freebsd-current@freebsd.org References: In-Reply-To: X-Enigmail-Version: 1.1.2 OpenPGP: id=3FCA37C1; url=http://www.delphij.net/delphij.asc Content-Type: multipart/mixed; boundary="------------030004070901040408050302" Cc: "George V. Neville-Neil" , Jung-uk Kim Subject: Re: Boot halts on Thinkpad X220 (Sandy Bridge) X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: d@delphij.net List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 May 2011 17:40:46 -0000 This is a multi-part message in MIME format. --------------030004070901040408050302 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit -----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 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----- --------------030004070901040408050302 Content-Type: text/plain; name="atkbd.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="atkbd.diff" 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 --------------030004070901040408050302--