From owner-freebsd-bugs  Tue Dec 18  6:50:14 2001
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 1154737B41B
	for <freebsd-bugs@hub.freebsd.org>; Tue, 18 Dec 2001 06:50:01 -0800 (PST)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id fBIEo1O52395;
	Tue, 18 Dec 2001 06:50:01 -0800 (PST)
	(envelope-from gnats)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 6B1F637B41A
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 18 Dec 2001 06:49:48 -0800 (PST)
Received: (from nobody@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id fBIEkg630830;
	Tue, 18 Dec 2001 06:46:42 -0800 (PST)
	(envelope-from nobody)
Message-Id: <200112181446.fBIEkg630830@freefall.freebsd.org>
Date: Tue, 18 Dec 2001 06:46:42 -0800 (PST)
From: KT Sin <ktsin@acm.org>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: kern/32973: psm missing when acpi is loaded
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-bugs.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-bugs>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-bugs>
X-Loop: FreeBSD.org


>Number:         32973
>Category:       kern
>Synopsis:       psm missing when acpi is loaded
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Dec 18 06:50:00 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     KT Sin
>Release:        FreeBSD 5.0-CURRENT
>Organization:
>Environment:
FreeBSD passion.daddylonglegs.com 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Sun Dec 16 22:08:25 SGT 2001     ktsin@passion.daddylonglegs.com:/usr/src/sys/i386/compile/PASSION  i386      
>Description:
The PS/2 mouse device is not detected during bootup for certain
motherboards when ACPI is loaded.
>How-To-Repeat:
      
>Fix:
Please apply the patch below:

===========================cut here==================================
*** sys/isa/psm.c.orig  Sat Oct 13 18:28:02 2001
--- sys/isa/psm.c       Tue Nov  6 09:35:25 2001
***************
*** 928,933 ****
--- 928,934 ----
      int mask;
      int rid;
      int i;
+     int irq;

  #if 0
      kbdc_debug(TRUE);
***************
*** 935,940 ****
--- 936,952 ----

      /* see if IRQ is available */
      rid = KBDC_RID_AUX;
+
+     irq = bus_get_resource_start(dev, SYS_RES_IRQ, rid);
+     if (irq <= 0) {
+       if (resource_long_value(PSM_DRIVER_NAME,
+                               device_get_unit(dev), "irq", &irq) != 0)
+           irq = 12;   /* XXX */
+       device_printf(dev, "irq resource info is missing; "
+                     "assuming irq %ld\n", irq);
+       bus_set_resource(dev, SYS_RES_IRQ, rid, irq, 1);
+     }
+
      sc->intr = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
                                  RF_SHAREABLE | RF_ACTIVE);
      if (sc->intr == NULL) {
===========================cut here===================================

begin 644 psm-patch
M*BHJ('-Y<R]I<V$O<'-M+F,N;W)I9PE3870@3V-T(#$S(#$X.C(X.C`R(#(P
M,#$*+2TM('-Y<R]I<V$O<'-M+F,)5'5E($YO=B`@-B`P.3HS-3HR-2`R,#`Q
M"BHJ*BHJ*BHJ*BHJ*BHJ*@HJ*BH@.3(X+#DS,R`J*BHJ"BTM+2`Y,C@L.3,T
M("TM+2T*("`@("`@:6YT(&UA<VL["B`@("`@(&EN="!R:60["B`@("`@(&EN
M="!I.PHK("`@("!I;G0@:7)Q.PH@(`H@("-I9B`P"B`@("`@(&MB9&-?9&5B
M=6<H5%)512D["BHJ*BHJ*BHJ*BHJ*BHJ*@HJ*BH@.3,U+#DT,"`J*BHJ"BTM
M+2`Y,S8L.34R("TM+2T*("`*("`@("`@+RH@<V5E(&EF($E242!I<R!A=F%I
M;&%B;&4@*B\*("`@("`@<FED(#T@2T)$0U]2241?0558.PHK(`HK("`@("!I
M<G$@/2!B=7-?9V5T7W)E<V]U<F-E7W-T87)T*&1E=BP@4UE37U)%4U])4E$L
M(')I9"D["BL@("`@(&EF("AI<G$@/#T@,"D@>PHK(`EI9B`H<F5S;W5R8V5?
M;&]N9U]V86QU92A04TU?1%))5D527TY!344L"BL@"0D)"61E=FEC95]G971?
M=6YI="AD978I+"`B:7)Q(BP@)FER<2D@(3T@,"D**R`)("`@(&ER<2`](#$R
M.PDO*B!86%@@*B\**R`)9&5V:6-E7W!R:6YT9BAD978L(")I<G$@<F5S;W5R
M8V4@:6YF;R!I<R!M:7-S:6YG.R`B"BL@"0D@("`@("`B87-S=6UI;F<@:7)Q
M("5L9%QN(BP@:7)Q*3L**R`)8G5S7W-E=%]R97-O=7)C92AD978L(%-94U]2
M15-?25)1+"!R:60L(&ER<2P@,2D["BL@("`@('T**R`*("`@("`@<V,M/FEN
M='(@/2!B=7-?86QL;V-?<F5S;W5R8V4H9&5V+"!365-?4D537TE242P@)G)I
M9"P@,"P@?C`L(#$L"B`@"0D)"2`@4D9?4TA!4D5!0DQ%('P@4D9?04-4259%
A*3L*("`@("`@:68@*'-C+3YI;G1R(#T]($Y53$PI('L*
`
end

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message