Skip to content

W
White Rabbit
Commit 65768aad authored by Grzegorz Daniluk's avatar Grzegorz Daniluk
Browse files
Options

Merge branch 'greg-141004' 

Conflicts:
	presentations/WRS_2014_status/WRS_2014.tex
parents 1a3bfd54 49663c4e
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 3 deletions
presentations/WRS_2014_status/WRS_2014.tex
View file @ 65768aad
......@@ -63,7 +63,7 @@
\title[WRS status\hspace{2em}\insertframenumber/\inserttotalframenumber]
{White Rabbit Switch\\ \small version 4.x}
\author[G. Daniluk, A. Rubini, B. Rat]{Grzegorz Daniluk, Alessandro Rubini, Benoit Rat}
\author[G. Daniluk, A. Rubini, B. Rat]{Greg Daniluk, Alessandro Rubini, Benoit Rat}
\institute{CERN BE-CO-HT\\Gnudd\\7 Solutions}
......@@ -90,22 +90,172 @@
\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}{What is WRS}
\begin{frame}{White Rabbit network}
\begin{center}
\includegraphics[height=.8\textheight]{network/wr_network-enhanced_pro.pdf}
\end{center}
\end{frame}
\begin{frame}{WR Switch - overview}
\begin{center}
\includegraphics[width=.8\textwidth]{switch/wrSwitch_v3_3.jpg}
\begin{itemize}
\item Central element of WR network
\item Gigabit Ethernet switch with WR features
\item Designed from scratch
\item 18 ports
\item 1000Base-BX10 SFPs: up to 10km, single-mode fiber
\end{itemize}
\end{center}
\end{frame}
\begin{frame}{WR Switch - internals}
\vspace{-0.3cm}
\begin{center}
\includegraphics[width=.85\textwidth]{switch/switch_simple_diagram_h.pdf}
\end{center}
\end{frame}
\begin{frame}{WR Switch internals - gateware}
\begin{center}
\includegraphics[width=.8\textwidth]{switch/switch_hdl.pdf}
\begin{itemize}
\item lives inside the Xilinx Virtex-6 FPGA
\item controlled from ARM software
\item Gigabit Ethernet endpoints with timestamps generation
\item forwards Ethernet frames
\item keeps WR time, generates 1-PPS, measures phase, disciplines
oscillators
\end{itemize}
\end{center}
\end{frame}
\begin{frame}{WR Switch internals - software}
\begin{columns}[c]
\column{.7\textwidth}
\begin{itemize}
\item bootloader (at91bootstrap + Barebox)
\item embedded Linux with 2.6.39 kernel
\item patches and drivers for HDL modules
\item Hardware Abstraction Layer
\item RTU daemon
\item PPSI daemon - PTP with WR extensions
\item management (SNMP, shell tools, web interface, Syslog)
\end{itemize}
\column{.4\textwidth}
\begin{center}
\includegraphics[width=\textwidth]{misc/wrs_sw_logos.png}
\end{center}
\end{columns}
\end{frame}
\section{Gateware}
\subsection{}
\begin{frame}<beamer>{Outline}
\tableofcontents [currentsection]
\end{frame}
\begin{frame}{Gateware v4.0 overview}
\includegraphics[width=\textwidth]{switch/switch_hdl_v4_0_1.pdf}
\end{frame}
\begin{frame}{GW1}
\begin{frame}{New features in v4.0 release}
\begin{itemize}
\item Per-port counters
\begin{center}
\includegraphics<1>[width=.7\textwidth]{switch/pstats.pdf}
\includegraphics<2>[width=.7\textwidth]{switch/pstats-snmp.png}
\end{center}
\begin{itemize}
\item collects events from Endpoint and RTU
\item TX underruns, RX overruns, giant frames, runt frames, CRC Errors,
RTU decisions, and more...
\item read by Linux kernel driver
\end{itemize}
\end{itemize}
\end{frame}
\begin{frame}{New features in v4.0 release}
\vspace{-2.5cm}
\begin{itemize}
\item Per-port counters
\item VLAN support in Endpoints
\begin{itemize}
\item available modes: \emph{Disabled}, \emph{Trunk}, \emph{Access}
\item \emph{Access}: tags untagged ingress traffic
\item \emph{Trunk}: accepts only tagged frames with proper VID
\item untagging frames on egress
\item configuration through \emph{wrs\_vlans} shell tool
\end{itemize}
\end{itemize}
\end{frame}
\begin{frame}{New features in v4.0 release}
\begin{itemize}
\item Per-port counters
\item VLAN support in Endpoints
\item<1-> Improved Ethernet frames switching and latency
\item<2> Networking performance tests with \emph{Spirent SmartBits}
\end{itemize}
\vspace{-12pt}
\begin{columns}[c]
\column{.4\textwidth}
\begin{center}
\includegraphics<1>[width=.8\textwidth]{measurements/v3_3_net_test_small.png}
\end{center}
\column{.6\textwidth}
\begin{center}
\includegraphics<1>[width=.8\textwidth]{measurements/v4_net_test_small.png}
\end{center}
\end{columns}
\begin{center}
\includegraphics<2>[width=.7\textwidth]{misc/smartbits.png}
\end{center}
\end{frame}
\begin{frame}{New features in v4.0 release}
\begin{itemize}
\vspace{-0.5cm}
\item Per-port counters
\item VLAN support in Endpoints
\item Improved Endpoint "speed" and frames switching
\item Networking performance tests with \emph{Spirent SmartBits}
\item<1-> Rewritten external channel in SoftPLL
\begin{itemize}
\item<1> improved locking to 10MHz \& 1-PPS
\item<1> allow 1-PPS out/in alignment in the future
\end{itemize}
\vspace{-30pt}
\item<2-> vUART to read SoftPLL logs from shell
\end{itemize}
\begin{center}
\includegraphics<1>[width=.7\textwidth]{switch/spll_ext.pdf}
\end{center}
\end{frame}
\begin{frame}{Ongoing work and plans for future releases}
\begin{itemize}
\item SDB support with auto-generated metadata instead of HWIU module
\item Switching Core improvements
\item Holdover and 1-PPS out/in alignment in SoftPLL
\item Robustness (TRU and TATSU modules)
\item Resources optimization
\end{itemize}
\end{frame}
\section{Software}
\subsection{}
\begin{frame}<beamer>{Outline}
\tableofcontents [currentsection]
\end{frame}
\begin{frame}{SW1}
\end{frame}
\section{Hardware}
\begin{frame}<beamer>{Outline}
\tableofcontents [currentsection]
\end{frame}
\subsection{HW: The new SCB v3.4}
\begin{frame}{\insertsubsectionhead}
The WRS is now shipped with a SCB v3.4 with the following main changes:\footnote{The WRS v3.4 is still shipped with minibackplane v3.3}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment