Module Name: src
Committed By: sevan
Date: Sat Feb 24 18:58:00 UTC 2018
Modified Files:
src/sys/arch/macppc/conf: GENERIC GENERIC_601 MAMBO
Log Message:
Remove legacy comment regarding the instability of awacs(4)
Enable awacs(4), skipping MAMBO config as it is for an emulator.
>From <macallan>
"that warning about the awacs driver making some
machines lock up can probably go. It's ancient and I've never seen it
actually happen, I have several oldish macs with different awacs
variants and it's enabled in all my configs. In fact it predates my
macppc interrupt cleanup ( I think I did that in 2005 or so ) and I
strongly suspect that fixed the problem.
( the ancient code didn't properly distinguish between edge and level
triggered interrupts on grand central / heathrow type hardware, IIRC it
always just checked the level register(s) which resulted in edge
triggered interrupts being missed or misdetected. Most of the mac-io
goop from that time uses edge triggered interrupts, which includes
awacs )
If this actually happens to anyone I'd like to know about it"
To generate a diff of this commit:
cvs rdiff -u -r1.342 -r1.343 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/macppc/conf/MAMBO
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.342 src/sys/arch/macppc/conf/GENERIC:1.343
--- src/sys/arch/macppc/conf/GENERIC:1.342 Fri Feb 23 03:04:01 2018
+++ src/sys/arch/macppc/conf/GENERIC Sat Feb 24 18:58:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.342 2018/02/23 03:04:01 sevan Exp $
+# $NetBSD: GENERIC,v 1.343 2018/02/24 18:58:00 sevan Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.342 $"
+#ident "GENERIC-$Revision: 1.343 $"
maxusers 32
@@ -389,11 +389,7 @@ zsc* at obio?
zstty* at zsc? channel ?
mediabay* at obio?
wdc* at mediabay? flags 0
-# awacs is disabled because on most systems (7300 - 9600 PowerMacs,
-# many kinds of G4s), very heavy load can cause the machine to lock
-# up. ONLY enable this if your machine is never under heavy load, or
-# you'd rather have audio than worry about occasional lockups.
-#awacs* at obio? # Apple audio device
+awacs* at obio? # Apple audio device
ki2c* at obio? # Keywest I2C
ki2c* at uni_n? # Keywest I2C
iic* at ki2c?
Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.18 src/sys/arch/macppc/conf/GENERIC_601:1.19
--- src/sys/arch/macppc/conf/GENERIC_601:1.18 Fri Feb 23 03:04:01 2018
+++ src/sys/arch/macppc/conf/GENERIC_601 Sat Feb 24 18:58:00 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.18 2018/02/23 03:04:01 sevan Exp $
+# $NetBSD: GENERIC_601,v 1.19 2018/02/24 18:58:00 sevan Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.60
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.18 $"
+ident "GENERIC-$Revision: 1.19 $"
maxusers 32
@@ -264,10 +264,6 @@ iic0 at cuda0 # CUDA's IIC bus
zsc* at obio?
zstty* at zsc? channel ?
-# awacs is disabled because on most systems (7300 - 9600 PowerMacs,
-# many kinds of G4s), very heavy load can cause the machine to lock
-# up. ONLY enable this if your machine is never under heavy load, or
-# you'd rather have audio than worry about occasional lockups.
awacs* at obio? # Apple audio device
# Cryptographic Devices
Index: src/sys/arch/macppc/conf/MAMBO
diff -u src/sys/arch/macppc/conf/MAMBO:1.29 src/sys/arch/macppc/conf/MAMBO:1.30
--- src/sys/arch/macppc/conf/MAMBO:1.29 Fri Feb 23 03:04:01 2018
+++ src/sys/arch/macppc/conf/MAMBO Sat Feb 24 18:58:00 2018
@@ -6,7 +6,7 @@ include "arch/macppc/conf/std.macppc.g5
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.29 $"
+#ident "GENERIC-$Revision: 1.30 $"
maxusers 32
@@ -138,10 +138,6 @@ macofcons0 at pci? dev ? function ? # Op
# PCI serial interfaces
nvram* at obio? # nvram
-# awacs is disabled because on most systems (7300 - 9600 PowerMacs,
-# many kinds of G4s), very heavy load can cause the machine to lock
-# up. ONLY enable this if your machine is never under heavy load, or
-# you'd rather have audio than worry about occasional lockups.
#awacs* at obio? # Apple audio device
#ki2c* at obio? # Keywest I2C
wi* at obio? # AirMac