From nobody@FreeBSD.org Tue Dec 18 06:49:48 2001 Return-Path: Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6B1F637B41A for ; 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 To: freebsd-gnats-submit@FreeBSD.org Subject: psm missing when acpi is loaded X-Send-Pr-Version: www-1.0 >Number: 32973 >Category: kern >Synopsis: psm missing when acpi is loaded >Confidential: no >Severity: serious >Priority: high >Responsible: sheldonh >State: closed >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Dec 18 06:50:00 PST 2001 >Closed-Date: Wed Dec 19 05:32:24 PST 2001 >Last-Modified: Wed Dec 19 05:32:46 PST 2001 >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('-YPHK(`EI9B`HRelease-Note: >Audit-Trail: From: KT Sin To: freebsd-gnats-submit@FreeBSD.org Cc: Subject: Re: kern/32973: psm missing when acpi is loaded Date: Wed, 19 Dec 2001 16:22:16 +0800 oooppss....sorry. Please ignore the earlier patch. All that is needed is adding a new pnp id into the psmcpnp_ids table. ============================ cut here ============================= *** sys/isa/psm.c.orig Sat Oct 13 18:28:02 2001 --- sys/isa/psm.c Wed Dec 19 08:46:37 2001 *************** *** 2877,2882 **** --- 2877,2883 ---- static struct isa_pnp_id psmcpnp_ids[] = { { 0x130fd041, "PS/2 mouse port" }, /* PNP0F13 */ + { 0x030fd041, "PS/2 mouse port" }, /* PNP0F03 */ { 0x1303d041, "PS/2 port" }, /* PNP0313, XXX */ { 0x80374d24, "IBM PS/2 mouse port" }, /* IBM3780, ThinkPad */ { 0x81374d24, "IBM PS/2 mouse port" }, /* IBM3781, ThinkPad */ ============================ cut here ============================= begin 644 psm-patch M*BHJ('-YR`P>#`S,&9D,#0Q+"`B4%,O,B!M M;W5S92!P;W)T(B!]+`D)+RH@4$Y0,$8P,R`J+PH@(`E[(#!X,3,P,V0P-#$L M(")04R\R('!O Thank you very much for your problem report. > It has the internal identification `kern/32973'. > The individual assigned to look at your > report is: freebsd-bugs. > > You can access the state of your problem report at any time > via this link: > > http://www.freebsd.org/cgi/query-pr.cgi?pr=32973 > > >Category: kern > >Responsible: freebsd-bugs > >Synopsis: psm missing when acpi is loaded > >Arrival-Date: Tue Dec 18 06:50:00 PST 2001 Responsible-Changed-From-To: freebsd-bugs->sheldonh Responsible-Changed-By: sheldonh Responsible-Changed-When: Wed Dec 19 05:28:23 PST 2001 Responsible-Changed-Why: I'll take this one. http://www.FreeBSD.org/cgi/query-pr.cgi?pr=32973 State-Changed-From-To: open->closed State-Changed-By: sheldonh State-Changed-When: Wed Dec 19 05:32:24 PST 2001 State-Changed-Why: Committed in rev 1.43, thanks! http://www.FreeBSD.org/cgi/query-pr.cgi?pr=32973 >Unformatted: