PERFORCE change 37967 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=37967

Change 37967 by peter at peter_hammer on 2003/09/12 12:04:10

	tidy up some loose ends

Affected files ...

.. //depot/projects/hammer/sys/amd64/acpica/madt.c#2 edit
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#51 edit
.. //depot/projects/hammer/sys/amd64/amd64/mptable.c#4 edit
.. //depot/projects/hammer/sys/amd64/amd64/nexus.c#13 edit
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#34 edit
.. //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#6 edit
.. //depot/projects/hammer/sys/amd64/include/apicvar.h#2 edit
.. //depot/projects/hammer/sys/amd64/include/clock.h#6 edit
.. //depot/projects/hammer/sys/amd64/include/md_var.h#13 edit
.. //depot/projects/hammer/sys/amd64/isa/clock.c#8 edit
.. //depot/projects/hammer/sys/amd64/isa/icu.h#7 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/acpica/madt.c#2 (text+ko) ====

@@ -321,8 +321,8 @@
 	madt = pmap_mapdev(madt_physaddr, madt_length);
 	lapic_init((uintptr_t)madt->LocalApicAddress);
 	printf("ACPI APIC Table: <%.*s %.*s>\n",
-	    sizeof(madt->Header.OemId), madt->Header.OemId,
-	    sizeof(madt->Header.OemTableId), madt->Header.OemTableId);
+	    (int)sizeof(madt->Header.OemId), madt->Header.OemId,
+	    (int)sizeof(madt->Header.OemTableId), madt->Header.OemTableId);
 
 	/*
 	 * We ignore 64-bit local APIC override entries.  Should we
@@ -450,7 +450,7 @@
 		ioapics[apic->IoApicId].io_vector = apic->Vector;
 		/* XXXTEST */
 		printf("MADT: Found IO APIC ID %d, Vector %d at %p\n",
-		    apic->IoApicId, apic->Vector, (void *)apic->IoApicAddress);
+		    apic->IoApicId, apic->Vector, (void *)(uintptr_t)apic->IoApicAddress);
 		break;
 	default:
 		break;

==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#51 (text+ko) ====

@@ -463,11 +463,6 @@
 cpu_idle(void)
 {
 
-#ifdef SMP
-	if (mp_grab_cpu_hlt())
-		return;
-#endif
-
 	if (cpu_idle_hlt) {
 		disable_intr();
   		if (sched_runnable()) {

==== //depot/projects/hammer/sys/amd64/amd64/mptable.c#4 (text+ko) ====

@@ -312,8 +312,8 @@
 		printf("Preset Config %d", mpfps->config_type);
 	} else {
 		lapic_init((uintptr_t)mpct->apic_address);
-		printf("%.*s %.*s", sizeof(mpct->oem_id), mpct->oem_id,
-		    sizeof(mpct->product_id), mpct->product_id);
+		printf("%.*s %.*s", (int)sizeof(mpct->oem_id), mpct->oem_id,
+		    (int)sizeof(mpct->product_id), mpct->product_id);
 	}
 	printf(">\n");
 	return (0);

==== //depot/projects/hammer/sys/amd64/amd64/nexus.c#13 (text+ko) ====

@@ -426,7 +426,7 @@
 	if (error)
 		return (error);
 
-	error = intr_ad_handler(device_get_nameunit(child), irq->r_start,
+	error = intr_add_handler(device_get_nameunit(child), irq->r_start,
 	    ihand, arg, flags, cookiep);
 
 	return (error);

==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#34 (text+ko) ====

@@ -1410,8 +1410,8 @@
 			lazymask = &pmap->pm_active;
 			pmap_lazyfix_self(mymask);
 		} else {
-			atomic_store_rel_int((u_int *)&lazymask,
-			    (u_int)&pmap->pm_active);
+			atomic_store_rel_long((u_long *)&lazymask,
+			    (u_long)&pmap->pm_active);
 			atomic_store_rel_int(&lazywait, 0);
 			ipi_selected(mask, IPI_LAZYPMAP);
 			while (lazywait == 0) {

==== //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#6 (text+ko) ====

@@ -103,4 +103,6 @@
 #define COMPILER_DEPENDENT_INT64       long
 #define COMPILER_DEPENDENT_UINT64      unsigned long
 
+void	acpi_SetDefaultIntrModel(int model);
+
 #endif /* __ACPICA_MACHDEP_H__ */

==== //depot/projects/hammer/sys/amd64/include/apicvar.h#2 (text+ko) ====

@@ -32,6 +32,8 @@
 #ifndef _MACHINE_APICVAR_H_
 #define _MACHINE_APICVAR_H_
 
+#include <machine/segments.h>
+
 /*
  * Local && I/O APIC variable definitions.
  */

==== //depot/projects/hammer/sys/amd64/include/clock.h#6 (text+ko) ====

@@ -37,6 +37,7 @@
 int	rtcin(int val);
 int	sysbeep(int pitch, int period);
 void	init_TSC(void);
+void	init_TSC_tc(void);
 
 #endif /* _KERNEL */
 

==== //depot/projects/hammer/sys/amd64/include/md_var.h#13 (text+ko) ====

@@ -38,6 +38,7 @@
 
 extern	long	Maxmem;
 extern	u_long	atdevbase;	/* offset in virtual memory of ISA io mem */
+extern	u_int	basemem;
 extern	int	busdma_swi_pending;
 extern	u_int	cpu_exthigh;
 extern	u_int	cpu_feature;

==== //depot/projects/hammer/sys/amd64/isa/clock.c#8 (text+ko) ====

@@ -832,7 +832,6 @@
 cpu_initclocks()
 {
 	int diag;
-	register_t crit;
 
 	if (statclock_disable) {
 		/*
@@ -849,13 +848,8 @@
         }
 
 	/* Finish initializing 8254 timer 0. */
-	inthand_add("clk", 0, (driver_intr_t *)clkintr, NULL,
+	intr_add_handler("clk", 0, (driver_intr_t *)clkintr, NULL,
 	    INTR_TYPE_CLK | INTR_FAST, NULL);
-	crit = intr_disable();
-	mtx_lock_spin(&icu_lock);
-	INTREN(IRQ0);
-	mtx_unlock_spin(&icu_lock);
-	intr_restore(crit);
 
 	/* Initialize RTC. */
 	writertc(RTC_STATUSA, rtc_statusa);
@@ -872,12 +866,6 @@
 	    INTR_TYPE_CLK | INTR_FAST, NULL);
 	i8254_intsrc = intr_lookup_source(8);
 
-	crit = intr_disable();
-	mtx_lock_spin(&icu_lock);
-	INTREN(IRQ8);
-	mtx_unlock_spin(&icu_lock);
-	intr_restore(crit);
-
 	writertc(RTC_STATUSB, rtc_statusb);
 }
 

==== //depot/projects/hammer/sys/amd64/isa/icu.h#7 (text+ko) ====

@@ -129,6 +129,4 @@
 #define	ICU_EOI		(OCW2_EOI)	/* non-specific EOI */
 #define	ICU_SETPRI	(OCW2_R | OCW2_SL) /* set rotation priority */
 
-#define	INTRCNT_COUNT	(1 + ICU_LEN + 2 * ICU_LEN)
-
 #endif /* !_I386_ISA_ICU_H_ */