Fri Jan 20 18:47:04 2012 UTC ()
Revert revision 1.4 and change LAPIC_LEVEL_ASSERT / _MASK back to 0x4000.

According to "Intel 64 and IA-32 Architectures Software Developer's Manual"
Vol. 3, May 2011, Order Number: 325384-039US, Section 10.6.1:

	LEVEL_ASSERT is bit #14, bit #13 is reserved.

With this change NetBSD now boots multiple processors under CentOS 6.2/kvm.


(hannken)
diff -r1.10 -r1.11 src/sys/arch/x86/include/i82489reg.h
cvs diff -r1.10 -r1.11 src/sys/arch/x86/include/i82489reg.h (expand / switch to unified diff)

--- src/sys/arch/x86/include/i82489reg.h 2010/11/15 11:58:09 1.10
+++ src/sys/arch/x86/include/i82489reg.h 2012/01/20 18:47:04 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: i82489reg.h,v 1.10 2010/11/15 11:58:09 cegger Exp $ */ 1/* $NetBSD: i82489reg.h,v 1.11 2012/01/20 18:47:04 hannken Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. 4 * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Frank van der Linden. 8 * by Frank van der Linden.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -82,28 +82,28 @@ @@ -82,28 +82,28 @@
82# define LAPIC_DLMODE_LOW 0x00000100 82# define LAPIC_DLMODE_LOW 0x00000100
83# define LAPIC_DLMODE_SMI 0x00000200 83# define LAPIC_DLMODE_SMI 0x00000200
84# define LAPIC_DLMODE_NMI 0x00000400 84# define LAPIC_DLMODE_NMI 0x00000400
85# define LAPIC_DLMODE_INIT 0x00000500 85# define LAPIC_DLMODE_INIT 0x00000500
86# define LAPIC_DLMODE_STARTUP 0x00000600 86# define LAPIC_DLMODE_STARTUP 0x00000600
87# define LAPIC_DLMODE_EXTINT 0x00000700 87# define LAPIC_DLMODE_EXTINT 0x00000700
88 88
89# define LAPIC_DSTMODE_PHYS 0x00000000 89# define LAPIC_DSTMODE_PHYS 0x00000000
90# define LAPIC_DSTMODE_LOG 0x00000800 90# define LAPIC_DSTMODE_LOG 0x00000800
91 91
92# define LAPIC_DLSTAT_BUSY 0x00001000 92# define LAPIC_DLSTAT_BUSY 0x00001000
93# define LAPIC_DLSTAT_IDLE 0x00000000 93# define LAPIC_DLSTAT_IDLE 0x00000000
94 94
95# define LAPIC_LEVEL_MASK 0x00002000 95# define LAPIC_LEVEL_MASK 0x00004000
96# define LAPIC_LEVEL_ASSERT 0x00002000 96# define LAPIC_LEVEL_ASSERT 0x00004000
97# define LAPIC_LEVEL_DEASSERT 0x00000000 97# define LAPIC_LEVEL_DEASSERT 0x00000000
98 98
99# define LAPIC_TRIGGER_MASK 0x00008000 99# define LAPIC_TRIGGER_MASK 0x00008000
100# define LAPIC_TRIGGER_EDGE 0x00000000 100# define LAPIC_TRIGGER_EDGE 0x00000000
101# define LAPIC_TRIGGER_LEVEL 0x00008000 101# define LAPIC_TRIGGER_LEVEL 0x00008000
102 102
103# define LAPIC_DEST_MASK 0x000c0000 103# define LAPIC_DEST_MASK 0x000c0000
104# define LAPIC_DEST_DEFAULT 0x00000000 104# define LAPIC_DEST_DEFAULT 0x00000000
105# define LAPIC_DEST_SELF 0x00040000 105# define LAPIC_DEST_SELF 0x00040000
106# define LAPIC_DEST_ALLINCL 0x00080000 106# define LAPIC_DEST_ALLINCL 0x00080000
107# define LAPIC_DEST_ALLEXCL 0x000c0000 107# define LAPIC_DEST_ALLEXCL 0x000c0000
108 108
109 109