From owner-freebsd-current@FreeBSD.ORG Thu Aug 19 07:34:55 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3669016A4CE for ; Thu, 19 Aug 2004 07:34:55 +0000 (GMT) Received: from spider.deepcore.dk (cpe.atm2-0-53484.0x50a6c9a6.abnxx9.customer.tele.dk [80.166.201.166]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8B76243D2D for ; Thu, 19 Aug 2004 07:34:54 +0000 (GMT) (envelope-from sos@DeepCore.dk) Received: from [194.192.25.143] (laptop.deepcore.dk [194.192.25.143]) by spider.deepcore.dk (8.12.11/8.12.10) with ESMTP id i7J7YoQK066163; Thu, 19 Aug 2004 09:34:50 +0200 (CEST) (envelope-from sos@DeepCore.dk) Message-ID: <41245804.7060008@DeepCore.dk> Date: Thu, 19 Aug 2004 09:34:28 +0200 From: =?ISO-8859-1?Q?S=F8ren_Schmidt?= User-Agent: Mozilla Thunderbird 0.7.2 (X11/20040802) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Nate Lawson References: <4123FC71.8060308@root.org> In-Reply-To: <4123FC71.8060308@root.org> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit cc: current@freebsd.org Subject: Re: suspend/resume panic in ACPI.. X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 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: Thu, 19 Aug 2004 07:34:55 -0000 Nate Lawson wrote: > Try the attached patch. OK, that makes the box suspend alright, but neither that nor any other box or laptop I've got can get out of suspend without locking up. If I revert just /sys/dev/acpica and /sys/i386/acpica to aug-01 both suspend and resume works (sortof, it does tend to panic later on). It starts failing around aug-05 and then detoriates from that on to the current state of locking up hard on resume. It also fails in the exact same way on non-ATA systems, so I think I'm out of the loop this time :) > > -Nate > > > ------------------------------------------------------------------------ > > Index: sys/i386/acpica/acpi_wakeup.c > =================================================================== > RCS file: /home/ncvs/src/sys/i386/acpica/acpi_wakeup.c,v > retrieving revision 1.37 > diff -u -r1.37 acpi_wakeup.c > --- sys/i386/acpica/acpi_wakeup.c 5 Aug 2004 06:29:12 -0000 1.37 > +++ sys/i386/acpica/acpi_wakeup.c 19 Aug 2004 01:01:40 -0000 > @@ -189,7 +189,6 @@ > AcpiSetFirmwareWakingVector(sc->acpi_wakephys); > > ef = read_eflags(); > - ACPI_DISABLE_IRQS(); > > /* Create Identity Mapping */ > if ((p = curproc) == NULL) > @@ -209,6 +208,7 @@ > ret_addr = 0; > if (acpi_savecpu()) { > /* Execute Sleep */ > + ACPI_DISABLE_IRQS(); > intr_suspend(); > > p_gdt = (struct region_descriptor *)