PERFORCE change 42367 for review
Peter Wemm
peter at FreeBSD.org
Fri Nov 14 11:47:48 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=42367
Change 42367 by peter at peter_daintree on 2003/11/14 11:47:22
integrate -I -b smp_hammer
Affected files ...
.. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#7 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#21 integrate
.. //depot/projects/hammer/sys/amd64/include/apicvar.h#14 integrate
.. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#8 integrate
.. //depot/projects/hammer/sys/amd64/isa/atpic.c#22 integrate
Differences ...
==== //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#7 (text+ko) ====
@@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* from: vector.s, 386BSD 0.1 unknown origin
- * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.93 2003/11/13 18:16:37 jhb Exp $
+ * $FreeBSD: src/sys/i386/i386/apic_vector.s,v 1.94 2003/11/14 19:10:12 jhb Exp $
*/
/*
==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#21 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.2 2003/11/12 18:13:57 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.3 2003/11/14 19:10:12 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -110,7 +110,7 @@
IDTVEC(apic_isr4), /* 128 - 159 */
IDTVEC(apic_isr5), /* 160 - 191 */
IDTVEC(apic_isr6), /* 192 - 223 */
- IDTVEC(apic_isr7) /* 224 - 255 */
+ IDTVEC(apic_isr7), /* 224 - 255 */
};
volatile lapic_t *lapic;
==== //depot/projects/hammer/sys/amd64/include/apicvar.h#14 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.3 2003/11/13 16:41:07 jhb Exp $
+ * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.4 2003/11/14 19:10:13 jhb Exp $
*/
#ifndef _MACHINE_APICVAR_H_
@@ -94,10 +94,10 @@
#define IPI_INVLPG (APIC_IPI_INTS + 2)
#define IPI_INVLRNG (APIC_IPI_INTS + 3)
#define IPI_LAZYPMAP (APIC_IPI_INTS + 4) /* Lazy pmap release. */
-#define IPI_STOP (APIC_IPI_INTS + 5) /* Stop CPU until restarted. */
#define IPI_HARDCLOCK (APIC_IPI_INTS + 8) /* Inter-CPU clock handling. */
#define IPI_STATCLOCK (APIC_IPI_INTS + 9)
#define IPI_RENDEZVOUS (APIC_IPI_INTS + 10) /* Inter-CPU rendezvous. */
+#define IPI_STOP (APIC_IPI_INTS + 11) /* Stop CPU until restarted. */
#define APIC_SPURIOUS_INT 255
==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#8 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/i386/include/intr_machdep.h,v 1.1 2003/11/03 21:25:52 jhb Exp $
+ * $FreeBSD: src/sys/i386/include/intr_machdep.h,v 1.2 2003/11/14 19:10:13 jhb Exp $
*/
#ifndef __MACHINE_INTR_MACHDEP_H__
==== //depot/projects/hammer/sys/amd64/isa/atpic.c#22 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/atpic.c,v 1.3 2003/11/12 18:13:57 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/atpic.c,v 1.4 2003/11/14 19:13:06 jhb Exp $");
#include "opt_isa.h"
@@ -253,10 +253,9 @@
/* Reset is finished, default to IRR on read. */
outb(pic->at_ioaddr, OCW3_SEL | OCW3_RR);
- /* Set priority order to 3-7, 0-2 (com2 first). */
+ /* OCW2_L1 sets priority order to 3-7, 0-2 (com2 first). */
if (!slave)
- outb(pic->at_ioaddr, ICU_SETPRI | 0x2);
-
+ outb(pic->at_ioaddr, OCW2_R | OCW2_SL | OCW2_L1);
mtx_unlock_spin(&icu_lock);
}
More information about the p4-projects
mailing list