Commit cc61049a authored by Grzegorz Daniluk's avatar Grzegorz Daniluk

Merge branch 'greg-wrs-2016'

parents dbc0240c 4bb4dd1e
...@@ -62,8 +62,8 @@ ...@@ -62,8 +62,8 @@
\graphicspath{ {../../figures/} } \graphicspath{ {../../figures/} }
\title[The WR Switch\hspace{2em}\insertframenumber/\inserttotalframenumber] \title[WR Switch and WR PTP Core\hspace{2em}\insertframenumber/\inserttotalframenumber]
{The White Rabbit Switch} {WR Switch and WR PTP Core}
\subtitle{status and plans} \subtitle{status and plans}
\author[G. Daniluk, A. Wujek]{Greg Daniluk, Adam Wujek} \author[G. Daniluk, A. Wujek]{Greg Daniluk, Adam Wujek}
...@@ -84,14 +84,15 @@ ...@@ -84,14 +84,15 @@
\end{frame} \end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Introduction} \section{WR Switch}
\subsection{} \subsection{}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}{WR Switch - overview} \begin{frame}[t,fragile]{WR Switch - overview}
\begin{center} \begin{center}
\includegraphics[width=.8\textwidth]{switch/wrSwitch_v3_3.jpg} \includegraphics<1>[width=.5\textwidth]{network/wr_network-new.pdf}
\includegraphics<2>[width=1.05\textwidth]{switch/wrSwitch_v3_3.jpg}
\begin{itemize} \begin{itemize}
\item central element of WR network \item central element of WR network
\item 18 port gigabit Ethernet switch with WR features \item 18 port gigabit Ethernet switch with WR features
...@@ -111,48 +112,249 @@ ...@@ -111,48 +112,249 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Gateware} \subsection{Gateware}
\subsection{} %\subsection{}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}<beamer>{Outline} \begin{frame}<beamer>{Outline}
\tableofcontents [currentsection] \tableofcontents [currentsubsection]
\end{frame} \end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}{Gateware release v4.2} \begin{frame}{Gateware}
\includegraphics[width=\textwidth]{switch/switch_hdl_simple.pdf}
\end{frame} \end{frame}
\begin{frame}[t,fragile]{Gateware release v4.2}
\begin{itemize}\setlength{\itemsep}{-0.0\baselineskip}
\item<1|only@1> Released on 28 August 2015
\item<2|only@2> 10MHz generation (only hardware v3.4)
\includegraphics<2>[width=\textwidth]{switch/switch_hdl_simple_v4-2_1.pdf}
\item<3|only@3> Improved Ethernet switching
\includegraphics<3>[width=\textwidth]{switch/switch_hdl_simple_v4-2_2.pdf}
\item<4|only@4> HDL watchdog module
\includegraphics<4>[width=\textwidth]{switch/switch_hdl_simple_v4-2_3.pdf}
\item<5|only@5> autogenerated SDB metadata for firmware information
\includegraphics<5>[width=\textwidth]{switch/switch_hdl_simple_v4-2_4.pdf}
\end{itemize}
\end{frame}
\begin{frame}{Stress-testing Ethernet switching}
\begin{center}
\begin{itemize}
\item Smartbits 6000C network tester
\item 4 point-to-point streams
\item Snake test
\end{itemize}
\end{center}
\end{frame}
\begin{frame}{Point-to-point streams}
\begin{center}
\includegraphics<1>[width=\textwidth]{misc/p2p-test.pdf}
\begin{columns}[c]
\column{.5\textwidth}
WRS firmware v4.0\\[6pt]
\includegraphics<2->[width=\textwidth]{measurements/v4-0-p2p-net-test.png}
\column{.5\textwidth}
\only<3>{WRS firmware v4.2\\[6pt]}
\includegraphics<3>[width=\textwidth]{measurements/v4-2-p2p-net-test.png}
\end{columns}
\end{center}
\end{frame}
\begin{frame}{Snake test}
\begin{center}
\includegraphics<1>[width=\textwidth]{misc/snake-test.pdf}
\includegraphics<2>[width=\textwidth]{misc/snake_test.jpg}
\begin{columns}[c]
\column{.5\textwidth}
WRS firmware v4.0\\[6pt]
\includegraphics<3->[width=\textwidth]{measurements/v4-0-snake-net-test.png}
\column{.5\textwidth}
\only<4>{WRS firmware v4.2\\[6pt]}
\includegraphics<4>[width=\textwidth]{measurements/v4-2-snake-net-test.png}
\end{columns}
\end{center}
\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section {Software} \subsection {Software}
\subsection{} %\subsection{}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}<beamer>{Outline} \begin{frame}<beamer>{Outline}
\tableofcontents [currentsection] \tableofcontents [currentsubsection]
\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}{Software (since 4.1.2)}
\begin{itemize}
\item<1-> 4.1.2 released on 12 December 2014
\item<2-> Monit to supervise processes
\item<3-> Setting system time from the WR time (in Slave mode)
\item<4-> Remote configuration (dot-config)
\begin{itemize}
\item<5-> Download in runtime
\item<6-> Move runtime configuration to it (ppsi, ports, SFPs, fibers)
\item<7-> Configuration of management port (static, dhcp)
\item<8-> Make config on switch
\item<9-> Improved root password handling
\end{itemize}
\item<10-> Snmp
\begin{itemize}
\item<11-> Redesigned MIB
\item<12-> Added about 150 new OIDs
\item<13-> Divide objects into Status and Expert groups
\end{itemize}
\end{itemize}
\end{frame} \end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}{Software (since 4.1.2)}
\begin{center}
\includegraphics<1>[width=.6\textwidth]{switch/snmp_expert_obj.pdf}
\end{center}
\end{frame}
\begin{frame}{Software} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}{Software (since 4.1.2) (cont.)}
\begin{itemize}
\item<1-> Improved LED signalization on the front panel
\begin{itemize}
\item<1-> Disable status LED during clean reboot
\item<1-> Status port shows port configuration (master, slave, non-wr)
\end{itemize}
\item<2-> Documentation
\begin{itemize}
\item<2-> New \textit{White Rabbit Switch: Failures and Diagnostics}
\end{itemize}
\item<3-> Code clean-up
\begin{itemize}
\item<4-> Added shared memmory to reduce CPU usage (avoid context switching)
\item<5-> Improved boot scripts% - now you can manually start/stop services using \texttt{/etc/init.d/*} scripts
\end{itemize}
\end{itemize}
\end{frame} \end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Plans for the future} \begin{frame}{Software (since 4.2)}
\begin{itemize}
\item<1-> 4.2 released on 28 August 2015
\item<2-> 64-bit frame counters (pstats)
\item<3-> Use common data format for wr{\_}mon (Tjeerd) \\
\texttt{Key1:Value Key2:Value}
\item<4-> Fixed bugs:
\begin{itemize}
\item<4-> Snmp crashes
\item<4-> Timeout problems when the time jumps backwards
\end{itemize}
\item<5-> Remote configuration (dot-config)
\begin{itemize}
\item<6-> Support retrieving path to the dot-config from DHCP
\item<7-> Use hostname provided by dhcp (or dot-config)
\item<8-> make menuconfig on switch (for dot-config)
\item<9-> use hysteresis to control fans' speed (for development)
\item<10-> print dot-config source and status after logon
\end{itemize}
\end{itemize}
\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Plans for the future}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}<beamer>{Outline} \begin{frame}<beamer>{Outline}
\tableofcontents [currentsection] \tableofcontents [currentsubsection]
\end{frame} \end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}{Ongoing work and plans for the future} \begin{frame}{Ongoing work and plans for the future}
\begin{itemize} \begin{itemize}
\item<1-> Gateware \item<1-> Gateware
\begin{itemize}
\item Get rid of HWIU module
\item Separate resources in the Switching Core for HP frames
\item Holdover and switchover
\item Caching for RTU decisions
\end{itemize}
\item<2-> Software \item<2-> Software
\begin{itemize}
\item Change the names of the interfaces from wr0-17 to wri1-18
\item Include Vlans configuration into dot-config
\item Link Layer Discovery Protocol (LLDP)
\item PPSi audit and compliance tests
\item Buildroot and Linux kernel uplift
\end{itemize}
\end{itemize} \end{itemize}
\end{frame} \end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{WR PTP Core}
\subsection{}
\begin{frame}<beamer>{Outline}
\tableofcontents [currentsection]
\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}{WR PTP Core - overview}
\begin{center}
\includegraphics<1>[width=.5\textwidth]{network/wr_network-new.pdf}
\includegraphics<2>[width=\textwidth]{node/wrpc_inside-v3-0.pdf}
\begin{itemize}
\item HDL core
\item Ethernet MAC with WR features
\item WR implementation for the nodes
\end{itemize}
\end{center}
\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Release v3.0}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}<beamer>{Outline}
\tableofcontents [currentsubsection]
\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}{What's new in release v3.0}
\begin{itemize}%\setlength{\itemsep}{-0.0\baselineskip}
\item<1-> Bugfixes for synchronization under heavy traffic
\item<1-> Bugfixes to withstand heavy traffic
\item<2-> Lock helper PLL below reference frequency
\item<3-> Kintex-7 support
\item<4-> SDBFS and Flash support
\item<5-> Tx runt frames padding
\item<6-> Increased RAM size to 128kB
\end{itemize}
\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\subsection{Plans for the future}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}<beamer>{Outline}
\tableofcontents [currentsubsection]
\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}{Ongoing work and plans for the future}
\begin{itemize}
\item<1-> HDL version and synthesis information like in the switch
\item<2-> improve synthesis time
\item<3-> replace LM32 with URV
\item<4-> SNMP support for diagnostics(see demo)\\[6pt]
\item<5-> VLANs support
\item<6-> Syslog for logging
\item<7-> Software cleanup
%\item See talk by Alessandro on WRPC software tomorrow.
\end{itemize}
\begin{block}<8>{}
Talk by Alessandro on WRPC software tomorrow.
\end{block}
\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section*{} \section*{}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{frame}{Thank you} \begin{frame}{Thank you! It's time for demo...}
\begin{center} \begin{center}
\includegraphics[height=4.0cm]{misc/white_rabbit_end.png} \includegraphics[height=4.0cm]{misc/white_rabbit_end.png}
...@@ -161,11 +363,18 @@ ...@@ -161,11 +363,18 @@
\begin{center} \begin{center}
More information: \\ More information: \\
http://www.ohwr.org/projects/white-rabbit/wiki/Switch http://www.ohwr.org/projects/white-rabbit/wiki/Switch\\
http://www.ohwr.org/projects/wr-cores/wiki/Wrpc\_core
\end{center} \end{center}
\end{frame} \end{frame}
\begin{frame}{Demo setup}
\begin{center}
\includegraphics[width=1.1\textwidth]{misc/demo-workshop-2016.pdf}
\end{center}
\end{frame}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
......
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