PERFORCE change 92116 for review

[Kip Macy]

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

Change 92116 by kmacy at kmacy_storage:sun4v_work on 2006/02/21 07:13:19

	add back rwindow.c - still needed by signal handler
	update files.sun4v
	ifdef out parts of machdep files to fix linker complaints

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#5 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/bus_machdep.c#3 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/dump_machdep.c#3 edit
.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/rwindow.c#3 add

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#5 (text+ko) ====

@@ -25,6 +25,7 @@
 dev/ofw/ofw_bus_subr.c		standard
 dev/ofw/ofw_console.c		optional	ofw_console
 dev/ofw/openfirm.c		standard
+dev/ofw/openfirm_mmu.c		standard
 dev/ofw/openfirmio.c		standard
 dev/ofw/openpromio.c		standard
 dev/uart/uart_cpu_sparc64.c	optional	uart
@@ -68,12 +69,12 @@
 sun4v/sun4v/ofw_machdep.c	standard
 sun4v/sun4v/pmap.c		standard
 sun4v/sun4v/prof_machdep.c	optional	profiling-routine
-sun4v/sun4v/rwindow.c	standard
+sun4v/sun4v/rwindow.c		standard
 sun4v/sun4v/support.S	standard
 sun4v/sun4v/sys_machdep.c	standard
 sun4v/sun4v/swtch.S		standard
-sun4v/sun4v/tlb.c		standard
 sun4v/sun4v/tsb.c		standard
+sun4v/sun4v/tte.c		standard
 sun4v/sun4v/tick.c		standard
 sun4v/sun4v/trap.c		standard
 sun4v/sun4v/uio_machdep.c	standard

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/bus_machdep.c#3 (text+ko) ====

@@ -701,6 +701,7 @@
 sparc64_bus_mem_map(bus_space_tag_t tag, bus_space_handle_t handle,
     bus_size_t size, int flags, vm_offset_t vaddr, void **hp)
 {
+#if 0
 	vm_offset_t addr;
 	vm_offset_t sva;
 	vm_offset_t va;
@@ -751,12 +752,14 @@
 		pa += PAGE_SIZE;
 	} while ((vsz -= PAGE_SIZE) > 0);
 	tlb_range_demap(kernel_pmap, sva, sva + size - 1);
+#endif
 	return (0);
 }
 
 int
 sparc64_bus_mem_unmap(void *bh, bus_size_t size)
 {
+#if 0
 	vm_offset_t sva;
 	vm_offset_t va;
 	vm_offset_t endva;
@@ -767,6 +770,7 @@
 		pmap_kremove_flags(va);
 	tlb_range_demap(kernel_pmap, sva, sva + size - 1);
 	kmem_free(kernel_map, sva, size);
+#endif
 	return (0);
 }
 

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/dump_machdep.c#3 (text+ko) ====

@@ -41,8 +41,9 @@
 #include <machine/metadata.h>
 #include <machine/kerneldump.h>
 #include <machine/ofw_mem.h>
+#include <machine/tte.h>
 #include <machine/tsb.h>
-#include <machine/tlb.h>
+
 
 CTASSERT(sizeof(struct kerneldumpheader) == DEV_BSIZE);
 
@@ -144,7 +145,9 @@
 			printf("%c\b", "|/-\\"[twiddle++ & 3]);
 		rsz = size - pos;
 		rsz = (rsz > MAXDUMPSZ) ? MAXDUMPSZ : rsz;
+#ifdef notyet
 		va = TLB_PHYS_TO_DIRECT(pa + pos);
+#endif
 		error = di->dumper(di->priv, (void *)va, 0, dumplo, rsz);
 		if (error)
 			break;
@@ -202,8 +205,11 @@
 
 	/* Dump the private header. */
 	hdr.dh_hdr_size = hdrsize;
+#ifdef notyet
+	/* XXX SUN4V_FIXME */
 	hdr.dh_tsb_pa = tsb_kernel_phys;
 	hdr.dh_tsb_size = tsb_kernel_size;
+#endif
 	hdr.dh_nregions = nreg;
 
 	if (buf_write(di, (char *)&hdr, sizeof(hdr)) != 0)