Merge commit '3e952681' as 'wrpc-sw'

1483c6e3 · José Luis Gutiérrez · 8f1c3405 · 3e952681 · 1483c6e3 · 1483c6e3
Commit 1483c6e3 authored Apr 08, 2015 by José Luis Gutiérrez
268 changed files
--- a/wrpc-sw/.gitignore
+++ b/wrpc-sw/.gitignore
+*.o
+*.a
+*.elf
+*.ram
+*.bin
+*.mif
+*.*~
+*~
+*_disasm.S
+*.vhd
+
+*.cmd
+*.o
+.tmp_*
+.config
+.config.old
+include/config
+include/generated
--- a/wrpc-sw/.gitmodules
+++ b/wrpc-sw/.gitmodules
+[submodule "ppsi"]
+	path = ppsi
+	url = git://ohwr.org/white-rabbit/ppsi.git
--- a/wrpc-sw/COPYING
+++ b/wrpc-sw/COPYING
--- a/wrpc-sw/Kconfig
+++ b/wrpc-sw/Kconfig
+
+mainmenu "WR PTP Core software configuration"
+
+# Later we'll build wr_cpu.bin for wr-switch from this code base
+config WR_SWITCH
+	bool "Build rt_cpu.bin, for the WR-Switch FPGA"
+	default n
+	select UART
+
+config WR_NODE
+	bool
+	default !WR_SWITCH
+
+# most options with no prompt here are prompted-for in the "advanced" section
+
+config PRINT_BUFSIZE
+	int
+	default 128
+
+config PRINTF_XINT
+	boolean
+	default y
+
+config RAMSIZE
+	int
+	default 65536 if WR_SWITCH
+	default 131072
+
+# CONFIG_WR_SWITCH has no further options at all at this point
+if WR_NODE
+
+config STACKSIZE
+	int  
+	default 2048
+
+config PPSI
+	boolean
+	default y
+
+config UART
+	boolean
+	default y
+
+config W1
+	boolean
+	default y
+
+# The other ones can be set by non-developers
+
+config ETHERBONE
+	boolean "Compile Etherbone support in wrpc-sw"
+	help
+	  This allows to run LM32 code that is aware of Etherbone.
+	  You need to run a gateware file that includes Etherbone support.
+	  If in doubt, say No.
+
+config WRNIC
+	boolean "Compile White Rabbit NIC support in wrpc-sw"
+	help
+	  This allows to run LM32 code that is aware of Etherbone and
+	  NIC. You need to run a gateware file that includes Etherbone
+	  and NIC support. This option needs ETHERBONE enabled.
+	  If in doubt, say No.
+
+config CMD_CONFIG
+	boolean "Include configuration in the output binary"
+	help
+	  This options adds the "config" command to the shell, which
+	  reports the current configuration.  This adds half a kilobyte
+	  to the binary size (100b for the code plus the .config file).
+
+config NIC_PFILTER
+	depends on ETHERBONE
+	bool "Add packet filter rules for wr-nic"
+	help
+	  When using wr-nic, the host must receive frames that are not
+	  ptp nor etherbone ones.  This adds the needed filter rules
+	  to that effect.  Such rules are not needed when no Etherbone
+	  is there, because in that case all non-ptp frames reach the
+	  host.
+
+#
+# This is a set of configuration options that should not be changed by
+# normal users. If the "developer" menu is used, the binary is tainted.
+
+comment "wrpc-sw is tainted if you change the following options"
+config DEVELOPER
+	bool "Advanced configurations, only for developers"
+	help
+	  The following options are new features under testing, or
+	  special customizations not normally useful for people not
+	  directly working on this package.  Please don't use unless
+	  you are a developer of wrpc-sw.
+
+config RAMSIZE
+	depends on DEVELOPER
+	int "Size of the RAM in the FPGA for this program"
+	default 90112
+	help
+	  The usual configuration for wrpc-sw is 0x16000 bytes
+	  (i.e. 88kB = 90112 bytes) but if your project has less or
+	  more features you may want to adjust the FPGA size and
+	  choose your preferred value here.
+
+config STACKSIZE
+	depends on DEVELOPER
+	int "Size of the stack area needed by this program"
+	default 2048
+	help
+	  The linker complains if the code doesn't fit into RAM, but
+	  we must also consider the stack, or the program will crash
+	  at run time. (However, we have a detector for overflows).
+
+config PRINT_BUFSIZE
+	depends on DEVELOPER
+	int "Size for the temporary output string of pp_printf"
+	default 128
+	help
+	  This buffer is constant storage (i.e. wasted space), but it
+	  also constraints the maximum lenght of text that can be written
+	  in a single call to printf.
+
+config CHECK_RESET
+	depends on DEVELOPER
+	bool "Print a stack trace if reset happens"
+	help
+	  If the CPU is following a NULL pointer, the program will
+	  be restarted. If this option is activated, the main function
+	  detects that it is re-executed and dumps a stack trace; it
+	  then clears the stack (for next time) and restarts again.
+
+choice
+	prompt "Implementation of pp_printf"
+	depends on DEVELOPER
+
+config PRINTF_XINT
+	bool "hex-and-int"
+	help
+	  This selects a printf that can only print decimal and hex
+	  numbers, without obeying the format modifiers. %c and %s are
+	  supported too, and %p is equivalent to %x.
+	  See pp_printf/README for details.
+
+config PRINTF_FULL
+	bool "full"
+	help
+	  This selects an implementation that supports all standard
+	  formats with modifiers, like "%08X" and "%.5s". It costs
+	  around 2k of compiled code more than XINT.
+	  See pp_printf/README for details.
+
+config PRINTF_MINI
+	bool "minimal"
+	help
+	  This selects a printf that prints all integers as hex,
+	  without obeying the format modifiers. %c and %s are
+	  supported too. See pp_printf/README for details.
+	  This is not probably what you want for wrpc-sw.
+
+config PRINTF_NONE
+	bool "empty"
+	help
+	  This selects a printf that prints the format string
+	  alone and ignores all further arguments. Minimal size,
+	  but not suited for wrpc-sw. See pp_printf/README for details.
+endchoice
+
+config PPSI
+	boolean
+	help
+	  Select this option for the ppsi engine (now only option)
+
+config DETERMINISTIC_BINARY
+	depends on DEVELOPER
+	boolean "Build a binary that is the same every time"
+	help
+	  This option is used to #ifdef __DATE__ and __TIME__ strings
+	  out of the compiled WRC binary. If you set it you'll get the
+	  same binary bit-by-bit at each rebuild.  I am using this
+	  option to hack the build procedure and use a simple "diff"
+	  between the old and new output to verify I didn't introduce
+	  changes.
+
+	  If in doubt, say No.
+
+config UART
+	boolean "Use hardware uart (and/or vuart if available)"
+	depends on DEVELOPER
+	default y
+	help
+	  This option selects the serial driver, connected to either
+	  the USB socket, or "vuart" (software fifo) or both, according
+	  to how the gateware is built. 
+
+config UART_SW
+	depends on DEVELOPER
+	default !UART
+	boolean "Use software uart"
+	help
+	  The software uart is made up of two circular buffers. It can
+	  be used either as an alternative to the harwdare UART or as
+	  an addition. If the option is turned on, ppsi log messages
+	  are routed to the software uart. The interactive wrpc shell
+	  and diagnostics run on the hardware UART if available.
+
+config SDB_STORAGE
+	default y
+	boolean "Use SDB to manage storage (instead of legacy eeprom code)"
+	help
+	  Use SDB to manage flash and eeproms (both W1 and I2C). If not, legacy code
+	  (eeprom only) will be selected.
+
+config LEGACY_EEPROM
+	boolean
+	default !SDB_STORAGE
+
+endif
+# CONFIG_WR_NODE
--- a/wrpc-sw/MAKEALL
+++ b/wrpc-sw/MAKEALL
+#!/bin/sh
+# A trivial script to build with all known configurations
+# (please add a configs/ file to test your special case
+
+T=$(mktemp /tmp/wrpc-config.XXXXXX)
+
+configs=$(ls configs)
+if [ $# -ne 0 ]; then
+    configs="$*"
+fi
+
+for c in $configs; do
+    echo "##### Building with '$c'"
+    if ! make $c 2>&1 >> $T; then
+	echo "Error in configuration (see $T)"
+	exit 1
+    fi
+    make -s clean
+    make -s
+done
+rm $T
\ No newline at end of file
--- a/wrpc-sw/Makefile
+++ b/wrpc-sw/Makefile
+# Tomasz Wlostowski for CERN, 2011,2012
+
+CROSS_COMPILE ?= lm32-elf-
+export CROSS_COMPILE
+
+CC =		$(CROSS_COMPILE)gcc
+LD =		$(CROSS_COMPILE)ld
+OBJDUMP =	$(CROSS_COMPILE)objdump
+OBJCOPY =	$(CROSS_COMPILE)objcopy
+SIZE =		$(CROSS_COMPILE)size
+
+-include $(CURDIR)/.config
+
+AUTOCONF = $(CURDIR)/include/generated/autoconf.h
+
+PPSI = ppsi
+
+# we miss CONFIG_ARCH_LM32 as we have no other archs by now
+obj-y = arch/lm32/crt0.o arch/lm32/irq.o
+LDS-$(CONFIG_WR_NODE)   = arch/lm32/ram.ld
+LDS-$(CONFIG_WR_SWITCH) = arch/lm32/ram-wrs.ld
+
+obj-$(CONFIG_WR_NODE)   += wrc_main.o
+obj-$(CONFIG_WR_SWITCH) += wrs_main.o
+obj-$(CONFIG_WR_SWITCH) += ipc/minipc-mem-server.o ipc/rt_ipc.o
+
+# our linker script is preprocessed, so have a rule here
+%.ld: %.ld.S $(AUTOCONF) .config
+	$(CC) -include $(AUTOCONF) -E -P $*.ld.S -o $@
+
+
+cflags-y =	-ffreestanding -include $(AUTOCONF) -Iinclude/std -Iinclude \
+			-I. -Isoftpll -Iipc
+cflags-y +=	-I$(CURDIR)/pp_printf
+
+cflags-$(CONFIG_PPSI) += \
+	-ffreestanding \
+	-include include/ppsi-wrappers.h \
+	-Iinclude \
+	-I$(PPSI)/include \
+	-I$(PPSI)/arch-wrpc \
+	-I$(PPSI)/arch-wrpc/include \
+	-I$(PPSI)/proto-ext-whiterabbit \
+	-Iboards/spec
+
+obj-ppsi = \
+	$(PPSI)/ppsi.o
+
+obj-$(CONFIG_PPSI) += \
+	monitor/monitor_ppsi.o \
+	lib/ppsi-wrappers.o \
+	$(obj-ppsi)
+
+CFLAGS_PLATFORM  = -mmultiply-enabled -mbarrel-shift-enabled
+LDFLAGS_PLATFORM = -mmultiply-enabled -mbarrel-shift-enabled \
+	-nostdlib -T $(LDS-y)
+
+include shell/shell.mk
+include lib/lib.mk
+include pp_printf/printf.mk
+include dev/dev.mk
+include softpll/softpll.mk
+
+# ppsi already has div64 (the same one), so only pick it if not using ppsi
+ifndef CONFIG_PPSI
+obj-y += pp_printf/div64.o
+endif
+# And always complain if we pick the libgcc division: 64/32 = 32 is enough here.
+obj-y += check-error.o
+
+obj-$(CONFIG_WR_NODE) += sdb-lib/libsdbfs.a
+cflags-$(CONFIG_WR_NODE) += -Isdb-lib
+
+CFLAGS = $(CFLAGS_PLATFORM) $(cflags-y) -Wall \
+	-ffunction-sections -fdata-sections -Os \
+	-include include/trace.h -ggdb
+
+LDFLAGS = $(LDFLAGS_PLATFORM) \
+	-Wl,--gc-sections -Os -lgcc -lc
+
+OBJS = $(obj-y)
+
+OUTPUT-$(CONFIG_WR_NODE)   = wrc
+OUTPUT-$(CONFIG_WR_SWITCH) = rt_cpu
+OUTPUT := $(OUTPUT-y)
+
+REVISION=$(shell git describe --dirty --always)
+
+all: tools $(OUTPUT).ram $(OUTPUT).vhd $(OUTPUT).mif
+
+.PRECIOUS: %.elf %.bin
+.PHONY: all tools clean gitmodules $(PPSI)/ppsi.o
+
+# we need to remove "ptpdump" support for ppsi if RAM size is small and
+# we include etherbone
+ifneq ($(CONFIG_RAMSIZE),131072)
+  ifdef CONFIG_ETHERBONE
+    PPSI_USER_CFLAGS = -DCONFIG_NO_PTPDUMP
+  endif
+endif
+
+PPSI_USER_CFLAGS += -DDIAG_PUTS=uart_sw_write_string
+
+$(obj-ppsi):
+	test -f $(PPSI)/.config || $(MAKE) -C $(PPSI) wrpc_defconfig
+	$(MAKE) -C $(PPSI) WRPCSW_ROOT=.. \
+		CROSS_COMPILE=$(CROSS_COMPILE) CONFIG_NO_PRINTF=y \
+		USER_CFLAGS="$(PPSI_USER_CFLAGS)"
+
+sdb-lib/libsdbfs.a:
+	$(MAKE) -C sdb-lib
+
+$(OUTPUT).elf: $(LDS-y) $(AUTOCONF) gitmodules $(OUTPUT).o config.o
+	$(CC) $(CFLAGS) -DGIT_REVISION=\"$(REVISION)\" -c revision.c
+	${CC} -o $@ revision.o config.o $(OUTPUT).o $(LDFLAGS)
+	${OBJDUMP} -d $(OUTPUT).elf > $(OUTPUT)_disasm.S
+	$(SIZE) $@
+
+$(OUTPUT).o: $(OBJS)
+	$(LD) --gc-sections -e _start -r $(OBJS) -T bigobj.lds -o $@
+
+config.o: .config
+	sed '1,3d' .config > .config.bin
+	dd bs=1 count=1 if=/dev/zero 2> /dev/null >> .config.bin
+	$(OBJCOPY) -I binary -O elf32-lm32 -B lm32 \
+		--rename-section .data=.data.config  .config.bin $@
+	rm -f .config.bin
+
+%.bin: %.elf
+	${OBJCOPY} -O binary $^ $@
+
+%.ram: tools %.bin
+	./tools/genraminit $*.bin 0 > $@
+
+%.vhd: tools %.bin
+	./tools/genramvhd -s `. ./.config; echo $$CONFIG_RAMSIZE` $*.bin > $@
+
+%.mif: tools %.bin
+	./tools/genrammif $*.bin `. ./.config; echo $$CONFIG_RAMSIZE` > $@
+
+$(AUTOCONF): silentoldconfig
+
+clean:
+	rm -f $(OBJS) $(OUTPUT).elf $(OUTPUT).bin $(OUTPUT).ram $(LDS)
+	$(MAKE) -C $(PPSI) clean
+	$(MAKE) -C sdb-lib clean
+	$(MAKE) -C tools clean
+
+%.o:		%.c
+	${CC} $(CFLAGS) $(PTPD_CFLAGS) $(INCLUDE_DIR) $(LIB_DIR) -c $*.c -o $@
+
+tools:
+	$(MAKE) -C tools
+
+# if needed, check out the submodules (first time only), so users
+# who didn't read carefully the manual won't get confused
+gitmodules:
+	@test -d ppsi/arch-wrpc || echo "Checking out submodules"
+	@test -d ppsi/arch-wrpc || git submodule update --init
+
+
+# following targets from Makefile.kconfig
+silentoldconfig:
+	@mkdir -p include/config
+	$(MAKE) -f Makefile.kconfig $@
+
+scripts_basic config:
+	$(MAKE) -f Makefile.kconfig $@
+
+%config:
+	$(MAKE) -f Makefile.kconfig $@
+
+defconfig:
+	$(MAKE) -f Makefile.kconfig spec_defconfig
+
+.config: silentoldconfig
+
+# This forces more compilations than needed, but it's useful
+# (we depend on .config and not on include/generated/autoconf.h
+# because the latter is touched by silentoldconfig at each build)
+$(obj-y): .config $(wildcard include/*.h)
--- a/wrpc-sw/Makefile.kconfig
+++ b/wrpc-sw/Makefile.kconfig
+
+VERSION = $(shell git describe --always --dirty)
+export VERSION
+# Do not:
+# o  use make's built-in rules and variables
+#    (this increases performance and avoids hard-to-debug behaviour);
+# o  print "Entering directory ...";
+MAKEFLAGS += -rR --no-print-directory
+
+# To put more focus on warnings, be less verbose as default
+# Use 'make V=1' to see the full commands
+
+ifdef V
+  ifeq ("$(origin V)", "command line")
+    KBUILD_VERBOSE = $(V)
+  endif
+endif
+ifndef KBUILD_VERBOSE
+  KBUILD_VERBOSE = 0
+endif
+
+# Cancel implicit rules on top Makefile
+$(CURDIR)/Makefile Makefile: ;
+
+# That's our default target when none is given on the command line
+PHONY := _all
+_all:
+
+# SHELL used by kbuild
+CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
+	  else if [ -x /bin/bash ]; then echo /bin/bash; \
+	  else echo sh; fi ; fi)
+
+# Make variables (CC, etc...)
+HOSTCC       = gcc
+HOSTCXX      = g++
+HOSTCFLAGS   = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
+HOSTCXXFLAGS = -O2
+
+export HOSTCC HOSTCXX HOSTCFLAGS HOSTCXXFLAGS
+
+KBUILD_KCONFIG = $(CURDIR)/Kconfig
+export KBUILD_KCONFIG
+
+srctree		:= $(CURDIR)
+objtree		:= $(CURDIR)
+src		:= $(srctree)
+obj		:= $(objtree)
+
+export srctree objtree
+
+# We need some generic definitions (do not try to remake the file).
+$(srctree)/scripts/Kbuild.include: ;
+include $(srctree)/scripts/Kbuild.include
+
+# Basic helpers built in scripts/
+PHONY += scripts_basic
+scripts_basic:
+	$(Q)$(MAKE) $(build)=scripts/basic
+
+
+config: scripts_basic FORCE
+	$(Q)mkdir -p include/linux include/config
+	$(Q)$(MAKE) $(build)=scripts/kconfig $@
+
+%config: scripts_basic FORCE
+	$(Q)$(MAKE) $(build)=scripts/kconfig $@
+
+clean:
+	@find . $(RCS_FIND_IGNORE) \
+		\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
+		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
+		-o -name 'Module.markers' -o -name '.tmp_*.o.*' \) \
+		-type f -print | xargs rm -f -v
+
+PHONY += FORCE
+FORCE:
+
+# Declare the contents of the .PHONY variable as phony.  We keep that
+# information in a variable so we can use it in if_changed and friends.
+.PHONY: $(PHONY)
--- a/wrpc-sw/arch/lm32/.gitignore
+++ b/wrpc-sw/arch/lm32/.gitignore
+ram.ld
\ No newline at end of file
--- a/wrpc-sw/arch/lm32/crt0.S
+++ b/wrpc-sw/arch/lm32/crt0.S
+/****************************************************************************
+**
+**  Name: crt0ram.S
+**
+**  Description:
+**        Implements boot-code that calls LatticeDDInit (that calls main())
+**        Implements exception handlers (actually, redirectors)
+**
+**  $Revision: $
+**
+** Disclaimer:
+**
+**   This source code is intended as a design reference which
+**   illustrates how these types of functions can be implemented.  It
+**   is the user's responsibility to verify their design for
+**   consistency and functionality through the use of formal
+**   verification methods.  Lattice Semiconductor provides no warranty
+**   regarding the use or functionality of this code.
+**
+** --------------------------------------------------------------------
+**
+**                     Lattice Semiconductor Corporation
+**                     5555 NE Moore Court
+**                     Hillsboro, OR 97214
+**                     U.S.A
+**
+**                     TEL: 1-800-Lattice (USA and Canada)
+**                          (503)268-8001 (other locations)
+**
+**                     web:   http://www.latticesemi.com
+**                     email: techsupport@latticesemi.com
+**
+** --------------------------------------------------------------------------
+**
+**  Change History (Latest changes on top)
+**
+**  Ver    Date        Description
+** --------------------------------------------------------------------------
+**  3.8   Apr-15-2011  Added __MICO_USER_<handler>_HANDLER__ preprocessor to 
+**                     allow customers to implement their own handlers for:
+**                     DATA_ABORT, INST_ABORT
+**  
+**  3.1   Jun-18-2008  Added __MICO_NO_INTERRUPTS__ preprocessor
+**                     option to exclude invoking MicoISRHandler
+**                     to reduce code-size in apps that don't use
+**                     interrupts
+**
+**  3.0   Mar-25-2008  Added Header
+**
+**---------------------------------------------------------------------------
+*****************************************************************************/
+
+/*
+ * LatticeMico32 C startup code.
+ *
+ * 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.
+ */
+
+/* From include/sys/signal.h */  
+#define SIGINT  2   /* interrupt */
+#define SIGTRAP 5   /* trace trap */
+#define SIGFPE  8   /* arithmetic exception */
+#define SIGSEGV 11  /* segmentation violation */
+
+//#define MICO32_FULL_CONTEXT_SAVE_RESTORE
+
+
+/* Exception handlers - Must be 32 bytes long. */
+        .section    .boot, "ax", @progbits
+	
+        .global	_start  
+_start: 
+	   
+        .global _reset_handler
+        .type 	_reset_handler, @function
+_reset_handler:
+    xor r0, r0, r0
+    wcsr    IE, r0
+    wcsr    IM, r0
+    mvhi    r1, hi(_reset_handler)
+    ori     r1, r1, lo(_reset_handler)
+    wcsr    EBA, r1
+    calli   _crt0
+    nop
+        .size	_reset_handler, .-_reset_handler
+	
+.extern _irq_entry
+.org 0xc0
+        .global _interrupt_handler
+        .type 	_interrupt_handler, @function
+_interrupt_handler:
+    sw      (sp+0), ra
+    calli   _save_all
+    mvi     r1, SIGINT
+#ifndef __MICO_NO_INTERRUPTS__