Date: Fri, 1 Nov 2013 11:03:00 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257503 - in projects/ifnet: contrib/libpcap contrib/libpcap/bpf/net contrib/libpcap/pcap include sys/arm/conf sys/arm/freescale/imx sys/boot/fdt/dts sys/cam sys/dev/msk sys/dev/uart sy... Message-ID: <201311011103.rA1B30Ur046405@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Fri Nov 1 11:02:59 2013 New Revision: 257503 URL: http://svnweb.freebsd.org/changeset/base/257503 Log: Merge head r256150 through r257502. Added: projects/ifnet/sys/arm/conf/WANDBOARD-COMMON - copied unchanged from r257502, head/sys/arm/conf/WANDBOARD-COMMON projects/ifnet/sys/arm/conf/WANDBOARD-DUAL - copied unchanged from r257502, head/sys/arm/conf/WANDBOARD-DUAL projects/ifnet/sys/arm/conf/WANDBOARD-QUAD - copied unchanged from r257502, head/sys/arm/conf/WANDBOARD-QUAD projects/ifnet/sys/arm/conf/WANDBOARD-SOLO - copied unchanged from r257502, head/sys/arm/conf/WANDBOARD-SOLO projects/ifnet/sys/arm/freescale/imx/files.imx6 - copied unchanged from r257502, head/sys/arm/freescale/imx/files.imx6 projects/ifnet/sys/arm/freescale/imx/imx6_machdep.c - copied unchanged from r257502, head/sys/arm/freescale/imx/imx6_machdep.c projects/ifnet/sys/arm/freescale/imx/imx6_pl310.c - copied unchanged from r257502, head/sys/arm/freescale/imx/imx6_pl310.c projects/ifnet/sys/arm/freescale/imx/std.imx6 - copied unchanged from r257502, head/sys/arm/freescale/imx/std.imx6 projects/ifnet/sys/boot/fdt/dts/imx6.dtsi - copied unchanged from r257502, head/sys/boot/fdt/dts/imx6.dtsi projects/ifnet/sys/boot/fdt/dts/wandboard-dual.dts - copied unchanged from r257502, head/sys/boot/fdt/dts/wandboard-dual.dts projects/ifnet/sys/boot/fdt/dts/wandboard-quad.dts - copied unchanged from r257502, head/sys/boot/fdt/dts/wandboard-quad.dts projects/ifnet/sys/boot/fdt/dts/wandboard-solo.dts - copied unchanged from r257502, head/sys/boot/fdt/dts/wandboard-solo.dts Modified: projects/ifnet/contrib/libpcap/bpf/net/bpf_filter.c projects/ifnet/contrib/libpcap/bpf_dump.c projects/ifnet/contrib/libpcap/bpf_image.c projects/ifnet/contrib/libpcap/pcap/bpf.h projects/ifnet/contrib/libpcap/pcap/pcap.h projects/ifnet/include/Makefile projects/ifnet/sys/arm/freescale/imx/imx6_anatopreg.h projects/ifnet/sys/arm/freescale/imx/imx_machdep.h projects/ifnet/sys/cam/cam_xpt.c projects/ifnet/sys/dev/msk/if_msk.c projects/ifnet/sys/dev/uart/uart_bus_fdt.c projects/ifnet/sys/ia64/ia64/machdep.c projects/ifnet/sys/ia64/ia64/mp_machdep.c projects/ifnet/sys/ia64/ia64/pmap.c projects/ifnet/sys/ia64/include/param.h projects/ifnet/sys/ia64/include/pmap.h projects/ifnet/sys/kern/kern_environment.c projects/ifnet/sys/kern/kern_jail.c projects/ifnet/sys/kern/uipc_socket.c projects/ifnet/sys/netinet/if_ether.c projects/ifnet/sys/netinet/in.c projects/ifnet/sys/netinet/in_rmx.c projects/ifnet/sys/netinet/in_var.h projects/ifnet/sys/netinet/raw_ip.c projects/ifnet/sys/powerpc/pseries/mmu_phyp.c projects/ifnet/sys/sys/jail.h projects/ifnet/usr.bin/limits/limits.1 projects/ifnet/usr.sbin/crashinfo/crashinfo.sh Directory Properties: projects/ifnet/ (props changed) projects/ifnet/contrib/libpcap/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/boot/ (props changed) Modified: projects/ifnet/contrib/libpcap/bpf/net/bpf_filter.c ============================================================================== --- projects/ifnet/contrib/libpcap/bpf/net/bpf_filter.c Fri Nov 1 10:42:32 2013 (r257502) +++ projects/ifnet/contrib/libpcap/bpf/net/bpf_filter.c Fri Nov 1 11:02:59 2013 (r257503) @@ -209,8 +209,8 @@ m_xhalf(m, k, err) */ u_int bpf_filter(pc, p, wirelen, buflen) - register struct bpf_insn *pc; - register u_char *p; + register const struct bpf_insn *pc; + register const u_char *p; u_int wirelen; register u_int buflen; { Modified: projects/ifnet/contrib/libpcap/bpf_dump.c ============================================================================== --- projects/ifnet/contrib/libpcap/bpf_dump.c Fri Nov 1 10:42:32 2013 (r257502) +++ projects/ifnet/contrib/libpcap/bpf_dump.c Fri Nov 1 11:02:59 2013 (r257503) @@ -31,7 +31,7 @@ static const char rcsid[] _U_ = #include <stdio.h> void -bpf_dump(struct bpf_program *p, int option) +bpf_dump(const struct bpf_program *p, int option) { const struct bpf_insn *insn; int i; Modified: projects/ifnet/contrib/libpcap/bpf_image.c ============================================================================== --- projects/ifnet/contrib/libpcap/bpf_image.c Fri Nov 1 10:42:32 2013 (r257502) +++ projects/ifnet/contrib/libpcap/bpf_image.c Fri Nov 1 11:02:59 2013 (r257503) @@ -53,7 +53,7 @@ static const char rcsid[] _U_ = char * bpf_image(p, n) - struct bpf_insn *p; + const struct bpf_insn *p; int n; { int v; Modified: projects/ifnet/contrib/libpcap/pcap/bpf.h ============================================================================== --- projects/ifnet/contrib/libpcap/pcap/bpf.h Fri Nov 1 10:42:32 2013 (r257502) +++ projects/ifnet/contrib/libpcap/pcap/bpf.h Fri Nov 1 11:02:59 2013 (r257503) @@ -1285,7 +1285,7 @@ struct bpf_insn { #if __STDC__ || defined(__cplusplus) extern int bpf_validate(const struct bpf_insn *, int); -extern u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int); +extern u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int); #else extern int bpf_validate(); extern u_int bpf_filter(); Modified: projects/ifnet/contrib/libpcap/pcap/pcap.h ============================================================================== --- projects/ifnet/contrib/libpcap/pcap/pcap.h Fri Nov 1 10:42:32 2013 (r257502) +++ projects/ifnet/contrib/libpcap/pcap/pcap.h Fri Nov 1 11:02:59 2013 (r257503) @@ -409,11 +409,11 @@ const char *pcap_lib_version(void); * declared when we build pcap-bpf.c. */ #ifndef __NetBSD__ -u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int); +u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int); #endif int bpf_validate(const struct bpf_insn *f, int len); -char *bpf_image(struct bpf_insn *, int); -void bpf_dump(struct bpf_program *, int); +char *bpf_image(const struct bpf_insn *, int); +void bpf_dump(const struct bpf_program *, int); #if defined(WIN32) Modified: projects/ifnet/include/Makefile ============================================================================== --- projects/ifnet/include/Makefile Fri Nov 1 10:42:32 2013 (r257502) +++ projects/ifnet/include/Makefile Fri Nov 1 11:02:59 2013 (r257503) @@ -195,6 +195,11 @@ copies: ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/netinet .endif +.if ${MK_PF} != "no" + cd ${.CURDIR}/../sys/netpfil/pf; \ + ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${DESTDIR}${INCLUDEDIR}/netpfil/pf +.endif cd ${.CURDIR}/../sys/crypto; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 rijndael/rijndael.h \ ${DESTDIR}${INCLUDEDIR}/crypto Copied: projects/ifnet/sys/arm/conf/WANDBOARD-COMMON (from r257502, head/sys/arm/conf/WANDBOARD-COMMON) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/arm/conf/WANDBOARD-COMMON Fri Nov 1 11:02:59 2013 (r257503, copy of r257502, head/sys/arm/conf/WANDBOARD-COMMON) @@ -0,0 +1,155 @@ +# Kernel configuration for Wandboard +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +include "../freescale/imx/std.imx6" + +options HZ=250 # Scheduling quantum is 4 milliseconds. +options SCHED_4BSD # 4BSD scheduler +options PREEMPTION # Enable kernel thread preemption +options INET # InterNETworking +options INET6 # IPv6 communications protocols +#options SCTP # Stream Control Transmission Protocol +options FFS # Berkeley Fast Filesystem +options SOFTUPDATES # Enable FFS soft updates support +options UFS_ACL # Support for access control lists +options UFS_DIRHASH # Improve performance on big directories +options UFS_GJOURNAL # Enable gjournal-based UFS journaling +#options MD_ROOT # MD is a potential root device +options NFSCL # New Network Filesystem Client +#options NFSD # New Network Filesystem Server +options NFSLOCKD # Network Lock Manager +options NFS_ROOT # NFS usable as /, requires NFSCL +options MSDOSFS # MSDOS Filesystem +options CD9660 # ISO 9660 Filesystem +#options PROCFS # Process filesystem (requires PSEUDOFS) +options PSEUDOFS # Pseudo-filesystem framework +options TMPFS # TMP Memory Filesystem +options GEOM_PART_GPT # GUID Partition Tables. +options GEOM_LABEL # Provides labelization +options KTRACE # ktrace(1) support +options SYSVSHM # SYSV-style shared memory +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores +options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions +options INCLUDE_CONFIG_FILE # Include this file in kernel + +# Debugging support. Always need this: +options KDB # Enable kernel debugger support. +# For minimum debugger support use KDB_TRACE, for interactive use DDB. +#options KDB_TRACE # Print a stack trace for a panic. +options DDB # Support DDB. +# For full debugger support use this instead: +#options GDB # Support remote GDB. +# Other debugging options... +makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols +options ALT_BREAK_TO_DEBUGGER # Use <CR><tilde><ctrl-b> to enter debugger. +#options DEBUG +#options DEADLKRES # Enable the deadlock resolver +#options INVARIANTS # Enable calls of extra sanity checking +#options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS +#options WITNESS # Enable checks to detect deadlocks and cycles + +# Note that 'bpf' is required for DHCP. +device bpf # Berkeley packet filter + +# Pseudo devices. +device loop # Network loopback +device random # Entropy device +device vlan # 802.1Q VLAN support +device tun # Packet tunnel. +device md # Memory "disks" +#device gif # IPv6 and IPv4 tunneling +#device faith # IPv6-to-IPv4 relaying (translation) +#device firmware # firmware assist module +device ether # Ethernet support +device miibus # Required for ethernet + +# Serial (COM) ports +device uart # Multi-uart driver + +#device iomux # IO Multiplexor + +# SCSI peripherals +device scbus # SCSI bus (required for SCSI) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct SCSI access) + +# USB support +#options USB_DEBUG # enable debug msgs +options USB_HOST_ALIGN=32 # Required for ARM, set to cache line size. +device ehci # OHCI USB interface +device usb # USB Bus (required) +device umass # Disks/Mass storage - Requires scbus and da +device uhid # "Human Interface Devices" +device u3g # USB modems + +# USB Ethernet, requires miibus +#device aue # ADMtek USB Ethernet +#device axe # ASIX Electronics USB Ethernet +#device cdce # Generic USB over Ethernet +#device cue # CATC USB Ethernet +#device kue # Kawasaki LSI USB Ethernet +#device rue # RealTek RTL8150 USB Ethernet +#device udav # Davicom DM9601E USB + +# USB Wireless +#device rum # Ralink Technology RT2501USB wireless NICs + +# Watchdog timer. +# WARNING: can't be disabled!!! +#device imxwdt # Watchdog + +# Wireless NIC cards +#device wlan # 802.11 support +#device wlan_wep # 802.11 WEP support +#device wlan_ccmp # 802.11 CCMP support +#device wlan_tkip # 802.11 TKIP support +#device wlan_amrr # AMRR transmit rate control algorithm + +# NOTE: serial console will be disabled if syscons enabled +# Uncomment following lines for framebuffer/syscons support +# Wandboard has no video console support yet. +#device sc +#device kbdmux +#options SC_DFLT_FONT # compile font in +#makeoptions SC_DFLT_FONT=cp437 +#device ukbd # Allow keyboard like HIDs to control console +#device ums + +# required for netbooting +#options BOOTP +#options BOOTP_COMPAT +#options BOOTP_NFSROOT +#options BOOTP_NFSV3 +#options BOOTP_WIRED_TO=ffec0 + +# U-Boot stuff lives on slice 1, FreeBSD on slice 2. +options ROOTDEVNAME=\"ufs:mmcsd0s2a\" + +#device fsliic # Freescale i2c/iic (not ready yet) +#device iic # iic protocol +#device iicbus # iic bus + +device sdhci # SD controller +device mmc # SD/MMC protocol +device mmcsd # SDCard disk device + +device ffec # Freescale Fast Ethernet Controller + Copied: projects/ifnet/sys/arm/conf/WANDBOARD-DUAL (from r257502, head/sys/arm/conf/WANDBOARD-DUAL) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/arm/conf/WANDBOARD-DUAL Fri Nov 1 11:02:59 2013 (r257503, copy of r257502, head/sys/arm/conf/WANDBOARD-DUAL) @@ -0,0 +1,27 @@ +# Kernel configuration for Wandboard-Dual +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +include WANDBOARD-COMMON +ident WANDBOARD-DUAL + +# Flattened Device Tree +options FDT +options FDT_DTB_STATIC +makeoptions FDT_DTS_FILE=wandboard-dual.dts + Copied: projects/ifnet/sys/arm/conf/WANDBOARD-QUAD (from r257502, head/sys/arm/conf/WANDBOARD-QUAD) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/arm/conf/WANDBOARD-QUAD Fri Nov 1 11:02:59 2013 (r257503, copy of r257502, head/sys/arm/conf/WANDBOARD-QUAD) @@ -0,0 +1,27 @@ +# Kernel configuration for Wandboard-Quad +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +include WANDBOARD-COMMON +ident WANDBOARD-QUAD + +# Flattened Device Tree +options FDT +options FDT_DTB_STATIC +makeoptions FDT_DTS_FILE=wandboard-quad.dts + Copied: projects/ifnet/sys/arm/conf/WANDBOARD-SOLO (from r257502, head/sys/arm/conf/WANDBOARD-SOLO) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/arm/conf/WANDBOARD-SOLO Fri Nov 1 11:02:59 2013 (r257503, copy of r257502, head/sys/arm/conf/WANDBOARD-SOLO) @@ -0,0 +1,27 @@ +# Kernel configuration for Wandboard-Solo +# +# For more information on this file, please read the config(5) manual page, +# and/or the handbook section on Kernel Configuration Files: +# +# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html +# +# The handbook is also available locally in /usr/share/doc/handbook +# if you've installed the doc distribution, otherwise always see the +# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the +# latest information. +# +# An exhaustive list of options and more detailed explanations of the +# device lines is also present in the ../../conf/NOTES and NOTES files. +# If you are in doubt as to the purpose or necessity of a line, check first +# in NOTES. +# +# $FreeBSD$ + +include WANDBOARD-COMMON +ident WANDBOARD-SOLO + +# Flattened Device Tree +options FDT +options FDT_DTB_STATIC +makeoptions FDT_DTS_FILE=wandboard-solo.dts + Copied: projects/ifnet/sys/arm/freescale/imx/files.imx6 (from r257502, head/sys/arm/freescale/imx/files.imx6) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/arm/freescale/imx/files.imx6 Fri Nov 1 11:02:59 2013 (r257503, copy of r257502, head/sys/arm/freescale/imx/files.imx6) @@ -0,0 +1,56 @@ +# $FreeBSD$ + +# +# Standard ARM support. +# +arm/arm/bus_space_asm_generic.S standard +arm/arm/bus_space_generic.c standard +arm/arm/cpufunc_asm_arm11.S standard +arm/arm/cpufunc_asm_armv5.S standard +arm/arm/cpufunc_asm_armv7.S standard +arm/arm/irq_dispatch.S standard +kern/kern_clocksource.c standard + +# +# Standard imx6 devices and support. +# +arm/arm/gic.c standard +arm/arm/pl310.c standard +arm/freescale/imx/bus_space.c standard +arm/freescale/imx/common.c standard +arm/freescale/imx/imx6_anatop.c standard +arm/freescale/imx/imx6_ccm.c standard +arm/freescale/imx/imx6_machdep.c standard +arm/freescale/imx/imx6_pl310.c standard +arm/freescale/imx/imx_machdep.c standard +arm/freescale/imx/imx_gpt.c standard + +# +# Optional devices. +# +arm/freescale/imx/imx_sdhci.c optional sdhci + +arm/freescale/imx/imx_wdog.c optional imxwdt + +dev/ffec/if_ffec.c optional ffec + +dev/uart/uart_dev_imx.c optional uart + +dev/usb/controller/ehci_imx.c optional ehci +arm/freescale/imx/imx6_usbphy.c optional ehci + +# +# Low-level serial console for debugging early kernel startup. +# +#arm/freescale/imx/console.c standard + +# +# Not ready yet... +# +#arm/freescale/imx/imx51_iomux.c optional iomux +#arm/freescale/imx/imx51_gpio.c optional gpio +#dev/ata/chipsets/ata-fsl.c optional imxata +#arm/freescale/imx/i2c.c optional fsliic +#dev/ofw/ofw_iicbus.c optional fsliic +#arm/freescale/imx/imx51_ipuv3.c optional sc + Modified: projects/ifnet/sys/arm/freescale/imx/imx6_anatopreg.h ============================================================================== --- projects/ifnet/sys/arm/freescale/imx/imx6_anatopreg.h Fri Nov 1 10:42:32 2013 (r257502) +++ projects/ifnet/sys/arm/freescale/imx/imx6_anatopreg.h Fri Nov 1 11:02:59 2013 (r257503) @@ -122,7 +122,9 @@ #define IMX6_ANALOG_USB2_MISC_CLR 0x258 #define IMX6_ANALOG_USB2_MISC_TOG 0x25C #define IMX6_ANALOG_DIGPROG 0x260 - - +#define IMX6_ANALOG_DIGPROG_SL 0x280 +#define IMX6_ANALOG_DIGPROG_SOCTYPE_SHIFT 16 +#define IMX6_ANALOG_DIGPROG_SOCTYPE_MASK \ + (0xff << IMX6_ANALOG_DIGPROG_SOCTYPE_SHIFT) #endif Copied: projects/ifnet/sys/arm/freescale/imx/imx6_machdep.c (from r257502, head/sys/arm/freescale/imx/imx6_machdep.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/arm/freescale/imx/imx6_machdep.c Fri Nov 1 11:02:59 2013 (r257503, copy of r257502, head/sys/arm/freescale/imx/imx6_machdep.c) @@ -0,0 +1,164 @@ +/*- + * Copyright (c) 2013 Ian Lepore <ian@freebsd.org> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include "opt_platform.h" + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/bus.h> +#include <sys/reboot.h> + +#include <machine/bus.h> +#include <vm/vm.h> +#include <vm/pmap.h> +#include <arm/freescale/imx/imx6_anatopreg.h> +#include <arm/freescale/imx/imx6_anatopvar.h> +#include <arm/freescale/imx/imx_machdep.h> + +/* + * Set up static device mappings. Note that for imx this is called from + * initarm_lastaddr() so that it can return the lowest address used for static + * device mapping, maximizing kva space. + * + * This attempts to cover the most-used devices with 1MB section mappings, which + * is good for performance (uses fewer TLB entries for device access). + * + * ARMMP covers the interrupt controller, MPCore timers, global timer, and the + * L2 cache controller. Most of the 1MB range is unused reserved space. + * + * AIPS1/AIPS2 cover most of the on-chip devices such as uart, spi, i2c, etc. + * + * Notably not mapped right now are HDMI, GPU, and other devices below ARMMP in + * the memory map. When we get support for graphics it might make sense to + * static map some of that area. Be careful with other things in that area such + * as OCRAM that probably shouldn't be mapped as PTE_DEVICE memory. + */ +void +imx_devmap_init(void) +{ + const uint32_t IMX6_ARMMP_PHYS = 0x00a00000; + const uint32_t IMX6_ARMMP_SIZE = 0x00100000; + const uint32_t IMX6_AIPS1_PHYS = 0x02000000; + const uint32_t IMX6_AIPS1_SIZE = 0x00100000; + const uint32_t IMX6_AIPS2_PHYS = 0x02100000; + const uint32_t IMX6_AIPS2_SIZE = 0x00100000; + + imx_devmap_addentry(IMX6_ARMMP_PHYS, IMX6_ARMMP_SIZE); + imx_devmap_addentry(IMX6_AIPS1_PHYS, IMX6_AIPS1_SIZE); + imx_devmap_addentry(IMX6_AIPS2_PHYS, IMX6_AIPS2_SIZE); +} + +void +cpu_reset(void) +{ + const uint32_t IMX6_WDOG_CR_PHYS = 0x020bc000; + + imx_wdog_cpu_reset(IMX6_WDOG_CR_PHYS); +} + +/* + * Determine what flavor of imx6 we're running on. + * + * This code is based on the way u-boot does it. Information found on the web + * indicates that Freescale themselves were the original source of this logic, + * including the strange check for number of CPUs in the SCU configuration + * register, which is apparently needed on some revisions of the SOLO. + * + * According to the documentation, there is such a thing as an i.MX6 Dual + * (non-lite flavor). However, Freescale doesn't seem to have assigned it a + * number or provided any logic to handle it in their detection code. + * + * Note that the ANALOG_DIGPROG and SCU configuration registers are not + * documented in the chip reference manual. (SCU configuration is mentioned, + * but not mapped out in detail.) I think the bottom two bits of the scu config + * register may be ncpu-1. + * + * This hasn't been tested yet on a dual[-lite]. + * + * On a solo: + * digprog = 0x00610001 + * hwsoc = 0x00000062 + * scu config = 0x00000500 + * On a quad: + * digprog = 0x00630002 + * hwsoc = 0x00000063 + * scu config = 0x00005503 + */ +u_int imx_soc_type() +{ + const struct pmap_devmap *pd; + uint32_t digprog, hwsoc; + uint32_t *pcr; + const uint32_t HWSOC_MX6SL = 0x60; + const uint32_t HWSOC_MX6DL = 0x61; + const uint32_t HWSOC_MX6SOLO = 0x62; + const uint32_t HWSOC_MX6Q = 0x63; + const vm_offset_t SCU_CONFIG_PHYSADDR = 0x00a00004; + + digprog = imx6_anatop_read_4(IMX6_ANALOG_DIGPROG_SL); + hwsoc = (digprog >> IMX6_ANALOG_DIGPROG_SOCTYPE_SHIFT) & + IMX6_ANALOG_DIGPROG_SOCTYPE_MASK; + + if (hwsoc != HWSOC_MX6SL) { + digprog = imx6_anatop_read_4(IMX6_ANALOG_DIGPROG); + hwsoc = (digprog & IMX6_ANALOG_DIGPROG_SOCTYPE_MASK) >> + IMX6_ANALOG_DIGPROG_SOCTYPE_SHIFT; + /*printf("digprog = 0x%08x\n", digprog);*/ + if (hwsoc == HWSOC_MX6DL) { + pd = pmap_devmap_find_pa(SCU_CONFIG_PHYSADDR, 4); + if (pd != NULL) { + pcr = (uint32_t *)(pd->pd_va + + (SCU_CONFIG_PHYSADDR - pd->pd_pa)); + /*printf("scu config = 0x%08x\n", *pcr);*/ + if ((*pcr & 0x03) == 0) { + hwsoc = HWSOC_MX6SOLO; + } + } + } + } + /* printf("hwsoc 0x%08x\n", hwsoc); */ + + switch (hwsoc) { + case HWSOC_MX6SL: + return (IMXSOC_6SL); + case HWSOC_MX6SOLO: + return (IMXSOC_6S); + case HWSOC_MX6DL: + return (IMXSOC_6DL); + case HWSOC_MX6Q : + return (IMXSOC_6Q); + default: + printf("imx_soc_type: Don't understand hwsoc 0x%02x, " + "digprog 0x%08x; assuming IMXSOC_6Q\n", hwsoc, digprog); + break; + } + + return (IMXSOC_6Q); +} + Copied: projects/ifnet/sys/arm/freescale/imx/imx6_pl310.c (from r257502, head/sys/arm/freescale/imx/imx6_pl310.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/arm/freescale/imx/imx6_pl310.c Fri Nov 1 11:02:59 2013 (r257503, copy of r257502, head/sys/arm/freescale/imx/imx6_pl310.c) @@ -0,0 +1,98 @@ +/*- + * Copyright (c) 2012 Olivier Houchard. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); + +/* + * The machine-dependent part of the arm/pl310 driver for imx6 SoCs. + */ + +#include <sys/types.h> +#include <sys/param.h> +#include <sys/systm.h> +#include <sys/bus.h> +#include <sys/rman.h> +#include <sys/lock.h> +#include <sys/mutex.h> + +#include <machine/bus.h> +#include <machine/pl310.h> + +void +platform_pl310_init(struct pl310_softc *sc) +{ + uint32_t aux, prefetch; + + aux = pl310_read4(sc, PL310_AUX_CTRL); + prefetch = pl310_read4(sc, PL310_PREFETCH_CTRL); + + if (bootverbose) { + device_printf(sc->sc_dev, "Early BRESP response: %s\n", + (aux & AUX_CTRL_EARLY_BRESP) ? "enabled" : "disabled"); + device_printf(sc->sc_dev, "Instruction prefetch: %s\n", + (aux & AUX_CTRL_INSTR_PREFETCH) ? "enabled" : "disabled"); + device_printf(sc->sc_dev, "Data prefetch: %s\n", + (aux & AUX_CTRL_DATA_PREFETCH) ? "enabled" : "disabled"); + device_printf(sc->sc_dev, "Non-secure interrupt control: %s\n", + (aux & AUX_CTRL_NS_INT_CTRL) ? "enabled" : "disabled"); + device_printf(sc->sc_dev, "Non-secure lockdown: %s\n", + (aux & AUX_CTRL_NS_LOCKDOWN) ? "enabled" : "disabled"); + device_printf(sc->sc_dev, "Share override: %s\n", + (aux & AUX_CTRL_SHARE_OVERRIDE) ? "enabled" : "disabled"); + + device_printf(sc->sc_dev, "Double linefil: %s\n", + (prefetch & PREFETCH_CTRL_DL) ? "enabled" : "disabled"); + device_printf(sc->sc_dev, "Instruction prefetch: %s\n", + (prefetch & PREFETCH_CTRL_INSTR_PREFETCH) ? "enabled" : "disabled"); + device_printf(sc->sc_dev, "Data prefetch: %s\n", + (prefetch & PREFETCH_CTRL_DATA_PREFETCH) ? "enabled" : "disabled"); + device_printf(sc->sc_dev, "Double linefill on WRAP request: %s\n", + (prefetch & PREFETCH_CTRL_DL_ON_WRAP) ? "enabled" : "disabled"); + device_printf(sc->sc_dev, "Prefetch drop: %s\n", + (prefetch & PREFETCH_CTRL_PREFETCH_DROP) ? "enabled" : "disabled"); + device_printf(sc->sc_dev, "Incr double Linefill: %s\n", + (prefetch & PREFETCH_CTRL_INCR_DL) ? "enabled" : "disabled"); + device_printf(sc->sc_dev, "Not same ID on exclusive sequence: %s\n", + (prefetch & PREFETCH_CTRL_NOTSAMEID) ? "enabled" : "disabled"); + device_printf(sc->sc_dev, "Prefetch offset: %d\n", + (prefetch & PREFETCH_CTRL_OFFSET_MASK)); + } +} + +void +platform_pl310_write_ctrl(struct pl310_softc *sc, uint32_t val) +{ + + pl310_write4(sc, PL310_CTRL, val); +} + +void +platform_pl310_write_debug(struct pl310_softc *sc, uint32_t val) +{ + + pl310_write4(sc, PL310_DEBUG_CTRL, val); +} + Modified: projects/ifnet/sys/arm/freescale/imx/imx_machdep.h ============================================================================== --- projects/ifnet/sys/arm/freescale/imx/imx_machdep.h Fri Nov 1 10:42:32 2013 (r257502) +++ projects/ifnet/sys/arm/freescale/imx/imx_machdep.h Fri Nov 1 11:02:59 2013 (r257503) @@ -36,24 +36,27 @@ void imx_devmap_addentry(vm_paddr_t _pa, vm_size_t _sz); void imx_wdog_cpu_reset(vm_offset_t _wdcr_phys) __attribute__((__noreturn__)); +/* From here down, routines are implemented in imxNN_machdep.c. */ + /* * SoC identity. + * According to the documentation, there is such a thing as an i.MX6 Dual + * (non-lite flavor). However, Freescale doesn't seem to have assigned it a + * number in their code for determining the SoC type in u-boot. + * + * To-do: put silicon revision numbers into the low-order bits somewhere. */ -#define IMXSOC_51 0x05000100 -#define IMXSOC_53 0x05000300 -#define IMXSOC_6S 0x06000010 -#define IMXSOC_6SL 0x06000011 -#define IMXSOC_6D 0x06000020 -#define IMXSOC_6DL 0x06000021 -#define IMXSOC_6Q 0x06000040 -#define IMXSOC_6QL 0x06000041 -#define IMXSOC_FAMSHIFT 24 +#define IMXSOC_51 0x51000000 +#define IMXSOC_53 0x53000000 +#define IMXSOC_6SL 0x60000000 +#define IMXSOC_6DL 0x61000000 +#define IMXSOC_6S 0x62000000 +#define IMXSOC_6Q 0x63000000 +#define IMXSOC_FAMSHIFT 28 u_int imx_soc_type(void); u_int imx_soc_family(void); -/* From here down, routines are implemented in imxNN_machdep.c. */ - void imx_devmap_init(void); /* Copied: projects/ifnet/sys/arm/freescale/imx/std.imx6 (from r257502, head/sys/arm/freescale/imx/std.imx6) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/arm/freescale/imx/std.imx6 Fri Nov 1 11:02:59 2013 (r257503, copy of r257502, head/sys/arm/freescale/imx/std.imx6) @@ -0,0 +1,15 @@ +# $FreeBSD$ +machine arm armv6 +cpu CPU_CORTEXA +makeoptions ARM_LITTLE_ENDIAN +options ARM_L2_PIPT + +options KERNVIRTADDR = 0xc2000000 +makeoptions KERNVIRTADDR = 0xc2000000 +options KERNPHYSADDR = 0x12000000 +makeoptions KERNPHYSADDR = 0x12000000 +options PHYSADDR = 0x10000000 +options STARTUP_PAGETABLE_ADDR = 0x11f00000 + +files "../freescale/imx/files.imx6" + Copied: projects/ifnet/sys/boot/fdt/dts/imx6.dtsi (from r257502, head/sys/boot/fdt/dts/imx6.dtsi) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/ifnet/sys/boot/fdt/dts/imx6.dtsi Fri Nov 1 11:02:59 2013 (r257503, copy of r257502, head/sys/boot/fdt/dts/imx6.dtsi) @@ -0,0 +1,322 @@ +/* + * Copyright (c) 2013 Ian Lepore + * Copyright (c) 2012 The FreeBSD Foundation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * Freescale i.MX6 Common Device Tree Source. + * There are enough differences between the Solo, Dual, Quad, and *-lite + * flavors of this SoC that eventually we will need a finer-grained breakdown + * of some of this stuff. For now this file works for all of them. I think. + * + * $FreeBSD$ + */ + +/ { + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu@0 { + device_type = "cpu"; + compatible = "ARM,MCIMX6"; + reg = <0x0>; + d-cache-line-size = <32>; + i-cache-line-size = <32>; + d-cache-size = <0x8000>; + i-cache-size = <0x8000>; + /* TODO: describe L2 cache also */ + timebase-frequency = <0>; + bus-frequency = <0>; + clock-frequency = <0>; + }; + }; + + aliases { + soc = &SOC; + }; + + SOC: soc@00000000 { + compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&gic>; + ranges = <0x00000000 0x00000000 0x10000000>; + + gic: generic-interrupt-controller@00a00100 { + compatible = "arm,gic"; + interrupt-controller; + #interrupt-cells = <1>; + reg = <0x00a01000 0x00001000 + 0x00a00100 0x00000100>; + }; + + l2-cache@00a02000 { + compatible = "arm,pl310-cache", "arm,pl310"; + reg = <0xa02000 0x1000>; + interrupts = <124>; + cache-level = <0x2>; + interrupt-parent = < &gic >; + }; + + aips@02000000 { /* AIPS1 */ + compatible = "fsl,aips-bus", "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&gic>; + reg = <0x02000000 0x00100000>; + ranges; + + /* Required by many devices, so better to stay first */ + clks: ccm@020c4000 { + compatible = "fsl,imx6q-ccm"; + reg = <0x020c4000 0x4000>; + interrupts = <119 120>; + }; + + anatop: anatop@020c8000 { + compatible = "fsl,imx6q-anatop"; + reg = <0x020c8000 0x1000>; + } + + gpt: timer@02098000 { + compatible = "fsl,imx6q-gpt", "fsl,imx51-gpt"; + reg = <0x02098000 0x4000>; + interrupt-parent = <&gic>; interrupts = <87>; + }; + +// iomux@73fa8000 { +// compatible = "fsl,imx51-iomux"; +// reg = <0x73fa8000 0x4000>; +// interrupt-parent = <&gic>; interrupts = <7>; +// status = "disabled"; +// }; + +// /* +// * GPIO modules moved up - to have it attached for +// * drivers which rely on GPIO +// */ +// gpio1: gpio@0209C000 { +// compatible = "fsl,imx51-gpio", "fsl,imx31-gpio"; +// reg = <0x0209C000 0x4000>; +// interrupt-parent = <&gic>; +// interrupts = <50 51 42 43 44 45 46 47 48 49>; +// /* TODO: use <> also */ +// gpio-controller; +// #gpio-cells = <2>; +// interrupt-controller; +// #interrupt-cells = <1>; +// status = "disabled"; +// }; +// +// gpio2: gpio@020A0000 { +// compatible = "fsl,imx51-gpio", "fsl,imx31-gpio"; +// reg = <0x020A0000 0x4000>; +// interrupt-parent = <&gic>; +// interrupts = <52 53>; +// gpio-controller; +// #gpio-cells = <2>; +// interrupt-controller; +// #interrupt-cells = <1>; +// status = "disabled"; +// }; +// +// gpio3: gpio@020A4000 { +// compatible = "fsl,imx51-gpio", "fsl,imx31-gpio"; +// reg = <0x020A4000 0x4000>; +// interrupt-parent = <&gic>; +// interrupts = <54 55>; +// gpio-controller; +// #gpio-cells = <2>; +// interrupt-controller; +// #interrupt-cells = <1>; +// status = "disabled"; +// }; +// +// gpio4: gpio@020A8000 { +// compatible = "fsl,imx51-gpio", "fsl,imx31-gpio"; +// reg = <0x020A8000 0x4000>; +// interrupt-parent = <&gic>; +// interrupts = <56 57>; +// gpio-controller; +// #gpio-cells = <2>; +// interrupt-controller; +// #interrupt-cells = <1>; +// status = "disabled"; +// }; + + uart1: serial@02020000 { + compatible = "fsl,imx6q-uart"; + reg = <0x02020000 0x4000>; + interrupt-parent = <&gic>; + interrupts = <58>; + clock-frequency = <80000000>; + status = "disabled"; + }; + + uart2: serial@021e8000 { + compatible = "fsl,imx6q-uart"; + reg = <0x021e8000 0x4000>; + interrupt-parent = <&gic>; + interrupts = <59>; + clock-frequency = <80000000>; + status = "disabled"; + }; + + uart3: serial@021ec000 { + compatible = "fsl,imx6q-uart"; + reg = <0x021ec000 0x4000>; + interrupt-parent = <&gic>; + interrupts = <60>; + clock-frequency = <80000000>; + status = "disabled"; + }; + + uart4: serial@021f0000 { + compatible = "fsl,imx6q-uart"; + reg = <0x021f0000 0x4000>; + interrupt-parent = <&gic>; + interrupts = <61>; + clock-frequency = <80000000>; + status = "disabled"; + }; + + uart5: serial@021f4000 { + compatible = "fsl,imx6q-uart"; + reg = <0x021f4000 0x4000>; + interrupt-parent = <&gic>; + interrupts = <62>; + clock-frequency = <80000000>; + status = "disabled"; + }; + + usbphy1: usbphy@020c9000 { + compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy"; + reg = <0x020c9000 0x1000>; + interrupts = <44>; + status = "disabled"; + }; + + usbphy2: usbphy@020ca000 { + compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy"; + reg = <0x020ca000 0x1000>; + interrupts = <45>; + status = "disabled"; + }; + + }; + + aips@02100000 { /* AIPS2 */ + compatible = "fsl,aips-bus", "simple-bus"; + #address-cells = <1>; + #size-cells = <1>; + interrupt-parent = <&gic>; + reg = <0x02100000 0x00100000>; + ranges; + + fec1: ethernet@02188000 { + compatible = "fsl,imx6q-fec"; + reg = <0x02188000 0x4000>; + interrupts = <150 151>; + status = "disabled"; + }; + + usbotg1: usb@02184000 { + compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; + reg = <0x02184000 0x200>; + interrupts = <75>; + fsl,usbphy = <&usbphy1>; + fsl,usbmisc = <&usbmisc 0>; + status = "disabled"; + }; + + usbh1: usb@02184200 { + compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; + reg = <0x02184200 0x200>; + interrupts = <72>; + fsl,usbphy = <&usbphy2>; + fsl,usbmisc = <&usbmisc 1>; + status = "disabled"; + }; + + usbh2: usb@02184400 { + compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; + reg = <0x02184400 0x200>; + interrupts = <73>; + fsl,usbmisc = <&usbmisc 2>; + status = "disabled"; + }; + + usbh3: usb@02184600 { + compatible = "fsl,imx6q-usb", "fsl,imx27-usb"; + reg = <0x02184600 0x200>; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311011103.rA1B30Ur046405>