Subject: port-amd64/31996: fix the comments for MPBIOS and MPACPI
To: None <port-amd64-maintainer@netbsd.org, gnats-admin@netbsd.org,>
From: None <damon@brodiefamily.org>
List: netbsd-bugs
Date: 11/03/2005 23:05:02
>Number: 31996
>Category: port-amd64
>Synopsis: fix the comments for MPBIOS and MPACPI
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: port-amd64-maintainer
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Thu Nov 03 23:05:02 +0000 2005
>Originator: Damon Brodie
>Release: NetBSD 3.99.11
>Organization:
>Environment:
System: NetBSD nomad.brodiefamily.org 3.99.11 NetBSD 3.99.11 (NOMAD) #31: Thu Nov 3 17:37:48 EST 2005 damon@nomad.brodiefamily.org:/usr/src-current/sys/arch/amd64/compile/obj/NOMAD amd64
Architecture: x86_64
Machine: amd64
>Description:
The GENERIC kernel for amd64 has a wrong comment for MPACPI_SCANPCI
>How-To-Repeat:
grep MPACPI_SCANPCI GENERIC
and look at the comment
>Fix:
This diff brings MPBIOS* up beside MPACPI* (based on how GENERIC is in i386) and fixes the incorrect comment for MPACPI_SCANPCI.
--- GENERIC 2005-11-03 17:55:11.000000000 -0500
+++ GENERIC.new 2005-11-03 17:58:19.000000000 -0500
@@ -229,8 +229,11 @@
mainbus0 at root
#acpi0 at mainbus0
-#options MPACPI
-#options MPACPI_SCANPCI # MPBIOS configures PCI roots
+#options MPACPI # configure CPUs and APICs using ACPI
+ # (acpi at mainbus must also be enabled)
+#options MPACPI_SCANPCI # find PCI roots using MPACPI
+options MPBIOS # configure CPUs and APICs using MPBIOS
+options MPBIOS_SCANPCI # MPBIOS configures PCI roots
#options PCI_INTR_FIXUP # PCI interrupt routing via ACPI
#options ACPI_ACTIVATE_DEV # If set, activate inactive devices
#options ACPICA_PEDANTIC # force strict conformance to the Spec.
@@ -255,8 +258,6 @@
#pcppi* at acpi? # AT-style speaker sound
#wss* at acpi? # NeoMagic 256AV in wss mode
-options MPBIOS
-options MPBIOS_SCANPCI # MPBIOS configures PCI roots
cpu* at mainbus?
ioapic* at mainbus? apid ?
>Unformatted: