Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
Software for White Rabbit PTP Core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
30
Issues
30
List
Board
Labels
Milestones
Merge Requests
4
Merge Requests
4
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
Software for White Rabbit PTP Core
Commits
f89c5fd0
Commit
f89c5fd0
authored
Apr 24, 2020
by
Grzegorz Daniluk
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ML-btrain-v1.2' into proposed_master
parents
36c333f3
1ba7fec8
Pipeline
#211
passed with stages
in 27 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
101 additions
and
53 deletions
+101
-53
wr-streamers.c
tools/wr-streamers.c
+101
-53
No files found.
tools/wr-streamers.c
View file @
f89c5fd0
...
...
@@ -12,10 +12,15 @@
#include <hw/wr_streamers.h>
#define GW_REG_VER_ERROR -1
#define GW_REG_VER_OK 0
#define GW_REG_VER_DIFFERENT 1
static
struct
mapping_desc
*
wrstm
=
NULL
;
#define LEAP_SECONDS_DEFAULT 37
static
int
leap_seconds
=
LEAP_SECONDS_DEFAULT
;
static
uint32_t
gw_reg_map_version
=
0
;
static
char
*
stats_mesg
[][
2
]
=
{
{
"Number of sent wr streamer frames since reset"
,
"tx_cnt"
},
...
...
@@ -76,32 +81,32 @@ int read_stats(struct cmd_desc *cmdd, struct atom *atoms)
cnt_lat
=
((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT13
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT12
);
avg_lat
=
(((
double
)
acc_lat
)
*
8
/
1000
)
/
(
double
)
cnt_lat
;
fprintf
(
stderr
,
"Latency [us] : min=%1
0g max=%10g avg =%10
g "
fprintf
(
stderr
,
"Latency [us] : min=%1
5g max=%15g avg =%15
g "
"(overflow =%d)
\n
"
,
min_lat
,
max_lat
,
avg_lat
,
overflow
);
fprintf
(
stderr
,
"Frames [number]: tx =%1
0lu rx =%10lu lost=%10lu
"
"
(lost blocks =%lu
)
\n
"
,
((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
TX_STAT3
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
TX_STAT2
),
((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT5
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT4
),
((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT7
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT6
),
((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT9
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT8
));
fprintf
(
stderr
,
"Frames [number]: tx =%1
5"
PRIu64
" rx =%15"
PRIu64
"
"
"
lost=%15"
PRIu64
" (lost blocks =%"
PRIu64
"
)
\n
"
,
(
uint64_t
)((
(
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
TX_STAT3
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
TX_STAT2
)
)
,
(
uint64_t
)((
(
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT5
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT4
)
)
,
(
uint64_t
)((
(
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT7
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT6
)
)
,
(
uint64_t
)((
(
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT9
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT8
))
)
;
break
;
case
0
:
fprintf
(
stderr
,
"%s:%
lu
\n
"
,
stats_mesg
[
0
][
1
],
fprintf
(
stderr
,
"%s:%
"
PRIu64
"
\n
"
,
stats_mesg
[
0
][
1
],
((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
TX_STAT3
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
TX_STAT2
));
break
;
case
1
:
fprintf
(
stderr
,
"%s:%
lu
\n
"
,
stats_mesg
[
1
][
1
],
fprintf
(
stderr
,
"%s:%
"
PRIu64
"
\n
"
,
stats_mesg
[
1
][
1
],
((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT5
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT4
));
break
;
case
2
:
fprintf
(
stderr
,
"%s:%
lu
\n
"
,
stats_mesg
[
2
][
1
],
fprintf
(
stderr
,
"%s:%
"
PRIu64
"
\n
"
,
stats_mesg
[
2
][
1
],
((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT7
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT6
));
break
;
...
...
@@ -116,21 +121,21 @@ int read_stats(struct cmd_desc *cmdd, struct atom *atoms)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT1
)));
break
;
case
5
:
fprintf
(
stderr
,
"%s:%
lu
\n
"
,
stats_mesg
[
5
][
1
],
fprintf
(
stderr
,
"%s:%
"
PRIu64
"
\n
"
,
stats_mesg
[
5
][
1
],
((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT11
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT10
));
break
;
case
6
:
fprintf
(
stderr
,
"%s:%
lu
\n
"
,
stats_mesg
[
6
][
1
],
fprintf
(
stderr
,
"%s:%
"
PRIu64
"
\n
"
,
stats_mesg
[
6
][
1
],
((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT13
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT12
));
break
;
case
7
:
fprintf
(
stderr
,
"%s:%
lu
\n
"
,
stats_mesg
[
7
][
1
],
fprintf
(
stderr
,
"%s:%
"
PRIu64
"
\n
"
,
stats_mesg
[
7
][
1
],
((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT9
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT8
));
break
;
case
8
:
case
8
:
// print all
max_lat
=
WR_STREAMERS_RX_STAT0_RX_LATENCY_MAX_R
(
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT0
));
max_lat
=
(
max_lat
*
8
)
/
1000
.
0
;
...
...
@@ -138,22 +143,34 @@ int read_stats(struct cmd_desc *cmdd, struct atom *atoms)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT1
));
min_lat
=
(
min_lat
*
8
)
/
1000
.
0
;
overflow
=
WR_STREAMERS_SSCR1_RX_LATENCY_ACC_OVERFLOW
&
iomemr32
(
wrstm
->
is_be
,
ptr
->
SSCR1
);
iomemr32
(
wrstm
->
is_be
,
ptr
->
SSCR1
);
//put it all together
acc_lat
=
((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT11
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT10
);
cnt_lat
=
((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT13
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT12
);
avg_lat
=
(((
double
)
acc_lat
)
*
8
/
1000
)
/
(
double
)
cnt_lat
;
fprintf
(
stderr
,
"
%s: min=%10g max=%10g avg =%10g
"
"(0x%
x, 0x%x, %lu=%u << 32 | %
u)*8/1000 us, "
"cnt =%
lu overflow =%d)
\n
"
,
stats_mesg
[
8
][
1
]
,
fprintf
(
stderr
,
"
Latency [us] : min=%10g max=%10g avg =%10g
\n
"
"(0x%
lx, 0x%lx, %"
PRIu64
"=%lu << 32 | %l
u)*8/1000 us, "
"cnt =%
"
PRIu64
" overflow =%d)
\n
"
,
min_lat
,
max_lat
,
avg_lat
,
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT1
),
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT0
),
acc_lat
,
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT11
),
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT10
),
(
unsigned
long
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT1
),
(
unsigned
long
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT0
),
acc_lat
,
(
unsigned
long
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT11
),
(
unsigned
long
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT10
),
cnt_lat
,
overflow
);
fprintf
(
stderr
,
"Frames [number]: tx =%"
PRIu64
" rx =%"
PRIu64
" "
"lost=%"
PRIu64
" (lost blocks =%"
PRIu64
")
\n
"
,
(
uint64_t
)(((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
TX_STAT3
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
TX_STAT2
)),
(
uint64_t
)(((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT5
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT4
)),
(
uint64_t
)(((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT7
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT6
)),
(
uint64_t
)(((
uint64_t
)
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT9
)
<<
32
)
|
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_STAT8
)));
break
;
}
//release snapshot
...
...
@@ -161,6 +178,17 @@ int read_stats(struct cmd_desc *cmdd, struct atom *atoms)
return
1
;
}
int
support_from_version
(
uint32_t
sw_reg_map_version
)
{
if
(
sw_reg_map_version
>
gw_reg_map_version
)
{
fprintf
(
stderr
,
"
\n
Function not supported in gateware
\n
"
"(support from version=%d, you interface version=%d)
\n\n
"
,
sw_reg_map_version
,
gw_reg_map_version
);
return
-
1
;
}
return
0
;
}
int
read_reset_time
(
struct
cmd_desc
*
cmdd
,
struct
atom
*
atoms
)
{
...
...
@@ -227,6 +255,9 @@ int reset_seqid(struct cmd_desc *cmdd, struct atom *atoms)
int
hdl_sw_reset
(
struct
cmd_desc
*
cmdd
,
struct
atom
*
atoms
)
{
if
(
support_from_version
(
/*supported as of gw version:*/
2
))
return
0
;
volatile
struct
WR_STREAMERS_WB
*
ptr
=
(
volatile
struct
WR_STREAMERS_WB
*
)
wrstm
->
base
;
...
...
@@ -291,7 +322,7 @@ int get_set_tx_local_mac(struct cmd_desc *cmdd, struct atom *atoms)
lsw
=
iomemr32
(
wrstm
->
is_be
,
ptr
->
TX_CFG1
);
msw
=
iomemr32
(
wrstm
->
is_be
,
ptr
->
TX_CFG2
);
val
=
lsw
|
(
msw
<<
32
);
fprintf
(
stderr
,
"TX Local MAC address 0x%
lx
\n
"
,
val
);
fprintf
(
stderr
,
"TX Local MAC address 0x%
"
PRIx64
"
\n
"
,
val
);
return
1
;
}
...
...
@@ -320,7 +351,7 @@ int get_set_tx_remote_mac(struct cmd_desc *cmdd, struct atom *atoms)
lsw
=
iomemr32
(
wrstm
->
is_be
,
ptr
->
TX_CFG3
);
msw
=
iomemr32
(
wrstm
->
is_be
,
ptr
->
TX_CFG4
);
val
=
lsw
|
(
msw
<<
32
);
fprintf
(
stderr
,
"TX Target MAC address 0x%
lx
\n
"
,
val
);
fprintf
(
stderr
,
"TX Target MAC address 0x%
"
PRIx64
"
\n
"
,
val
);
return
1
;
}
...
...
@@ -375,7 +406,7 @@ int get_set_rx_local_mac(struct cmd_desc *cmdd, struct atom *atoms)
lsw
=
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_CFG1
);
msw
=
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_CFG2
);
val
=
lsw
|
(
msw
<<
32
);
fprintf
(
stderr
,
"RX Local MAC address 0x%
lx
\n
"
,
val
);
fprintf
(
stderr
,
"RX Local MAC address 0x%
"
PRIx64
"
\n
"
,
val
);
return
1
;
}
...
...
@@ -404,7 +435,7 @@ int get_set_rx_remote_mac(struct cmd_desc *cmdd, struct atom *atoms)
lsw
=
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_CFG3
);
msw
=
iomemr32
(
wrstm
->
is_be
,
ptr
->
RX_CFG4
);
val
=
lsw
|
(
msw
<<
32
);
fprintf
(
stderr
,
"RX Target MAC address 0x%
lx
\n
"
,
val
);
fprintf
(
stderr
,
"RX Target MAC address 0x%
"
PRIx64
"
\n
"
,
val
);
return
1
;
}
...
...
@@ -458,6 +489,9 @@ int get_set_latency(struct cmd_desc *cmdd, struct atom *atoms)
int
get_latency_stats
(
struct
cmd_desc
*
cmdd
,
struct
atom
*
atoms
)
{
if
(
support_from_version
(
/*supported as of gw version:*/
2
))
return
0
;
volatile
struct
WR_STREAMERS_WB
*
ptr
=
(
volatile
struct
WR_STREAMERS_WB
*
)
wrstm
->
base
;
...
...
@@ -488,6 +522,9 @@ int get_latency_stats(struct cmd_desc *cmdd, struct atom *atoms)
int
get_set_latency_timeout
(
struct
cmd_desc
*
cmdd
,
struct
atom
*
atoms
)
{
if
(
support_from_version
(
/*supported as of gw version:*/
2
))
return
0
;
volatile
struct
WR_STREAMERS_WB
*
ptr
=
(
volatile
struct
WR_STREAMERS_WB
*
)
wrstm
->
base
;
int
lat
;
...
...
@@ -567,7 +604,7 @@ int get_set_qtags_param(struct cmd_desc *cmdd, struct atom *atoms)
volatile
struct
WR_STREAMERS_WB
*
ptr
=
(
volatile
struct
WR_STREAMERS_WB
*
)
wrstm
->
base
;
int
argc
;
uint32_t
vid
,
prio
,
txcfg5
,
cfg
;
uint32_t
vid
,
prio
,
txcfg5
,
cfg
,
ena
=
0
;
if
(
atoms
==
(
struct
atom
*
)
VERBOSE_HELP
)
{
printf
(
"%s - %s
\n
"
,
cmdd
->
name
,
cmdd
->
help
);
...
...
@@ -576,14 +613,7 @@ int get_set_qtags_param(struct cmd_desc *cmdd, struct atom *atoms)
++
atoms
;
txcfg5
=
iomemr32
(
wrstm
->
is_be
,
ptr
->
TX_CFG5
);
if
(
atoms
->
type
==
Terminator
)
{
//read current flag
vid
=
(
txcfg5
&
WR_STREAMERS_TX_CFG5_QTAG_VID_MASK
)
>>
WR_STREAMERS_TX_CFG5_QTAG_VID_SHIFT
;
prio
=
(
txcfg5
&
WR_STREAMERS_TX_CFG5_QTAG_PRIO_MASK
)
>>
WR_STREAMERS_TX_CFG5_QTAG_PRIO_SHIFT
;
}
else
{
// writing new QTag settings
if
(
atoms
->
type
!=
Terminator
)
{
// writing new QTag settings
argc
=
0
;
//count provided arguments
if
(
atoms
->
type
!=
Numeric
)
return
-
TST_ERR_WRONG_ARG
;
...
...
@@ -611,8 +641,16 @@ int get_set_qtags_param(struct cmd_desc *cmdd, struct atom *atoms)
cfg
=
iomemr32
(
wrstm
->
is_be
,
ptr
->
CFG
);
cfg
|=
WR_STREAMERS_CFG_OR_TX_QTAG
;
ptr
->
CFG
=
iomemw32
(
wrstm
->
is_be
,
cfg
);
ena
=
1
;
}
fprintf
(
stderr
,
"Tagging with QTag: VLAN ID: %d prio: %d
\n
"
,
ena
=
txcfg5
&
WR_STREAMERS_TX_CFG5_QTAG_ENA
;
vid
=
(
txcfg5
&
WR_STREAMERS_TX_CFG5_QTAG_VID_MASK
)
>>
WR_STREAMERS_TX_CFG5_QTAG_VID_SHIFT
;
prio
=
(
txcfg5
&
WR_STREAMERS_TX_CFG5_QTAG_PRIO_MASK
)
>>
WR_STREAMERS_TX_CFG5_QTAG_PRIO_SHIFT
;
fprintf
(
stderr
,
"Tagging with QTag: %s
\n
"
,(
ena
)
?
"Enabled"
:
"Disabled"
);
fprintf
(
stderr
,
"Tagging settings : VLAN ID= %d prio= %d
\n
"
,
vid
,
prio
);
return
1
;
}
...
...
@@ -791,14 +829,28 @@ static int verify_reg_version()
{
volatile
struct
WR_STREAMERS_WB
*
ptr
=
(
volatile
struct
WR_STREAMERS_WB
*
)
wrstm
->
base
;
uint32_t
ver
=
0
;
ver
=
iomemr32
(
wrstm
->
is_be
,
ptr
->
VER
);
gw_reg_map_version
=
iomemr32
(
wrstm
->
is_be
,
ptr
->
VER
);
fprintf
(
stderr
,
"Wishbone register version: in FPGA = 0x%x |"
" in SW = 0x%x
\n
"
,
ver
,
WBGEN2_WR_STREAMERS_VERSION
);
if
(
ver
!=
WBGEN2_WR_STREAMERS_VERSION
)
return
-
1
;
else
return
0
;
" in SW = 0x%x
\n
"
,
gw_reg_map_version
,
WBGEN2_WR_STREAMERS_VERSION
);
if
(
gw_reg_map_version
==
WBGEN2_WR_STREAMERS_VERSION
)
return
GW_REG_VER_OK
;
else
if
(
gw_reg_map_version
==
0xffffffff
||
gw_reg_map_version
==
0x0
){
fprintf
(
stderr
,
"
\n\n
Wrong reading of version register, exiting ...
\n\n
"
);
return
GW_REG_VER_ERROR
;
}
else
{
fprintf
(
stderr
,
"
\n
"
);
fprintf
(
stderr
,
"============== !!! WARNING !!! ===============
\n
"
);
fprintf
(
stderr
,
" Register version in FPGA and SW do not match
\n
"
);
if
(
gw_reg_map_version
<
WBGEN2_WR_STREAMERS_VERSION
)
fprintf
(
stderr
,
" This software is the newer than the bitstream
\n
"
);
if
(
gw_reg_map_version
>
WBGEN2_WR_STREAMERS_VERSION
)
fprintf
(
stderr
,
" This software is older than the bitstream
\n
"
);
fprintf
(
stderr
,
" Some commands may not be supported
\n
"
);
fprintf
(
stderr
,
"============== !!! WARNING !!! ===============
\n\n
"
);
return
GW_REG_VER_DIFFERENT
;
}
}
int
main
(
int
argc
,
char
*
argv
[])
...
...
@@ -821,12 +873,8 @@ int main(int argc, char *argv[])
}
ret
=
verify_reg_version
();
if
(
ret
)
{
fprintf
(
stderr
,
"============== !!! WARNING !!! ===============
\n
"
);
fprintf
(
stderr
,
"Register version in FPGA and SW does not match
\n
"
);
fprintf
(
stderr
,
" Using SW at your own risk
\n
"
);
fprintf
(
stderr
,
"============== !!! WARNING !!! ===============
\n
"
);
}
if
(
ret
==
GW_REG_VER_ERROR
)
//something is wrong if incorrection version value
return
-
1
;
ret
=
extest_register_user_cmd
(
wrstm_cmd
,
WRSTM_CMD_NB
);
if
(
ret
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment