Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fpga-network-stack
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
paulrr2
fpga-network-stack
Commits
967d71f7
Commit
967d71f7
authored
5 years ago
by
David Sidler
Browse files
Options
Downloads
Patches
Plain Diff
fixin register slice for 256 & 128b
parent
ae014000
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hdl/common/network_stack.sv
+21
-189
21 additions, 189 deletions
hdl/common/network_stack.sv
hdl/common/register_slice_wrapper.sv
+82
-0
82 additions, 0 deletions
hdl/common/register_slice_wrapper.sv
with
103 additions
and
189 deletions
hdl/common/network_stack.sv
+
21
−
189
View file @
967d71f7
...
...
@@ -1587,222 +1587,54 @@ icmpv6_server_ip icmpv6_server_inst (
* Slices
*/
// ARP Input Slice
generate
if
(
WIDTH
==
64
)
begin
axis_register_slice_64
axis_register_arp_in_slice
(
register_slice_wrapper
#(.
WIDTH
(
WIDTH
))
axis_register_arp_in_slice
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_iph_to_arp_slice
.
valid
),
.
s_axis_tready
(
axis_iph_to_arp_slice
.
ready
),
.
s_axis_tdata
(
axis_iph_to_arp_slice
.
data
),
.
s_axis_tkeep
(
axis_iph_to_arp_slice
.
keep
),
.
s_axis_tlast
(
axis_iph_to_arp_slice
.
last
),
.
m_axis_tvalid
(
axis_arp_slice_to_arp
.
valid
),
.
m_axis_tready
(
axis_arp_slice_to_arp
.
ready
),
.
m_axis_tdata
(
axis_arp_slice_to_arp
.
data
),
.
m_axis_tkeep
(
axis_arp_slice_to_arp
.
keep
),
.
m_axis_tlast
(
axis_arp_slice_to_arp
.
last
)
.
s_axis
(
axis_iph_to_arp_slice
),
.
m_axis
(
axis_arp_slice_to_arp
)
);
// ICMP Input Slice
axis_
register_slice_
64
axis_register_icmp_in_slice
(
register_slice_
wrapper
#(.
WIDTH
(
WIDTH
))
axis_register_icmp_in_slice
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_iph_to_icmp_slice
.
valid
),
.
s_axis_tready
(
axis_iph_to_icmp_slice
.
ready
),
.
s_axis_tdata
(
axis_iph_to_icmp_slice
.
data
),
.
s_axis_tkeep
(
axis_iph_to_icmp_slice
.
keep
),
.
s_axis_tlast
(
axis_iph_to_icmp_slice
.
last
),
.
m_axis_tvalid
(
axis_icmp_slice_to_icmp
.
valid
),
.
m_axis_tready
(
axis_icmp_slice_to_icmp
.
ready
),
.
m_axis_tdata
(
axis_icmp_slice_to_icmp
.
data
),
.
m_axis_tkeep
(
axis_icmp_slice_to_icmp
.
keep
),
.
m_axis_tlast
(
axis_icmp_slice_to_icmp
.
last
)
.
s_axis
(
axis_iph_to_icmp_slice
),
.
m_axis
(
axis_icmp_slice_to_icmp
)
);
// UDP Input Slice
axis_
register_slice_
64
axis_register_upd_in_slice
(
register_slice_
wrapper
#(.
WIDTH
(
WIDTH
))
axis_register_upd_in_slice
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_iph_to_udp_slice
.
valid
),
.
s_axis_tready
(
axis_iph_to_udp_slice
.
ready
),
.
s_axis_tdata
(
axis_iph_to_udp_slice
.
data
),
.
s_axis_tkeep
(
axis_iph_to_udp_slice
.
keep
),
.
s_axis_tlast
(
axis_iph_to_udp_slice
.
last
),
.
m_axis_tvalid
(
axis_udp_slice_to_udp
.
valid
),
.
m_axis_tready
(
axis_udp_slice_to_udp
.
ready
),
.
m_axis_tdata
(
axis_udp_slice_to_udp
.
data
),
.
m_axis_tkeep
(
axis_udp_slice_to_udp
.
keep
),
.
m_axis_tlast
(
axis_udp_slice_to_udp
.
last
)
.
s_axis
(
axis_iph_to_udp_slice
),
.
m_axis
(
axis_udp_slice_to_udp
)
);
// UDP Output Slice
axis_
register_slice_
64
axis_register_upd_out_slice
(
register_slice_
wrapper
#(.
WIDTH
(
WIDTH
))
axis_register_upd_out_slice
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_udp_to_udp_slice
.
valid
),
.
s_axis_tready
(
axis_udp_to_udp_slice
.
ready
),
.
s_axis_tdata
(
axis_udp_to_udp_slice
.
data
),
.
s_axis_tkeep
(
axis_udp_to_udp_slice
.
keep
),
.
s_axis_tlast
(
axis_udp_to_udp_slice
.
last
),
.
m_axis_tvalid
(
axis_udp_slice_to_merge
.
valid
),
.
m_axis_tready
(
axis_udp_slice_to_merge
.
ready
),
.
m_axis_tdata
(
axis_udp_slice_to_merge
.
data
),
.
m_axis_tkeep
(
axis_udp_slice_to_merge
.
keep
),
.
m_axis_tlast
(
axis_udp_slice_to_merge
.
last
)
.
s_axis
(
axis_udp_to_udp_slice
),
.
m_axis
(
axis_udp_slice_to_merge
)
);
// TOE Input Slice
axis_
register_slice_
64
axis_register_toe_in_slice
(
register_slice_
wrapper
#(.
WIDTH
(
WIDTH
))
axis_register_toe_in_slice
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_iph_to_toe_slice
.
valid
),
.
s_axis_tready
(
axis_iph_to_toe_slice
.
ready
),
.
s_axis_tdata
(
axis_iph_to_toe_slice
.
data
),
.
s_axis_tkeep
(
axis_iph_to_toe_slice
.
keep
),
.
s_axis_tlast
(
axis_iph_to_toe_slice
.
last
),
.
m_axis_tvalid
(
axis_toe_slice_to_toe
.
valid
),
.
m_axis_tready
(
axis_toe_slice_to_toe
.
ready
),
.
m_axis_tdata
(
axis_toe_slice_to_toe
.
data
),
.
m_axis_tkeep
(
axis_toe_slice_to_toe
.
keep
),
.
m_axis_tlast
(
axis_toe_slice_to_toe
.
last
)
.
s_axis
(
axis_iph_to_toe_slice
),
.
m_axis
(
axis_toe_slice_to_toe
)
);
// ROCE Input Slice
axis_
register_slice_
64
axis_register_roce_in_slice
(
register_slice_
wrapper
#(.
WIDTH
(
WIDTH
))
axis_register_roce_in_slice
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_iph_to_roce_slice
.
valid
),
.
s_axis_tready
(
axis_iph_to_roce_slice
.
ready
),
.
s_axis_tdata
(
axis_iph_to_roce_slice
.
data
),
.
s_axis_tkeep
(
axis_iph_to_roce_slice
.
keep
),
.
s_axis_tlast
(
axis_iph_to_roce_slice
.
last
),
.
m_axis_tvalid
(
axis_roce_slice_to_roce
.
valid
),
.
m_axis_tready
(
axis_roce_slice_to_roce
.
ready
),
.
m_axis_tdata
(
axis_roce_slice_to_roce
.
data
),
.
m_axis_tkeep
(
axis_roce_slice_to_roce
.
keep
),
.
m_axis_tlast
(
axis_roce_slice_to_roce
.
last
)
.
s_axis
(
axis_iph_to_roce_slice
),
.
m_axis
(
axis_roce_slice_to_roce
)
);
// ROCE Output Slice
axis_
register_slice_
64
axis_register_roce_out_slice
(
register_slice_
wrapper
#(.
WIDTH
(
WIDTH
))
axis_register_roce_out_slice
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_roce_to_roce_slice
.
valid
),
.
s_axis_tready
(
axis_roce_to_roce_slice
.
ready
),
.
s_axis_tdata
(
axis_roce_to_roce_slice
.
data
),
.
s_axis_tkeep
(
axis_roce_to_roce_slice
.
keep
),
.
s_axis_tlast
(
axis_roce_to_roce_slice
.
last
),
.
m_axis_tvalid
(
axis_roce_slice_to_merge
.
valid
),
.
m_axis_tready
(
axis_roce_slice_to_merge
.
ready
),
.
m_axis_tdata
(
axis_roce_slice_to_merge
.
data
),
.
m_axis_tkeep
(
axis_roce_slice_to_merge
.
keep
),
.
m_axis_tlast
(
axis_roce_slice_to_merge
.
last
)
.
s_axis
(
axis_roce_to_roce_slice
),
.
m_axis
(
axis_roce_slice_to_merge
)
);
end
if
(
WIDTH
==
512
)
begin
axis_register_slice_512
axis_register_arp_in_slice
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_iph_to_arp_slice
.
valid
),
.
s_axis_tready
(
axis_iph_to_arp_slice
.
ready
),
.
s_axis_tdata
(
axis_iph_to_arp_slice
.
data
),
.
s_axis_tkeep
(
axis_iph_to_arp_slice
.
keep
),
.
s_axis_tlast
(
axis_iph_to_arp_slice
.
last
),
.
m_axis_tvalid
(
axis_arp_slice_to_arp
.
valid
),
.
m_axis_tready
(
axis_arp_slice_to_arp
.
ready
),
.
m_axis_tdata
(
axis_arp_slice_to_arp
.
data
),
.
m_axis_tkeep
(
axis_arp_slice_to_arp
.
keep
),
.
m_axis_tlast
(
axis_arp_slice_to_arp
.
last
)
);
// ICMP Input Slice
//axis_register_slice_512 axis_register_icmp_in_slice(
axis_512_to_64_converter
icmp_in_data_converter
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_iph_to_icmp_slice
.
valid
),
.
s_axis_tready
(
axis_iph_to_icmp_slice
.
ready
),
.
s_axis_tdata
(
axis_iph_to_icmp_slice
.
data
),
.
s_axis_tkeep
(
axis_iph_to_icmp_slice
.
keep
),
.
s_axis_tlast
(
axis_iph_to_icmp_slice
.
last
),
.
m_axis_tvalid
(
axis_icmp_slice_to_icmp
.
valid
),
.
m_axis_tready
(
axis_icmp_slice_to_icmp
.
ready
),
.
m_axis_tdata
(
axis_icmp_slice_to_icmp
.
data
),
.
m_axis_tkeep
(
axis_icmp_slice_to_icmp
.
keep
),
.
m_axis_tlast
(
axis_icmp_slice_to_icmp
.
last
)
);
// UDP Input Slice
axis_register_slice_512
axis_register_upd_in_slice
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_iph_to_udp_slice
.
valid
),
.
s_axis_tready
(
axis_iph_to_udp_slice
.
ready
),
.
s_axis_tdata
(
axis_iph_to_udp_slice
.
data
),
.
s_axis_tkeep
(
axis_iph_to_udp_slice
.
keep
),
.
s_axis_tlast
(
axis_iph_to_udp_slice
.
last
),
.
m_axis_tvalid
(
axis_udp_slice_to_udp
.
valid
),
.
m_axis_tready
(
axis_udp_slice_to_udp
.
ready
),
.
m_axis_tdata
(
axis_udp_slice_to_udp
.
data
),
.
m_axis_tkeep
(
axis_udp_slice_to_udp
.
keep
),
.
m_axis_tlast
(
axis_udp_slice_to_udp
.
last
)
);
// UDP Output Slice
axis_register_slice_512
axis_register_upd_out_slice
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_udp_to_udp_slice
.
valid
),
.
s_axis_tready
(
axis_udp_to_udp_slice
.
ready
),
.
s_axis_tdata
(
axis_udp_to_udp_slice
.
data
),
.
s_axis_tkeep
(
axis_udp_to_udp_slice
.
keep
),
.
s_axis_tlast
(
axis_udp_to_udp_slice
.
last
),
.
m_axis_tvalid
(
axis_udp_slice_to_merge
.
valid
),
.
m_axis_tready
(
axis_udp_slice_to_merge
.
ready
),
.
m_axis_tdata
(
axis_udp_slice_to_merge
.
data
),
.
m_axis_tkeep
(
axis_udp_slice_to_merge
.
keep
),
.
m_axis_tlast
(
axis_udp_slice_to_merge
.
last
)
);
// TOE Input Slice
axis_register_slice_512
axis_register_toe_in_slice
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_iph_to_toe_slice
.
valid
),
.
s_axis_tready
(
axis_iph_to_toe_slice
.
ready
),
.
s_axis_tdata
(
axis_iph_to_toe_slice
.
data
),
.
s_axis_tkeep
(
axis_iph_to_toe_slice
.
keep
),
.
s_axis_tlast
(
axis_iph_to_toe_slice
.
last
),
.
m_axis_tvalid
(
axis_toe_slice_to_toe
.
valid
),
.
m_axis_tready
(
axis_toe_slice_to_toe
.
ready
),
.
m_axis_tdata
(
axis_toe_slice_to_toe
.
data
),
.
m_axis_tkeep
(
axis_toe_slice_to_toe
.
keep
),
.
m_axis_tlast
(
axis_toe_slice_to_toe
.
last
)
);
// ROCE Input Slice
axis_register_slice_512
axis_register_roce_in_slice
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_iph_to_roce_slice
.
valid
),
.
s_axis_tready
(
axis_iph_to_roce_slice
.
ready
),
.
s_axis_tdata
(
axis_iph_to_roce_slice
.
data
),
.
s_axis_tkeep
(
axis_iph_to_roce_slice
.
keep
),
.
s_axis_tlast
(
axis_iph_to_roce_slice
.
last
),
.
m_axis_tvalid
(
axis_roce_slice_to_roce
.
valid
),
.
m_axis_tready
(
axis_roce_slice_to_roce
.
ready
),
.
m_axis_tdata
(
axis_roce_slice_to_roce
.
data
),
.
m_axis_tkeep
(
axis_roce_slice_to_roce
.
keep
),
.
m_axis_tlast
(
axis_roce_slice_to_roce
.
last
)
);
// ROCE Output Slice
axis_register_slice_512
axis_register_roce_out_slice
(
.
aclk
(
net_clk
),
.
aresetn
(
net_aresetn
),
.
s_axis_tvalid
(
axis_roce_to_roce_slice
.
valid
),
.
s_axis_tready
(
axis_roce_to_roce_slice
.
ready
),
.
s_axis_tdata
(
axis_roce_to_roce_slice
.
data
),
.
s_axis_tkeep
(
axis_roce_to_roce_slice
.
keep
),
.
s_axis_tlast
(
axis_roce_to_roce_slice
.
last
),
.
m_axis_tvalid
(
axis_roce_slice_to_merge
.
valid
),
.
m_axis_tready
(
axis_roce_slice_to_merge
.
ready
),
.
m_axis_tdata
(
axis_roce_slice_to_merge
.
data
),
.
m_axis_tkeep
(
axis_roce_slice_to_merge
.
keep
),
.
m_axis_tlast
(
axis_roce_slice_to_merge
.
last
)
);
end
endgenerate
/*
* Network Controller
...
...
This diff is collapsed.
Click to expand it.
hdl/common/register_slice_wrapper.sv
0 → 100644
+
82
−
0
View file @
967d71f7
`timescale
1
ns
/
1
ps
`default_nettype
none
module
register_slice_wrapper
#(
parameter
WIDTH
=
64
)
(
input
wire
aclk
,
input
wire
aresetn
,
axi_stream
.
slave
s_axis
,
axi_stream
.
master
m_axis
);
generate
if
(
WIDTH
==
64
)
begin
axis_register_slice_64
slice_inst
(
.
aclk
(
aclk
),
.
aresetn
(
aresetn
),
.
s_axis_tvalid
(
s_axis
.
valid
),
.
s_axis_tready
(
s_axis
.
ready
),
.
s_axis_tdata
(
s_axis
.
data
),
.
s_axis_tkeep
(
s_axis
.
keep
),
.
s_axis_tlast
(
s_axis
.
last
),
.
m_axis_tvalid
(
m_axis
.
valid
),
.
m_axis_tready
(
m_axis
.
ready
),
.
m_axis_tdata
(
m_axis
.
data
),
.
m_axis_tkeep
(
m_axis
.
keep
),
.
m_axis_tlast
(
m_axis
.
last
)
);
end
if
(
WIDTH
==
128
)
begin
axis_register_slice_128
slice_inst
(
.
aclk
(
aclk
),
.
aresetn
(
aresetn
),
.
s_axis_tvalid
(
s_axis
.
valid
),
.
s_axis_tready
(
s_axis
.
ready
),
.
s_axis_tdata
(
s_axis
.
data
),
.
s_axis_tkeep
(
s_axis
.
keep
),
.
s_axis_tlast
(
s_axis
.
last
),
.
m_axis_tvalid
(
m_axis
.
valid
),
.
m_axis_tready
(
m_axis
.
ready
),
.
m_axis_tdata
(
m_axis
.
data
),
.
m_axis_tkeep
(
m_axis
.
keep
),
.
m_axis_tlast
(
m_axis
.
last
)
);
end
if
(
WIDTH
==
256
)
begin
axis_register_slice_256
slice_inst
(
.
aclk
(
aclk
),
.
aresetn
(
aresetn
),
.
s_axis_tvalid
(
s_axis
.
valid
),
.
s_axis_tready
(
s_axis
.
ready
),
.
s_axis_tdata
(
s_axis
.
data
),
.
s_axis_tkeep
(
s_axis
.
keep
),
.
s_axis_tlast
(
s_axis
.
last
),
.
m_axis_tvalid
(
m_axis
.
valid
),
.
m_axis_tready
(
m_axis
.
ready
),
.
m_axis_tdata
(
m_axis
.
data
),
.
m_axis_tkeep
(
m_axis
.
keep
),
.
m_axis_tlast
(
m_axis
.
last
)
);
end
if
(
WIDTH
==
512
)
begin
axis_register_slice_512
slice_inst
(
.
aclk
(
aclk
),
.
aresetn
(
aresetn
),
.
s_axis_tvalid
(
s_axis
.
valid
),
.
s_axis_tready
(
s_axis
.
ready
),
.
s_axis_tdata
(
s_axis
.
data
),
.
s_axis_tkeep
(
s_axis
.
keep
),
.
s_axis_tlast
(
s_axis
.
last
),
.
m_axis_tvalid
(
m_axis
.
valid
),
.
m_axis_tready
(
m_axis
.
ready
),
.
m_axis_tdata
(
m_axis
.
data
),
.
m_axis_tkeep
(
m_axis
.
keep
),
.
m_axis_tlast
(
m_axis
.
last
)
);
end
endgenerate
endmodule
`default_nettype
wire
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
