PERFORCE change 67530 for review
John Baldwin
jhb at FreeBSD.org
Wed Dec 22 07:59:24 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=67530
Change 67530 by jhb at jhb_slimer on 2004/12/22 15:58:55
Merge in some changes from the jhb_clock child branch.
Affected files ...
.. //depot/projects/smpng/sys/i386/include/apicvar.h#10 edit
Differences ...
==== //depot/projects/smpng/sys/i386/include/apicvar.h#10 (text+ko) ====
@@ -42,7 +42,7 @@
* 0xff (255) +-------------+
* | | 15 (Spurious / IPIs / Local Interrupts)
* 0xf0 (240) +-------------+
- * | | 14 (I/O Interrupts)
+ * | | 14 (I/O Interrupts / Timer)
* 0xe0 (224) +-------------+
* | | 13 (I/O Interrupts)
* 0xd0 (208) +-------------+
@@ -81,7 +81,10 @@
/* I/O Interrupts are used for external devices such as ISA, PCI, etc. */
#define APIC_IO_INTS (IDT_IO_INTS + 16)
-#define APIC_NUM_IOINTS 192
+#define APIC_NUM_IOINTS 191
+
+/* The timer interrupt is used for clock handling and drives hardclock, etc. */
+#define APIC_TIMER_INT (APIC_IO_INTS + APIC_NUM_IOINTS)
/*
********************* !!! WARNING !!! ******************************
@@ -103,20 +106,12 @@
* other deadlocks caused by IPI_STOP.
*/
-/* Clock interrupts are used for clock handling and drive hardclock, etc. */
-#define APIC_CLOCK_INTS (APIC_IO_INTS + APIC_NUM_IOINTS)
-#define APIC_TIMER_INT APIC_CLOCK_INTS
-#if 0
-#define IPI_HARDCLOCK (APIC_CLOCK_INTS + 1) /* Inter-CPU clock handling. */
-#define IPI_STATCLOCK (APIC_CLOCK_INTS + 2)
-#endif
-
/*
* These interrupt handlers are for IPIs and local interrupts whose handlers
* do not use any spin locks, so they may still be allowed when a spin lock
* is held.
*/
-#define APIC_LOCK_SAFE_INTS (APIC_CLOCK_INTS + 3)
+#define APIC_LOCK_SAFE_INTS (APIC_TIMER_INT + 1)
/* Interrupts for local APIC LVT entries other than the timer. */
#define APIC_LOCAL_INTS APIC_LOCK_SAFE_INTS
@@ -142,7 +137,8 @@
#define IPI_STOP (APIC_IPI_INTS + 6) /* Stop CPU until restarted. */
-/* The spurious interrupt can share the priority class with the IPIs since
+/*
+ * The spurious interrupt can share the priority class with the IPIs since
* it is not a normal interrupt. (Does not use the APIC's interrupt fifo)
*/
#define APIC_SPURIOUS_INT 255
More information about the p4-projects
mailing list