PERFORCE change 41291 for review
Peter Wemm
peter at FreeBSD.org
Mon Nov 3 16:49:32 PST 2003
http://perforce.freebsd.org/chv.cgi?CH=41291
Change 41291 by peter at peter_daintree on 2003/11/03 16:48:40
p4 integ -b smp_hammer -I (after commits)
Affected files ...
.. //depot/projects/hammer/sys/amd64/acpica/madt.c#11 integrate
.. //depot/projects/hammer/sys/amd64/amd64/apic_vector.s#11 delete
.. //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#4 integrate
.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#12 integrate
.. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#15 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#20 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mpboot.s#12 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#7 integrate
.. //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#3 integrate
.. //depot/projects/hammer/sys/amd64/include/apicreg.h#2 delete
.. //depot/projects/hammer/sys/amd64/include/apicvar.h#8 integrate
.. //depot/projects/hammer/sys/amd64/include/intr_machdep.h#5 integrate
.. //depot/projects/hammer/sys/amd64/include/mptable.h#2 integrate
.. //depot/projects/hammer/sys/amd64/include/smp.h#8 integrate
.. //depot/projects/hammer/sys/amd64/isa/atpic.c#11 integrate
.. //depot/projects/hammer/sys/amd64/isa/nmi.c#2 delete
.. //depot/projects/hammer/sys/jhb_notes#9 integrate
Differences ...
==== //depot/projects/hammer/sys/amd64/acpica/madt.c#11 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/acpica/madt.c,v 1.1 2003/11/03 22:17:44 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/amd64/intr_machdep.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.1 2003/11/03 21:25:52 jhb Exp $
*/
/*
==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#12 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/io_apic.c,v 1.1 2003/11/03 21:53:36 jhb Exp $");
#include "opt_isa.h"
#include "opt_no_mixed_mode.h"
==== //depot/projects/hammer/sys/amd64/amd64/local_apic.c#15 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/local_apic.c,v 1.1 2003/11/03 21:53:36 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#20 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.219 2003/10/30 21:42:16 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.220 2003/11/03 22:32:03 jhb Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
==== //depot/projects/hammer/sys/amd64/amd64/mpboot.s#12 (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/i386/mpboot.s,v 1.22 2003/10/30 21:42:44 jhb Exp $
+ * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.23 2003/11/03 22:32:03 jhb Exp $
*/
#include <machine/asmacros.h> /* miscellaneous asm macros */
==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mptable.c,v 1.220 2003/11/03 22:12:37 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/amd64/mptable_pci.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/i386/mptable_pci.c,v 1.1 2003/11/03 22:12:37 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/hammer/sys/amd64/include/apicvar.h#8 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/apicvar.h,v 1.1 2003/11/03 21:53:38 jhb Exp $
*/
#ifndef _MACHINE_APICVAR_H_
==== //depot/projects/hammer/sys/amd64/include/intr_machdep.h#5 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/intr_machdep.h,v 1.1 2003/11/03 21:25:52 jhb Exp $
*/
#ifndef __MACHINE_INTR_MACHDEP_H__
==== //depot/projects/hammer/sys/amd64/include/mptable.h#2 (text+ko) ====
@@ -22,7 +22,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: src/sys/i386/include/mptable.h,v 1.220 2003/11/03 22:12:37 jhb Exp $
*/
#ifndef __MACHINE_MPTABLE_H__
==== //depot/projects/hammer/sys/amd64/include/smp.h#8 (text+ko) ====
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD: src/sys/i386/include/smp.h,v 1.76 2003/04/02 23:53:29 peter Exp $
+ * $FreeBSD: src/sys/i386/include/smp.h,v 1.77 2003/11/03 22:32:04 jhb Exp $
*
*/
==== //depot/projects/hammer/sys/amd64/isa/atpic.c#11 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/i386/isa/atpic.c,v 1.1 2003/11/03 21:34:45 jhb Exp $");
#include "opt_auto_eoi.h"
#include "opt_isa.h"
==== //depot/projects/hammer/sys/jhb_notes#9 (text+ko) ====
@@ -1,62 +1,12 @@
-All files are under sys/i386
-
-Files moved in this branch:
-- include/apic.h -> include/apicreg.h
-- isa/apic_vector.s -> i386/apic_vector.s
-- isa/icu_vector.s -> isa/atpic_vector.s
-- isa/intr_machdep.c -> isa/atpic.c (sort of)
-- isa/intr_machdep.c -> isa/nmi.c
-- isa/intr_machdep.h -> include/intr_machdep.h (sort of)
-
-New files:
-- acpica/madt.c
-- i386/local_apic.c
-- i386/io_apic.c
-- i386/mptable.c (from mp_machdep.c)
-- i386/mptable_pci.c
-- include/apicvar.h
-- include/mptable.h (from mp_machdep.c)
-
-Files removed in this branch:
-- conf/SMP
-- i386/mpapic.c
-- isa/intr_machdep.c
-- isa/intr_machdep.h
-- isa/icu_ipl.s
-- isa/icu_vector.s
-- isa/apic_ipl.s
-- isa/apic_vector.s
-- isa/ithread.c
-- isa/vector.s
-
-Repocopies needed:
-- include/apic.h -> include/apicreg.h
-- isa/apic_vector.s -> i386/apic_vector.s
-- isa/icu_vector.s -> isa/atpic_vector.s
-- isa/intr_machdep.c -> isa/atpic.c (nothing will be kept)
-- isa/intr_machdep.c -> isa/nmi.c
-- i386/mp_machdep.c -> include/mptable.h
-- i386/mp_machdep.c -> i386/mptable.c
-
Todo:
- DDB
- + Add APIC ID to show pcpu
- + Add 'show intrcnt'
- + Add 'show idt'
- Add 'show ithread'
+ Add 'show irqs'
- print out PIC driver name for each IRQ?
- Add 'show irq'
-+ Add nmi.c
-+ Set PCPU(apic_id) for UP case in lapic_init().
-+ Use apic id of BSP (current CPU) when programming temporary physical
- destinations into I/O APIC RDT entries.
+ Fix IDT_SYSCALL mapping in APIC case
+ Retest interrupts
- Somehow test IRQ's in this range?
-+ Test mixed mode
- + works on SMP when single physical destination
-+ Fix bogus SMP probe when only 1 CPU
- Kill isa_irq_pending() (maybe, is this an MI function?)
+ Add ACPI MADT APIC enumerator.
- Use APIC ID's for index in lapics[] array instead of ACPI IDs, ACPI
@@ -79,13 +29,8 @@
+ Add NO_MIXED_MODE option
- Add runtime decision for IRQ0 mixed mode?
- Don't use mixed mode with MADT?
-+ SMP bogons
- + doesn't work on 750x
- + pmap_lazyfix unhappy with old-style critical sections
-- Chokes on scott's dual P3 when looking for ACPI RSDT.
- Perhaps change the IRQ resource manager such that it starts out empty
and a resource entry for each IRQ is added as each IRQ is registered
-- Clean up includes in new files.
- Add handling of local APIC ERROR lvt.
- Use the local apic timer to drive hard/stat/profclock (maybe too hard)
- Do we need to be able to renumber I/O APICs?
More information about the p4-projects
mailing list