Date: Tue, 14 Feb 2006 08:12:45 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 91738 for review Message-ID: <200602140812.k1E8CjII070516@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=91738 Change 91738 by kmacy@kmacy_storage:sun4v_work on 2006/02/14 08:11:45 "fix" ASI related compile errors in all files except exception.S fix undefined symbols issues in machdep.c Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpu.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/md_var.h#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/param.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#3 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#2 edit Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/cpu.h#2 (text+ko) ==== @@ -83,6 +83,8 @@ return (rd(tick)); } +#define UNIMPLEMENTED panic("%s not implemented", __FUNCTION__) + #endif #endif /* !_MACHINE_CPU_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/md_var.h#3 (text+ko) ==== @@ -58,7 +58,6 @@ extern cpu_block_copy_t *cpu_block_copy; extern cpu_block_zero_t *cpu_block_zero; -#define UNIMPLEMENTED panic("%s not implemented", __FUNCTION__) #endif /* !_MACHINE_MD_VAR_H_ */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/param.h#2 (text+ko) ==== @@ -87,6 +87,11 @@ #define PAGE_SIZE_4M (1L<<PAGE_SHIFT_4M) #define PAGE_MASK_4M (PAGE_SIZE_4M-1) +#define PAGE_SHIFT_256M 28 +#define PAGE_SIZE_256M (1L<<PAGE_SHIFT_256M) +#define PAGE_MASK_256M (PAGE_SIZE_256M-1) + + #define PAGE_SHIFT_MIN PAGE_SHIFT_8K #define PAGE_SIZE_MIN PAGE_SIZE_8K #define PAGE_MASK_MIN PAGE_MASK_8K ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/interrupt.S#2 (text+ko) ==== @@ -74,7 +74,10 @@ ldxa [%g0 + AA_SDB_INTR_D0] %asi, %g3 ldxa [%g0 + AA_SDB_INTR_D1] %asi, %g4 ldxa [%g0 + AA_SDB_INTR_D2] %asi, %g5 +#ifdef notyet + /* XXX SUN4V_FIXME */ stxa %g0, [%g0] ASI_INTR_RECEIVE +#endif membar #Sync /* ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/machdep.c#3 (text+ko) ==== @@ -147,8 +147,6 @@ char sparc64_model[32]; -static int cpu_use_vis = 1; - cpu_block_copy_t *cpu_block_copy; cpu_block_zero_t *cpu_block_zero; @@ -344,14 +342,8 @@ cache_init(child); - getenv_int("machdep.use_vis", &cpu_use_vis); - if (cpu_use_vis) { - cpu_block_copy = spitfire_block_copy; - cpu_block_zero = spitfire_block_zero; - } else { - cpu_block_copy = bcopy; - cpu_block_zero = bzero; - } + cpu_block_copy = bcopy; + cpu_block_zero = bzero; #ifdef SMP mp_tramp = mp_tramp_alloc(); @@ -398,7 +390,10 @@ pcpu_init(pc, 0, sizeof(struct pcpu)); pc->pc_curthread = &thread0; pc->pc_curpcb = thread0.td_pcb; +#ifdef notyet + /* SUN4V_FIXME what is pc_mid? */ pc->pc_mid = UPA_CR_GET_MID(ldxa(0, ASI_UPA_CONFIG_REG)); +#endif pc->pc_addr = (vm_offset_t)pcpu0; pc->pc_node = child; pc->pc_tlb_ctx = TLB_CTX_USER_MIN; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/pmap.c#2 (text+ko) ==== @@ -45,10 +45,7 @@ #include <machine/tte.h> #include <machine/tsb.h> -#include <machine/mmuvar.h> -#include <machine/pmap.h> #include <machine/hypervisor_api.h> -#include "mmu_if.h" #define PMAP_DEBUG @@ -64,6 +61,11 @@ static struct ofw_map translations[128]; static int translations_size; + +struct ofw_mem_region sparc64_memreg[128]; +int sparc64_nmemreg; + + static vm_offset_t pmap_idle_map; static vm_offset_t pmap_temp_map_1; static vm_offset_t pmap_temp_map_2; @@ -511,7 +513,7 @@ } void -pmap_growkernel(mmu_t mmu, vm_offset_t addr) +pmap_growkernel(vm_offset_t addr) { panic("pmap_growkernel: can't grow kernel"); } @@ -582,7 +584,7 @@ } void -pmap_map_tsb(mmu_t mmu) +pmap_map_tsb(void) { vm_offset_t va; vm_paddr_t pa; ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/support.S#2 (text+ko) ==== @@ -659,6 +659,8 @@ ! never to return END(openfirmware_exit) +#endif + #ifdef GPROF ENTRY(user) ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/swtch.S#2 (text+ko) ==== @@ -225,6 +225,8 @@ */ stx %i2, [PCPU(PMAP)] +#ifdef notyet + /* XXX SUN4V_FIXME */ /* * Fiddle the hardware bits. Set the tsb registers and install the * new context number in the cpu. @@ -237,7 +239,7 @@ mov AA_DMMU_PCXR, %i5 stxa %i3, [%i5] ASI_DMMU membar #Sync - +#endif /* * Done. Return and load the new process's window from the stack. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602140812.k1E8CjII070516>