Date: Thu, 7 Jan 2010 00:06:21 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 172692 for review Message-ID: <201001070006.o0706L10055173@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=172692 Change 172692 by thompsa@thompsa_pea on 2010/01/07 00:06:04 IFC @172690 Affected files ... .. //depot/projects/usb/src/lib/libusb/Makefile#7 integrate .. //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#13 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#33 integrate .. //depot/projects/usb/src/sys/amd64/include/cpufunc.h#8 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc.c#12 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_fa526.S#1 branch .. //depot/projects/usb/src/sys/arm/arm/elf_trampoline.c#12 integrate .. //depot/projects/usb/src/sys/arm/conf/CNS11XXNAS#1 branch .. //depot/projects/usb/src/sys/arm/conf/DEFAULTS#4 integrate .. //depot/projects/usb/src/sys/arm/econa/cfi_bus_econa.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/econa.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/econa_machdep.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/econa_reg.h#1 branch .. //depot/projects/usb/src/sys/arm/econa/econa_var.h#1 branch .. //depot/projects/usb/src/sys/arm/econa/ehci_ebus.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/files.econa#1 branch .. //depot/projects/usb/src/sys/arm/econa/if_ece.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/if_ecereg.h#1 branch .. //depot/projects/usb/src/sys/arm/econa/if_ecevar.h#1 branch .. //depot/projects/usb/src/sys/arm/econa/ohci_ec.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/std.econa#1 branch .. //depot/projects/usb/src/sys/arm/econa/timer.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/uart_bus_ec.c#1 branch .. //depot/projects/usb/src/sys/arm/econa/uart_cpu_ec.c#1 branch .. //depot/projects/usb/src/sys/arm/include/cpuconf.h#5 integrate .. //depot/projects/usb/src/sys/arm/include/cpufunc.h#8 integrate .. //depot/projects/usb/src/sys/boot/common/module.c#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/Makefile.inc#5 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot0.5/selector.s#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/asm.S#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/asm.h#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/bios.S#3 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot.c#6 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot.h#3 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot1.S#1 branch .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot2.S#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot2.c#1 branch .. //depot/projects/usb/src/sys/boot/pc98/boot2/dinode.h#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/disk.c#3 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/fs.h#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/inode.h#3 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/io.c#3 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/probe_keyboard.c#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/quota.h#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/serial.S#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/serial_16550.S#3 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/serial_8251.S#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/start.S#2 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/sys.c#4 delete .. //depot/projects/usb/src/sys/boot/pc98/boot2/table.c#2 delete .. //depot/projects/usb/src/sys/boot/pc98/libpc98/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/libpc98.h#1 branch .. //depot/projects/usb/src/sys/boot/pc98/libpc98/pc98_sys.c#1 branch .. //depot/projects/usb/src/sys/boot/pc98/loader/main.c#8 integrate .. //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#7 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/zfsimpl.h#6 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/zfssubr.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#11 integrate .. //depot/projects/usb/src/sys/conf/Makefile.arm#10 integrate .. //depot/projects/usb/src/sys/conf/options.arm#12 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_ibm.c#11 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#34 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#26 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus.c#12 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dc.c#13 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dcreg.h#8 integrate .. //depot/projects/usb/src/sys/dev/exca/excareg.h#3 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#36 integrate .. //depot/projects/usb/src/sys/dev/isp/isp.c#10 integrate .. //depot/projects/usb/src/sys/dev/mii/tdkphy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mk48txx/mk48txx.c#6 integrate .. //depot/projects/usb/src/sys/dev/pccard/card_if.m#4 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#33 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_private.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#62 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#13 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#95 integrate .. //depot/projects/usb/src/sys/dev/xl/if_xl.c#8 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clrpcops.c#6 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clstate.c#9 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdstate.c#8 integrate .. //depot/projects/usb/src/sys/geom/geom_slice.c#5 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#11 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#23 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#18 integrate .. //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#11 integrate .. //depot/projects/usb/src/sys/geom/uzip/g_uzip.c#4 integrate .. //depot/projects/usb/src/sys/i386/conf/DEFAULTS#14 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#32 integrate .. //depot/projects/usb/src/sys/i386/include/cpufunc.h#12 integrate .. //depot/projects/usb/src/sys/ia64/conf/DEFAULTS#10 integrate .. //depot/projects/usb/src/sys/ia64/conf/GENERIC#15 integrate .. //depot/projects/usb/src/sys/ia64/include/bus.h#4 integrate .. //depot/projects/usb/src/sys/kern/kern_event.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_umtx.c#13 integrate .. //depot/projects/usb/src/sys/kern/sched_4bsd.c#13 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#23 integrate .. //depot/projects/usb/src/sys/kern/subr_acl_nfs4.c#5 integrate .. //depot/projects/usb/src/sys/kern/tty.c#35 integrate .. //depot/projects/usb/src/sys/kern/tty_compat.c#3 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#21 integrate .. //depot/projects/usb/src/sys/kern/uipc_sem.c#11 integrate .. //depot/projects/usb/src/sys/mips/conf/DEFAULTS#4 integrate .. //depot/projects/usb/src/sys/net/if.c#44 integrate .. //depot/projects/usb/src/sys/net/if_bridge.c#23 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#27 integrate .. //depot/projects/usb/src/sys/net/if_var.h#33 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#21 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ipfw.c#7 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#33 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#26 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.h#3 integrate .. //depot/projects/usb/src/sys/netinet/ip_dummynet.h#10 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dummynet.c#7 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw2.c#15 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_dynamic.c#3 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_log.c#3 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_nat.c#8 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_pfil.c#8 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_private.h#3 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_sockopt.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#22 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#29 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#25 integrate .. //depot/projects/usb/src/sys/pc98/conf/DEFAULTS#9 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#23 integrate .. //depot/projects/usb/src/sys/powerpc/conf/DEFAULTS#9 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#25 integrate .. //depot/projects/usb/src/sys/security/mac_lomac/mac_lomac.c#16 integrate .. //depot/projects/usb/src/sys/sparc64/conf/DEFAULTS#9 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#25 integrate .. //depot/projects/usb/src/sys/sparc64/conf/NOTES#6 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psycho.c#14 integrate .. //depot/projects/usb/src/sys/sparc64/pci/psychovar.h#7 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizo.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizovar.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/eeprom.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#19 integrate .. //depot/projects/usb/src/sys/sun4v/conf/DEFAULTS#6 integrate .. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#17 integrate .. //depot/projects/usb/src/sys/sys/_semaphore.h#2 integrate .. //depot/projects/usb/src/sys/sys/_umtx.h#1 branch .. //depot/projects/usb/src/sys/sys/copyright.h#6 integrate .. //depot/projects/usb/src/sys/sys/event.h#9 integrate .. //depot/projects/usb/src/sys/sys/param.h#49 integrate .. //depot/projects/usb/src/sys/sys/semaphore.h#3 delete .. //depot/projects/usb/src/sys/sys/tty.h#14 integrate .. //depot/projects/usb/src/sys/sys/umtx.h#9 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libusb/Makefile,v 1.7 2009/07/19 17:25:24 kensmith Exp $ +# $FreeBSD: src/lib/libusb/Makefile,v 1.8 2010/01/02 09:58:07 ed Exp $ # # Makefile for the FreeBSD specific LibUSB 2.0 # @@ -16,6 +16,8 @@ MKLINT= no NOGCCERROR= +WARNS?= 2 + MLINKS+= libusb.3 usb.3 # libusb 0.1 compat ==== //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#13 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.20 2009/12/16 02:17:43 dougb Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.21 2010/01/04 21:30:04 imp Exp $ machine amd64 @@ -20,10 +20,3 @@ options GEOM_PART_EBR options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR - -# Store the plain version of the configuration file in the kernel itself. -# To store the entire file, including comments, put this in /etc/src.conf: -# CONFIGARGS= -C -# See config(8) for more details. -# -options INCLUDE_CONFIG_FILE # Include this file in kernel ==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#33 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.534 2009/10/13 19:02:03 jhb Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.535 2010/01/03 20:40:54 brooks Exp $ cpu HAMMER ident GENERIC @@ -274,6 +274,7 @@ device loop # Network loopback device random # Entropy device device ether # Ethernet support +device vlan # 802.1Q VLAN support device tun # Packet tunnel. device pty # BSD-style compatibility pseudo ttys device md # Memory "disks" ==== //depot/projects/usb/src/sys/amd64/include/cpufunc.h#8 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.155 2009/09/30 16:34:50 avg Exp $ + * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.156 2010/01/01 20:55:11 obrien Exp $ */ /* @@ -190,28 +190,28 @@ } static __inline void -insb(u_int port, void *addr, size_t cnt) +insb(u_int port, void *addr, size_t count) { __asm __volatile("cld; rep; insb" - : "+D" (addr), "+c" (cnt) + : "+D" (addr), "+c" (count) : "d" (port) : "memory"); } static __inline void -insw(u_int port, void *addr, size_t cnt) +insw(u_int port, void *addr, size_t count) { __asm __volatile("cld; rep; insw" - : "+D" (addr), "+c" (cnt) + : "+D" (addr), "+c" (count) : "d" (port) : "memory"); } static __inline void -insl(u_int port, void *addr, size_t cnt) +insl(u_int port, void *addr, size_t count) { __asm __volatile("cld; rep; insl" - : "+D" (addr), "+c" (cnt) + : "+D" (addr), "+c" (count) : "d" (port) : "memory"); } @@ -244,26 +244,26 @@ } static __inline void -outsb(u_int port, const void *addr, size_t cnt) +outsb(u_int port, const void *addr, size_t count) { __asm __volatile("cld; rep; outsb" - : "+S" (addr), "+c" (cnt) + : "+S" (addr), "+c" (count) : "d" (port)); } static __inline void -outsw(u_int port, const void *addr, size_t cnt) +outsw(u_int port, const void *addr, size_t count) { __asm __volatile("cld; rep; outsw" - : "+S" (addr), "+c" (cnt) + : "+S" (addr), "+c" (count) : "d" (port)); } static __inline void -outsl(u_int port, const void *addr, size_t cnt) +outsl(u_int port, const void *addr, size_t count) { __asm __volatile("cld; rep; outsl" - : "+S" (addr), "+c" (cnt) + : "+S" (addr), "+c" (count) : "d" (port)); } @@ -670,9 +670,9 @@ void ia32_pause(void); u_char inb(u_int port); u_int inl(u_int port); -void insb(u_int port, void *addr, size_t cnt); -void insl(u_int port, void *addr, size_t cnt); -void insw(u_int port, void *addr, size_t cnt); +void insb(u_int port, void *addr, size_t count); +void insl(u_int port, void *addr, size_t count); +void insw(u_int port, void *addr, size_t count); register_t intr_disable(void); void intr_restore(register_t rf); void invd(void); @@ -697,9 +697,9 @@ void ltr(u_short sel); void outb(u_int port, u_char data); void outl(u_int port, u_int data); -void outsb(u_int port, const void *addr, size_t cnt); -void outsl(u_int port, const void *addr, size_t cnt); -void outsw(u_int port, const void *addr, size_t cnt); +void outsb(u_int port, const void *addr, size_t count); +void outsl(u_int port, const void *addr, size_t count); +void outsw(u_int port, const void *addr, size_t count); void outw(u_int port, u_short data); u_long rcr0(void); u_long rcr2(void); ==== //depot/projects/usb/src/sys/arm/arm/cpufunc.c#12 (text+ko) ==== @@ -45,7 +45,7 @@ * Created : 30/01/97 */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.29 2009/10/03 13:59:15 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/cpufunc.c,v 1.30 2010/01/04 03:35:45 rpaulo Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -781,6 +781,73 @@ xscale_setup /* cpu setup */ }; #endif /* CPU_XSCALE_81342 */ + + +#if defined(CPU_FA526) +struct cpu_functions fa526_cpufuncs = { + /* CPU functions */ + + .cf_id = cpufunc_id, + .cf_cpwait = cpufunc_nullop, + + /* MMU functions */ + + .cf_control = cpufunc_control, + .cf_domains = cpufunc_domains, + .cf_setttb = fa526_setttb, + .cf_faultstatus = cpufunc_faultstatus, + .cf_faultaddress = cpufunc_faultaddress, + + /* TLB functions */ + + .cf_tlb_flushID = armv4_tlb_flushID, + .cf_tlb_flushID_SE = fa526_tlb_flushID_SE, + .cf_tlb_flushI = armv4_tlb_flushI, + .cf_tlb_flushI_SE = fa526_tlb_flushI_SE, + .cf_tlb_flushD = armv4_tlb_flushD, + .cf_tlb_flushD_SE = armv4_tlb_flushD_SE, + + /* Cache operations */ + + .cf_icache_sync_all = fa526_icache_sync_all, + .cf_icache_sync_range = fa526_icache_sync_range, + + .cf_dcache_wbinv_all = fa526_dcache_wbinv_all, + .cf_dcache_wbinv_range = fa526_dcache_wbinv_range, + .cf_dcache_inv_range = fa526_dcache_inv_range, + .cf_dcache_wb_range = fa526_dcache_wb_range, + + .cf_idcache_wbinv_all = fa526_idcache_wbinv_all, + .cf_idcache_wbinv_range = fa526_idcache_wbinv_range, + + + .cf_l2cache_wbinv_all = cpufunc_nullop, + .cf_l2cache_wbinv_range = (void *)cpufunc_nullop, + .cf_l2cache_inv_range = (void *)cpufunc_nullop, + .cf_l2cache_wb_range = (void *)cpufunc_nullop, + + + /* Other functions */ + + .cf_flush_prefetchbuf = fa526_flush_prefetchbuf, + .cf_drain_writebuf = armv4_drain_writebuf, + .cf_flush_brnchtgt_C = cpufunc_nullop, + .cf_flush_brnchtgt_E = fa526_flush_brnchtgt_E, + + .cf_sleep = fa526_cpu_sleep, + + /* Soft functions */ + + .cf_dataabt_fixup = cpufunc_null_fixup, + .cf_prefetchabt_fixup = cpufunc_null_fixup, + + .cf_context_switch = fa526_context_switch, + + .cf_setup = fa526_setup +}; +#endif /* CPU_FA526 */ + + /* * Global constants also used by locore.s */ @@ -793,6 +860,7 @@ defined (CPU_ARM9E) || defined (CPU_ARM10) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ + defined(CPU_FA526) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) static void get_cachetype_cp15(void); @@ -1073,6 +1141,19 @@ goto out; } #endif /* CPU_SA1110 */ +#ifdef CPU_FA526 + if (cputype == CPU_ID_FA526) { + cpufuncs = fa526_cpufuncs; + cpu_reset_needs_v4_MMU_disable = 1; /* SA needs it */ + get_cachetype_cp15(); + pmap_pte_init_generic(); + + /* Use powersave on this CPU. */ + cpu_do_powersave = 1; + + goto out; + } +#endif /* CPU_FA526 */ #ifdef CPU_IXP12X0 if (cputype == CPU_ID_IXP1200) { cpufuncs = ixp12x0_cpufuncs; @@ -1547,7 +1628,8 @@ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ - defined(CPU_ARM10) || defined(CPU_ARM11) + defined(CPU_ARM10) || defined(CPU_ARM11) || \ + defined(CPU_FA526) #define IGN 0 #define OR 1 @@ -2013,6 +2095,62 @@ } #endif /* CPU_SA1100 || CPU_SA1110 */ +#if defined(CPU_FA526) +struct cpu_option fa526_options[] = { +#ifdef COMPAT_12 + { "nocache", IGN, BIC, (CPU_CONTROL_IC_ENABLE | + CPU_CONTROL_DC_ENABLE) }, + { "nowritebuf", IGN, BIC, CPU_CONTROL_WBUF_ENABLE }, +#endif /* COMPAT_12 */ + { "cpu.cache", BIC, OR, (CPU_CONTROL_IC_ENABLE | + CPU_CONTROL_DC_ENABLE) }, + { "cpu.nocache", OR, BIC, (CPU_CONTROL_IC_ENABLE | + CPU_CONTROL_DC_ENABLE) }, + { "cpu.writebuf", BIC, OR, CPU_CONTROL_WBUF_ENABLE }, + { "cpu.nowritebuf", OR, BIC, CPU_CONTROL_WBUF_ENABLE }, + { NULL, IGN, IGN, 0 } +}; + +void +fa526_setup(char *args) +{ + int cpuctrl, cpuctrlmask; + + cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE + | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE + | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE + | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_LABT_ENABLE; + cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE + | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE + | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE + | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_ROM_ENABLE + | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE + | CPU_CONTROL_LABT_ENABLE | CPU_CONTROL_BPRD_ENABLE + | CPU_CONTROL_CPCLK | CPU_CONTROL_VECRELOC; + +#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS + cpuctrl |= CPU_CONTROL_AFLT_ENABLE; +#endif + + cpuctrl = parse_cpu_options(args, fa526_options, cpuctrl); + +#ifdef __ARMEB__ + cpuctrl |= CPU_CONTROL_BEND_ENABLE; +#endif + + if (vector_page == ARM_VECTORS_HIGH) + cpuctrl |= CPU_CONTROL_VECRELOC; + + /* Clear out the cache */ + cpu_idcache_wbinv_all(); + + /* Set the control register */ + ctrl = cpuctrl; + cpu_control(0xffffffff, cpuctrl); +} +#endif /* CPU_FA526 */ + + #if defined(CPU_IXP12X0) struct cpu_option ixp12x0_options[] = { { "cpu.cache", BIC, OR, (CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE) }, ==== //depot/projects/usb/src/sys/arm/arm/elf_trampoline.c#12 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.25 2009/06/21 21:38:12 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_trampoline.c,v 1.26 2010/01/04 03:35:45 rpaulo Exp $"); #include <machine/asm.h> #include <sys/param.h> #include <sys/elf32.h> @@ -57,6 +57,8 @@ #define cpu_idcache_wbinv_all arm8_cache_purgeID #elif defined(CPU_ARM9) #define cpu_idcache_wbinv_all arm9_idcache_wbinv_all +#elif defined(CPU_FA526) +#define cpu_idcache_wbinv_all fa526_idcache_wbinv_all #elif defined(CPU_ARM9E) #define cpu_idcache_wbinv_all armv5_ec_idcache_wbinv_all #elif defined(CPU_ARM10) ==== //depot/projects/usb/src/sys/arm/conf/DEFAULTS#4 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/arm # -# $FreeBSD: src/sys/arm/conf/DEFAULTS,v 1.3 2009/12/16 02:17:43 dougb Exp $ +# $FreeBSD: src/sys/arm/conf/DEFAULTS,v 1.4 2010/01/04 21:30:04 imp Exp $ machine arm @@ -9,10 +9,3 @@ options GEOM_PART_BSD options GEOM_PART_MBR - -# Store the plain version of the configuration file in the kernel itself. -# To store the entire file, including comments, put this in /etc/src.conf: -# CONFIGARGS= -C -# See config(8) for more details. -# -options INCLUDE_CONFIG_FILE # Include this file in kernel ==== //depot/projects/usb/src/sys/arm/include/cpuconf.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.12 2007/11/01 10:01:15 kevlo Exp $ + * $FreeBSD: src/sys/arm/include/cpuconf.h,v 1.13 2010/01/04 03:35:45 rpaulo Exp $ * */ @@ -61,6 +61,7 @@ defined(CPU_XSCALE_80200) + \ defined(CPU_XSCALE_80321) + \ defined(CPU_XSCALE_PXA2X0) + \ + defined(CPU_FA526) + \ defined(CPU_XSCALE_IXP425)) /* @@ -68,7 +69,7 @@ */ #if (defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) || \ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ - defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425)) + defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425) || defined(CPU_FA526)) #define ARM_ARCH_4 1 #else #define ARM_ARCH_4 0 @@ -125,7 +126,7 @@ #if (defined(CPU_ARM6) || defined(CPU_ARM7) || defined(CPU_ARM7TDMI) || \ defined(CPU_ARM8) || defined(CPU_ARM9) || defined(CPU_ARM9E) || \ - defined(CPU_ARM10) || defined(CPU_ARM11)) + defined(CPU_ARM10) || defined(CPU_ARM11) || defined(CPU_FA526)) #define ARM_MMU_GENERIC 1 #else #define ARM_MMU_GENERIC 0 ==== //depot/projects/usb/src/sys/arm/include/cpufunc.h#8 (text+ko) ==== @@ -38,7 +38,7 @@ * * Prototypes for cpu, mmu and tlb related functions. * - * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.15 2009/01/09 10:45:04 raj Exp $ + * $FreeBSD: src/sys/arm/include/cpufunc.h,v 1.16 2010/01/04 03:35:45 rpaulo Exp $ */ #ifndef _MACHINE_CPUFUNC_H_ @@ -283,6 +283,28 @@ u_int arm8_clock_config (u_int, u_int); #endif + +#ifdef CPU_FA526 +void fa526_setup (char *arg); +void fa526_setttb (u_int ttb); +void fa526_context_switch (void); +void fa526_cpu_sleep (int); +void fa526_tlb_flushI_SE (u_int); +void fa526_tlb_flushID_SE (u_int); +void fa526_flush_prefetchbuf (void); +void fa526_flush_brnchtgt_E (u_int); + +void fa526_icache_sync_all (void); +void fa526_icache_sync_range(vm_offset_t start, vm_size_t end); +void fa526_dcache_wbinv_all (void); +void fa526_dcache_wbinv_range(vm_offset_t start, vm_size_t end); +void fa526_dcache_inv_range (vm_offset_t start, vm_size_t end); +void fa526_dcache_wb_range (vm_offset_t start, vm_size_t end); +void fa526_idcache_wbinv_all(void); +void fa526_idcache_wbinv_range(vm_offset_t start, vm_size_t end); +#endif + + #ifdef CPU_SA110 void sa110_setup (char *string); void sa110_context_switch (void); @@ -445,6 +467,7 @@ #if defined(CPU_ARM9) || defined(CPU_ARM9E) || defined(CPU_ARM10) || \ defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \ defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_FA526) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) ==== //depot/projects/usb/src/sys/boot/common/module.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.28 2009/02/16 02:42:17 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.29 2009/12/31 12:17:38 nyan Exp $"); /* * file/module function dispatcher, support, etc. @@ -351,6 +351,9 @@ char *cp; int fd, got; vm_offset_t laddr; +#ifdef PC98 + struct stat st; +#endif /* We can't load first */ if ((file_findfile(NULL, NULL)) == NULL) { @@ -372,6 +375,14 @@ return(CMD_ERROR); } +#ifdef PC98 + /* We cannot use 15M-16M area on pc98. */ + if (loadaddr < 0x1000000 && + fstat(fd, &st) == 0 && + (st.st_size == -1 || loadaddr + st.st_size > 0xf00000)) + loadaddr = 0x1000000; +#endif + laddr = loadaddr; for (;;) { /* read in 4k chunks; size is not really important */ @@ -477,6 +488,14 @@ ; do { +#ifdef PC98 + /* We cannot use 15M-16M area on pc98. */ + struct stat st; + if (loadaddr < 0x1000000 && + stat(filename, &st) == 0 && + (st.st_size == -1 || loadaddr + st.st_size > 0xf00000)) + loadaddr = 0x1000000; +#endif err = file_load(filename, loadaddr, &fp); if (err) break; ==== //depot/projects/usb/src/sys/boot/pc98/Makefile.inc#5 (text+ko) ==== @@ -1,13 +1,13 @@ # Common defines for all of /sys/boot/pc98/ # -# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.9 2009/09/13 11:20:17 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.10 2009/12/31 12:17:38 nyan Exp $ BINDIR?= /boot LOADER_ADDRESS?=0x200000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \ - -Os + -Os -DPC98 LDFLAGS+= -nostdlib # BTX components ==== //depot/projects/usb/src/sys/boot/pc98/boot0.5/selector.s#3 (text+ko) ==== @@ -25,7 +25,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.3 2007/04/07 08:37:04 kato Exp $ +# $FreeBSD: src/sys/boot/pc98/boot0.5/selector.s,v 1.4 2010/01/02 17:32:40 mbr Exp $ # .code16 @@ -35,7 +35,7 @@ # Display partition table. # showpartitions: - # Clear partion table area + # Clear partition table area movw $16, %cx clear_part: push %cx ==== //depot/projects/usb/src/sys/boot/pc98/boot2/Makefile#4 (text+ko) ==== @@ -1,119 +1,104 @@ -# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.25 2009/12/11 12:36:59 nyan Exp $ -# +# $FreeBSD: src/sys/boot/pc98/boot2/Makefile,v 1.26 2009/12/31 15:03:33 nyan Exp $ + +FILES= boot boot1 boot2 + +NM?= nm -PROG= boot -# Order is very important on the SRCS line for this prog -SRCS= start.S table.c boot2.S boot.c asm.S bios.S serial.S -SRCS+= probe_keyboard.c io.c disk.c sys.c +BOOT_COMCONSOLE_PORT?= 0x238 +BOOT_COMCONSOLE_SPEED?= 9600 +B2SIOFMT?= 0x3 -BINMODE= 444 -CFLAGS= -Os -mrtd \ - -fno-guess-branch-probability \ - -fno-unit-at-a-time \ - -D_KERNEL -DBOOTWAIT=${BOOTWAIT} -DTIMEOUT=${TIMEOUT} -CFLAGS+= -DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK} -CFLAGS+= -I${.CURDIR}/../../.. -I. +REL1= 0x700 +ORG1= 0 +ORG2= 0x2000 -# By default, if a serial port is going to be used as console, use COM1 -# (aka /dev/ttyd0). -#BOOT_COMCONSOLE_PORT?=0x30 -BOOT_COMCONSOLE_PORT?=0x238 -BOOT_COMCONSOLE_CLK?=16 -BOOT_COMCONSOLE_MODE=0x0c -CFLAGS+= -DCOMCONSOLE=${BOOT_COMCONSOLE_PORT} \ - -DCOMCONSOLE_CLK=${BOOT_COMCONSOLE_CLK} \ - -DCOMCONSOLE_MODE=${BOOT_COMCONSOLE_MODE} +# Decide level of UFS support. +BOOT2_UFS?= UFS1_AND_UFS2 +#BOOT2_UFS?= UFS2_ONLY +#BOOT2_UFS?= UFS1_ONLY -# feature not implemented -BOOT_COMCONSOLE_SPEED?=9600 -CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} +CFLAGS= -Os \ + -fno-guess-branch-probability \ + -fomit-frame-pointer \ + -fno-unit-at-a-time \ + -mno-align-long-strings \ + -mrtd \ + -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \ + -D${BOOT2_UFS} \ + -DFLAGS=${BOOT_BOOT1_FLAGS} \ + -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ + -DSIOFMT=${B2SIOFMT} \ + -DSIOSPD=${BOOT_COMCONSOLE_SPEED} \ + -I${.CURDIR}/../../.. \ + -I${.CURDIR}/../../i386/boot2 \ + -I${.CURDIR}/../../common \ + -I${.CURDIR}/../btx/lib -I. \ + -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ + -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ + -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ + -Winline --param max-inline-insns-single=100 # Set machine type to PC98_SYSTEM_PARAMETER -CFLAGS+= -DSET_MACHINE_TYPE +#CFLAGS+= -DSET_MACHINE_TYPE # Initialize the bi_bios_geom using the BIOS geometry -CFLAGS+= -DGET_BIOSGEOM +#CFLAGS+= -DGET_BIOSGEOM -# Enable code to take the default boot string from a fixed location on the -# disk. See nextboot(8) and README.386BSD for more info. -#CFLAGS+= -DNAMEBLOCK -#CFLAGS+= -DNAMEBLOCK_WRITEBACK +LDFLAGS=-static -N --gc-sections -# Bias the conversion from the BIOS drive number to the FreeBSD unit number -# for hard disks. This may be useful for people booting in a mixed IDE/SCSI -# environment (set BOOT_HD_BIAS to the number of IDE drives). -#CFLAGS+= -DBOOT_HD_BIAS=1 -# -# Details: this only applies if BOOT_HD_BIAS > 0. If the BIOS drive number -# for the boot drive is >= BOOT_HD_BIAS, then the boot drive is assumed to -# be SCSI and have unit number (BIOS_drive_number - BOOT_HD_BIAS). E.g., -# BOOT_HD_BIAS=1 makes BIOS drive 1 correspond to 1:da(0,a) instead of -# 1:wd(1,a). If `da' is given explicitly, then the drive is assumed to be -# SCSI and have BIOS drive number (da_unit_number + BOOT_HD_BIAS). E.g., -# BOOT_HD_BIAS=1 makes da(0,a) correspond to 1:da(0,a) instead of 0:da(0,a). +# Pick up ../Makefile.inc early. +.include <bsd.init.mk> -CLEANFILES+= boot.nohdr boot.strip boot.ldr boot1 boot2 sizetest -LDFLAGS+= -N -Ttext 0 -e start -NO_SHARED= YES -NO_MAN= -STRIP= +.PATH: ${.CURDIR}/../../i386/boot2 -# tunable timeout parameter, waiting for keypress, calibrated in ms -BOOTWAIT?= 5000 -# tunable timeout during string input, calibrated in ms -#TIMEOUT?= 30000 +CLEANFILES= boot -# Location that boot2 is loaded at -BOOTSEG= 0x1000 +boot: boot1 boot2 + cat boot1 boot2 > boot -# Offset in BOOTSEG for the top of the stack, keep this 16 byte aligned -BOOTSTACK= 0xFFF0 +CLEANFILES+= boot1 boot1.out boot1.o -boot.nohdr: boot - objcopy -S -O binary boot boot.nohdr - ls -l boot.nohdr +boot1: boot1.out + objcopy -S -O binary boot1.out ${.TARGET} -boot.ldr: boot.nohdr - dd if=boot.nohdr of=boot.ldr bs=8192 count=1 conv=sync +boot1.out: boot1.o + ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o -boot1: boot.nohdr - dd if=boot.nohdr of=boot1 bs=512 count=1 +CLEANFILES+= boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \ + boot2.s boot2.s.tmp boot2.h sio.o -boot2: boot.nohdr - dd if=boot.nohdr of=boot2 bs=512 skip=1 - @dd if=boot2 skip=14 of=sizetest 2> /dev/null - @if [ -s sizetest ] ; then \ - echo "boot2 is too big" >&2 ; \ - rm boot2 ; \ - exit 2 ; \ - fi +boot2: boot2.ld + @set -- `ls -l boot2.ld`; x=$$((7680-$$5)); \ + echo "$$x bytes available"; test $$x -ge 0 + dd if=boot2.ld of=${.TARGET} obs=7680 conv=osync -all: boot.ldr boot1 boot2 +boot2.ld: boot2.ldr boot2.bin ${BTXKERN} + btxld -v -E ${ORG2} -f bin -b ${BTXKERN} -l boot2.ldr \ + -o ${.TARGET} -P 1 boot2.bin -install: - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - boot.ldr ${DESTDIR}${BINDIR}/boot - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - boot1 boot2 ${DESTDIR}${BINDIR} +boot2.ldr: + dd if=/dev/zero of=${.TARGET} bs=276 count=1 -# If it's not there, don't consider it a target -.if exists(${.CURDIR}/../../../pc98/include) -beforedepend ${OBJS}: machine +boot2.bin: boot2.out + objcopy -S -O binary boot2.out ${.TARGET} -machine: - ln -sf ${.CURDIR}/../../../pc98/include machine +boot2.out: ${BTXCRT} boot2.o sio.o + ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} -.endif +boot2.o: boot2.s -.if exists(${.CURDIR}/../../../i386/include) -beforedepend ${OBJS}: i386 +SRCS= boot2.c boot2.h -i386: - ln -sf ${.CURDIR}/../../../i386/include i386 +boot2.s: boot2.c boot2.h ${.CURDIR}/../../common/ufsread.c + ${CC} ${CFLAGS} -S -o boot2.s.tmp ${.CURDIR}/boot2.c + sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s + rm -f boot2.s.tmp -.endif +boot2.h: boot1.out + ${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T (read|putc)/ \ + { x = $$1 - ORG1; \ + printf("#define %sORG %#x\n", toupper($$3), REL1 + x) }' \ + ORG1=`printf "%d" ${ORG1}` \ + REL1=`printf "%d" ${REL1}` > ${.TARGET} -CLEANFILES+= machine i386 - -CWARNFLAGS!= ${MAKE} -f bsd.own.mk -f ${.CURDIR}/../../../conf/kern.mk -V CWARNFLAGS .include <bsd.prog.mk> ==== //depot/projects/usb/src/sys/boot/pc98/libpc98/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.26 2009/03/19 13:53:42 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/libpc98/Makefile,v 1.27 2009/12/31 12:05:48 nyan Exp $ # LIB= pc98 INTERNALLIB= @@ -8,7 +8,7 @@ SRCS= bioscd.c biosdisk.c biosmem.c biospnp.c \ biospci.c biossmap.c bootinfo.c bootinfo32.c \ comconsole.c devicename.c elf32_freebsd.c \ - i386_copy.c i386_module.c nullconsole.c pxe.c pxetramp.s \ + i386_copy.c i386_module.c nullconsole.c pc98_sys.c pxe.c pxetramp.s \ time.c vidconsole.c # Enable PXE TFTP or NFS support, not both. ==== //depot/projects/usb/src/sys/boot/pc98/loader/main.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.29 2009/12/08 13:06:35 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/loader/main.c,v 1.30 2009/12/31 12:05:48 nyan Exp $"); /* * MD bootstrap main() and assorted miscellaneous @@ -40,6 +40,7 @@ #include "bootstrap.h" #include "libi386/libi386.h" +#include "libpc98/libpc98.h" #include "btxv86.h" #define KARGS_FLAGS_CD 0x1 @@ -81,6 +82,9 @@ { int i; + /* Set machine type to PC98_SYSTEM_PARAMETER. */ + set_machine_type(); + /* Pick up arguments */ kargs = (void *)__args; initial_howto = kargs->howto; ==== //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.7 2009/12/09 20:36:56 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/zfs/zfsimpl.c,v 1.9 2010/01/06 23:11:56 delphij Exp $"); /* * Stand-alone ZFS file reader. @@ -404,7 +404,7 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001070006.o0706L10055173>