Date: Thu, 9 Mar 2006 07:55:39 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 93019 for review Message-ID: <200603090755.k297tdDd067018@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=93019 Change 93019 by kmacy@kmacy_storage:sun4v_work on 2006/03/09 07:54:39 add for ISA simulator disk Affected files ... .. //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#8 edit .. //depot/projects/kmacy_sun4v/src/sys/conf/options.sun4v#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#4 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisorvar.h#2 edit .. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/simdisk.c#1 add Differences ... ==== //depot/projects/kmacy_sun4v/src/sys/conf/files.sun4v#8 (text+ko) ==== @@ -69,7 +69,8 @@ sun4v/sun4v/pmap.c standard sun4v/sun4v/prof_machdep.c optional profiling-routine sun4v/sun4v/rwindow.c standard -sun4v/sun4v/support.S standard +sun4v/sun4v/simdisk.c optional simulator +sun4v/sun4v/support.S standard sun4v/sun4v/sys_machdep.c standard sun4v/sun4v/swtch.S standard sun4v/sun4v/tsb.c standard ==== //depot/projects/kmacy_sun4v/src/sys/conf/options.sun4v#2 (text+ko) ==== @@ -12,4 +12,5 @@ # Debug IOMMU inserts/removes using diagnostic accesses. Very loud. IOMMU_DIAG opt_iommu.h PMAP_STATS opt_pmap.h +SIMULATOR opt_simulator.h ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/conf/GENERIC#4 (text+ko) ==== @@ -190,3 +190,5 @@ #device firewire # FireWire bus code #device sbp # SCSI over FireWire (Requires scbus and da) #device fwe # Ethernet over FireWire (non-standard!) + +options SIMULATOR # compile for ISA simulator ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#4 (text+ko) ==== @@ -34,9 +34,6 @@ * io-api.txt version 1.11 dated 10/19/2004 */ -#ifdef __cplusplus -extern "C" { -#endif #include <machine/hypervisorvar.h> #ifndef _ASM @@ -91,14 +88,12 @@ extern uint64_t hvio_intr_setstate(uint64_t sysino, int intr_state); extern uint64_t hvio_intr_gettarget(uint64_t sysino, uint32_t *cpuid); extern uint64_t hvio_intr_settarget(uint64_t sysino, uint32_t cpuid); + extern void hv_magic_trap_on(void); extern void hv_magic_trap_off(void); +extern int hv_sim_read(uint64_t offset, vm_paddr_t buffer_ra, uint64_t size); +extern int hv_sim_write(uint64_t offset, vm_paddr_t buffer_ra, uint64_t size); - -#endif - -#ifdef __cplusplus -} #endif #endif /* _MACHINE_HYPERVISOR_API_H */ ==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisorvar.h#2 (text+ko) ==== @@ -121,6 +121,10 @@ #define HVIO_MSG_GETVALID 0xd2 #define HVIO_MSG_SETVALID 0xd3 +#define HVIO_SIM_READ 0xf0 +#define HVIO_SIM_WRITE 0xf1 + + #ifdef SET_MMU_STATS #define MMU_STAT_AREA 0xfc #endif /* SET_MMU_STATS */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200603090755.k297tdDd067018>