From owner-cvs-src@FreeBSD.ORG Wed Oct 29 06:38:23 2003 Return-Path: Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7415216A4CE; Wed, 29 Oct 2003 06:38:23 -0800 (PST) Received: from locore.org (ns01.locore.org [218.45.21.227]) by mx1.FreeBSD.org (Postfix) with ESMTP id EDBDC43FA3; Wed, 29 Oct 2003 06:38:21 -0800 (PST) (envelope-from iwasaki@jp.FreeBSD.org) Received: from localhost (ns01.locore.org [218.45.21.227]) h9TEcDRo020064; Wed, 29 Oct 2003 23:38:14 +0900 (JST) (envelope-from iwasaki@jp.FreeBSD.org) Date: Wed, 29 Oct 2003 23:38:11 +0900 (JST) Message-Id: <20031029.233811.51709573.iwasaki@jp.FreeBSD.org> To: nate@root.org From: Mitsuru IWASAKI In-Reply-To: <20031028235425.N82902@root.org> References: <20031029033120.835D916A518@hub.freebsd.org> <20031028235425.N82902@root.org> X-Mailer: Mew version 2.2 on Emacs 20.7 / Mule 4.0 (HANANOEN) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit cc: cvs-src@FreeBSD.org cc: src-committers@FreeBSD.org cc: cvs-all@FreeBSD.org cc: iwasaki@FreeBSD.org Subject: Re: cvs commit: src/sys/conf options src/sys/i386/acpica Makefile acpi_wakecode.S src/sys/i386/conf NOTES X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2003 14:38:23 -0000 Hi, I've just committed conf/options and i386/conf/NOTES based on your suggestion. Thanks! > > --- src/sys/i386/acpica/Makefile:1.3 Wed May 1 14:54:07 2002 > > +++ src/sys/i386/acpica/Makefile Tue Oct 28 19:30:45 2003 > > @@ -1,4 +1,4 @@ > > -# $FreeBSD: /repoman/r/ncvs/src/sys/i386/acpica/Makefile,v 1.3 2002/05/01 21:54:07 peter Exp $ > > +# $FreeBSD: /repoman/r/ncvs/src/sys/i386/acpica/Makefile,v 1.4 2003/10/29 03:30:45 iwasaki Exp $ > > > > # Correct path for kernel builds > > # Don't rely on the kernel's .depend file > > @@ -10,6 +10,10 @@ > > CLEANFILES= acpi_wakecode.h acpi_wakecode.bin acpi_wakecode.o > > .endif > > CFLAGS+= -I. > > + > > +.ifdef ACPI_NO_RESET_VIDEO > > +CFLAGS+= -DACPI_NO_RESET_VIDEO > > +.endif > > > > all: acpi_wakecode.h > > Is this needed? options alone should be sufficient and acpi_wakeup.S > should include opt_acpi.h. Yes this is needed. For acpi.ko, options in kernel config file won't be referred as Warner mentioned. I usually specify kernel options in make.conf for the kernel modules. > > Index: src/sys/i386/acpica/acpi_wakecode.S > > diff -u src/sys/i386/acpica/acpi_wakecode.S:1.4 src/sys/i386/acpica/acpi_wakecode.S:1.5 > > --- src/sys/i386/acpica/acpi_wakecode.S:1.4 Sun Oct 26 22:26:51 2003 > > +++ src/sys/i386/acpica/acpi_wakecode.S Tue Oct 28 19:30:45 2003 > > @@ -43,6 +43,7 @@ > > movw %ax,%ds > > movw %ax,%ss > > > > +#ifndef ACPI_NO_RESET_VIDEO > > /* > > * Re-initialize video BIOS. Restore DS and SS from CS in > > * case the BIOS modified them. > > @@ -51,6 +52,7 @@ > > movw %cs, %ax > > movw %ax, %ds > > movw %ax, %ss > > +#endif > > > > /* Load GDT for real mode */ > > lgdt physical_gdt > > As you can see, I restore DS and SS in two places. I think we can remove > the first place (above the lcall), right? As takawata-san suggested, I also thought we need to setup segment registers before the BIOS call. Thanks