From owner-freebsd-current@FreeBSD.ORG Tue Sep 22 07:09:15 2009 Return-Path: Delivered-To: current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B21E1065672 for ; Tue, 22 Sep 2009 07:09:15 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-ew0-f209.google.com (mail-ew0-f209.google.com [209.85.219.209]) by mx1.freebsd.org (Postfix) with ESMTP id A86F88FC14 for ; Tue, 22 Sep 2009 07:09:14 +0000 (UTC) Received: by ewy5 with SMTP id 5so155613ewy.36 for ; Tue, 22 Sep 2009 00:09:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:references :date:in-reply-to:message-id:user-agent:mime-version:content-type; bh=OqsFvmiirFbsvvbgcmcf7gIGp8kUxx3rfoBcpWYxdsg=; b=XDVllG0TvHaU+BUAHGyzMpfdA17Tu9qYlUV9XaMDjN7Aq6HgY+H1pVmouTNjacxkv5 59ptp3S5eBO3KcPhAKOOfKzBxwT2lLM1Irmu4Un8OdJSYN7P3xgw2BBq7SQWySjkntIt 7rwScgust8RU+/W+mscuOibQeg3CM21EqER/w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; b=vbQ0W4zZh1k7MY/YyN/jhnhe93kkkPlCpRVmm6GCxkq8f3s2GdnnpYibLuVPr98Smu P3oiIiG/tya4/JaAmKTzNkOEnACm+0v5HdGKC+mObbBii543UcAZan4NjtX/gBrjxxqR E1MOBSOXQh690dauyHVRnXjNPhqa6QFHmR/4k= Received: by 10.211.132.3 with SMTP id j3mr591191ebn.81.1253603353884; Tue, 22 Sep 2009 00:09:13 -0700 (PDT) Received: from localhost (95-24-211-3.broadband.corbina.ru [95.24.211.3]) by mx.google.com with ESMTPS id 24sm881005eyx.4.2009.09.22.00.09.11 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 22 Sep 2009 00:09:12 -0700 (PDT) From: Anonymous To: d@delphij.net References: <4AB7D081.8090203@FreeBSD.org> <4AB82303.9030109@delphij.net> <4AB825B6.6010602@delphij.net> Date: Tue, 22 Sep 2009 11:09:09 +0400 In-Reply-To: <4AB825B6.6010602@delphij.net> (Xin LI's message of "Mon, 21 Sep 2009 18:17:42 -0700") Message-ID: <86ab0nxxpm.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (berkeley-unix) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Cc: paradox , current@freebsd.org, Joel Dahl Subject: Re: svn rev 197392 hangs during boot X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Sep 2009 07:09:15 -0000 --=-=-= Xin LI writes: > Xin LI wrote: >> Hi, >> >> Joel Dahl wrote: >>> Fresh FreeBSD 9-CURRENT (svn 197392) hangs at: >> >>> atkbd: the current kbd controller command byte 0047 >>> atkbd: keyboard ID 0x41ab (2) >>> kbdc: RESET_KBD return code:00fa >>> kbdc: RESET_KBD status:00aa >> >> Will reverting revision 197384 help? > > Forgot the attachment. > Before trying to revert it can make sense to try place back u_int32_t cast first [...] > - p = BIOS_PADDRTOVADDR((regs.R_ES << 4) + regs.R_BX); > + p = BIOS_PADDRTOVADDR(((u_int32_t)vmf.vmf_es << 4) + vmf.vmf_bx); that I accidentally removed here. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=a.diff Index: sys/dev/atkbdc/atkbd.c =================================================================== --- sys/dev/atkbdc/atkbd.c (revision 197392) +++ sys/dev/atkbdc/atkbd.c (working copy) @@ -1101,7 +1101,7 @@ x86biosCall(®s, 0x15); if ((regs.R_EFLG & PSL_C) || regs.R_AH) return ENODEV; - p = BIOS_PADDRTOVADDR((regs.R_ES << 4) + regs.R_BX); + p = BIOS_PADDRTOVADDR(((uint32_t)regs.R_ES << 4) + regs.R_BX); if ((readb(p + 6) & 0x40) == 0) /* int 16, function 0x09 supported? */ return ENODEV; regs.R_AX = 0x0900; --=-=-=--