Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
x393
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
x393
Commits
9b16ac66
Commit
9b16ac66
authored
May 04, 2015
by
Andrey Filippov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debugging qith hardware
parent
cd414e1d
Changes
8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
135 additions
and
142 deletions
+135
-142
x393_axi_control_status.py
py393/x393_axi_control_status.py
+6
-7
x393_mcntrl_adjust.py
py393/x393_mcntrl_adjust.py
+10
-3
x393_mcntrl_buffers.py
py393/x393_mcntrl_buffers.py
+0
-4
x393_mcntrl_membridge.py
py393/x393_mcntrl_membridge.py
+69
-29
x393_mcntrl_tests.py
py393/x393_mcntrl_tests.py
+24
-92
x393_pio_sequences.py
py393/x393_pio_sequences.py
+23
-4
x393_utils.py
py393/x393_utils.py
+1
-1
x393_testbench01.tf
x393_testbench01.tf
+2
-2
No files found.
py393/x393_axi_control_status.py
View file @
9b16ac66
...
...
@@ -32,7 +32,6 @@ __status__ = "Development"
#import x393_mem
#from import_verilog_parameters import VerilogParameters
from
x393_mem
import
X393Mem
#from verilog_utils import hx,concat, bits
from
verilog_utils
import
hx
from
time
import
time
import
vrlg
...
...
@@ -356,7 +355,7 @@ class X393AxiControlStatus(object):
"""
global
mcntrl_en
en
=
(
0
,
1
)[
en
]
if
self
.
verbose
>
0
:
if
self
.
verbose
>
-
10
:
#
0:
print
(
"ENABLE MEMCTRL
%
s"
%
str
(
en
))
self
.
write_contol_register
(
vrlg
.
MCONTR_TOP_0BIT_ADDR
+
vrlg
.
MCONTR_TOP_0BIT_MCONTR_EN
+
en
,
0
);
mcntrl_en
=
en
...
...
@@ -369,8 +368,8 @@ class X393AxiControlStatus(object):
global
enabled_channels
enabled_channels
=
chnen
# currently enabled memory channels
self
.
write_contol_register
(
vrlg
.
MCONTR_TOP_16BIT_ADDR
+
vrlg
.
MCONTR_TOP_16BIT_CHN_EN
,
enabled_channels
&
0xffff
)
# {16'b0,chnen});
if
self
.
verbose
>
0
:
print
(
"ENABLED MEMCTRL CHANNELS 0x
%
x (word)
"
%
enabled_channels
)
if
self
.
verbose
>
-
10
:
#
0:
print
(
"ENABLED MEMCTRL CHANNELS 0x
%
x (word)
, chnen=0x
%
x"
%
(
enabled_channels
,
chnen
)
)
def
enable_memcntrl_en_dis
(
self
,
chn
,
# input [3:0] chn;
...
...
@@ -385,8 +384,8 @@ class X393AxiControlStatus(object):
enabled_channels
|=
1
<<
chn
;
else
:
enabled_channels
&=
~
(
1
<<
chn
);
self
.
write_contol_register
(
vrlg
.
MCONTR_TOP_16BIT_ADDR
+
self
.
MCONTR_TOP_16BIT_CHN_EN
,
enabled_channels
&
0xffff
)
# {16'b0,ENABLED_CHANNELS});
if
self
.
verbose
>
0
:
self
.
write_contol_register
(
vrlg
.
MCONTR_TOP_16BIT_ADDR
+
vrlg
.
MCONTR_TOP_16BIT_CHN_EN
,
enabled_channels
&
0xffff
)
# {16'b0,ENABLED_CHANNELS});
if
self
.
verbose
>
-
10
:
#
0:
print
(
"ENABLED MEMCTRL CHANNELS 0x
%
x (en/dis)"
%
enabled_channels
)
def
configure_channel_priority
(
self
,
...
...
@@ -399,7 +398,7 @@ class X393AxiControlStatus(object):
"""
global
channel_priority
self
.
write_contol_register
(
vrlg
.
MCONTR_ARBIT_ADDR
+
chn
,
priority
&
0xffff
)
# {16'b0,priority});
if
self
.
verbose
>
0
:
if
self
.
verbose
>
-
1
:
#
0:
print
(
"SET CHANNEL
%
d priority=0x
%
x"
%
(
chn
,
priority
))
channel_priority
[
chn
]
=
priority
py393/x393_mcntrl_adjust.py
View file @
9b16ac66
...
...
@@ -4996,7 +4996,7 @@ write_settings= {
def
measure_all
(
self
,
tasks
=
"*
I
CWRPOASZB"
,
# "ICWRPOA", #"ICWRPOASZB",
tasks
=
"*
D
CWRPOASZB"
,
# "ICWRPOA", #"ICWRPOASZB",
prim_steps
=
1
,
primary_set_in
=
2
,
primary_set_out
=
2
,
...
...
@@ -5007,7 +5007,8 @@ write_settings= {
quiet
=
3
):
"""
@param tasks - "*" - load bitfile
"I" - initialize memory, set defaults
"D" - set defaults
"I" - initialize memory, set refresh
"C" cmda, "W' - write levelling, "R" - read levelling (DQI-DQSI), "P" - dqs input phase (DQSI-PHASE),
"O" - output timing (DQ odelay vs DQS odelay), "A" - address/bank lines output delays, "Z" - print results,
"B" - select R/W brances and get the optimal phase
...
...
@@ -5056,11 +5057,17 @@ write_settings= {
'comment'
:
'Load bitfile, initialize FPGA'
,
'params'
:{
'bitfile'
:
bitfile_path
,
'quiet'
:
quiet
+
1
}},
{
'key'
:
'
I
'
,
{
'key'
:
'
D
'
,
'func'
:
self
.
x393_pio_sequences
.
task_set_up
,
'comment'
:
'Initial setup - memory controller, sequences'
,
'params'
:{
'dqs_pattern'
:
dqs_pattern
,
'quiet'
:
quiet
+
1
}},
{
'key'
:
'I'
,
# Used when no calibration is needed - "*DI"
'func'
:
self
.
x393_pio_sequences
.
init_ddr3
,
'comment'
:
'Initialize memory, turn on refresh (used when no calibration is needed)'
,
'params'
:{
'refresh'
:
True
,
'wait_complete'
:
True
,
'quiet'
:
quiet
+
1
}},
{
'key'
:
'C'
,
'func'
:
self
.
adjust_cmda_odelay
,
'comment'
:
'Measuring CMDA output delay for each clock phase'
,
...
...
py393/x393_mcntrl_buffers.py
View file @
9b16ac66
...
...
@@ -35,10 +35,6 @@ __status__ = "Development"
from
x393_mem
import
X393Mem
#from x393_axi_control_status import X393AxiControlStatus
import
x393_axi_control_status
#from verilog_utils import * # concat, bits
#from verilog_utils import hx, concat, bits, getParWidth
#from verilog_utils import concat, getParWidth
#from x393_axi_control_status import concat, bits
from
verilog_utils
import
convert_w32_to_mem16
#,convert_mem16_to_w32
import
vrlg
...
...
py393/x393_mcntrl_membridge.py
View file @
9b16ac66
This diff is collapsed.
Click to expand it.
py393/x393_mcntrl_tests.py
View file @
9b16ac66
This diff is collapsed.
Click to expand it.
py393/x393_pio_sequences.py
View file @
9b16ac66
...
...
@@ -1235,6 +1235,25 @@ class X393PIOSequences(object):
wait_complete
)
# `PS_PIO_WAIT_COMPLETE ) # wait_complete; # Do not request a newe transaction from the scheduler until previous memory transaction is finished
self
.
wait_ps_pio_done
(
vrlg
.
DEFAULT_STATUS_MODE
,
1
)
# wait previous memory transaction finished before changing delays (effective immediately)
def
init_ddr3
(
self
,
refresh
=
1
,
wait_complete
=
True
,
quiet
=
1
):
"""
Enable address/command pins, remove SDRST, enable CKE,
Setup PS PIO
Set DDR3 MR0..MR3 registers
Optionally enable refresh
@param refresh - enable refresh
@param wait_complete Do not request a new transaction from the scheduler until previous memory transaction is finished
@param quiet reduce output
"""
self
.
restart_ddr3
(
wait_complete
,
quiet
)
self
.
x393_axi_tasks
.
enable_refresh
(
refresh
)
def
restart_ddr3
(
self
,
wait_complete
=
True
,
quiet
=
1
):
...
...
@@ -1242,8 +1261,8 @@ class X393PIOSequences(object):
Activate SDRST, enable address/command pins, remove SDRST, enable CKE,
Setup PS PIO
Set DDR3 MR0..MR3 registers
<wait_complete>
Do not request a new transaction from the scheduler until previous memory transaction is finished
<quiet>
reduce output
@param wait_complete
Do not request a new transaction from the scheduler until previous memory transaction is finished
@param quiet
reduce output
"""
# enable output for address/commands to DDR chip
self
.
x393_axi_tasks
.
enable_cmda
(
1
)
...
...
@@ -1254,9 +1273,9 @@ class X393PIOSequences(object):
sleep
(
0.001
)
# actually 500 usec required
self
.
x393_axi_tasks
.
enable_cke
(
1
);
self
.
x393_axi_tasks
.
enable_memcntrl_channels
(
0x
3
)
# only channel 0 and 1 are enabled
self
.
x393_axi_tasks
.
enable_memcntrl_channels
(
0x
1
)
# only channel 0 and 1 are enabled
self
.
x393_axi_tasks
.
configure_channel_priority
(
0
,
0
)
# lowest priority channel 0
self
.
x393_axi_tasks
.
configure_channel_priority
(
1
,
0
)
# lowest priority channel 1
#
self.x393_axi_tasks.configure_channel_priority(1,0) # lowest priority channel 1
self
.
enable_reset_ps_pio
(
1
,
0
)
# enable, no reset
# set MR registers in DDR3 memory, run DCI calibration (long)
...
...
py393/x393_utils.py
View file @
9b16ac66
...
...
@@ -51,7 +51,7 @@ class X393Utils(object):
DEBUG_MODE
=
1
# vpars=None
x393_mem
=
None
enabled_channels
=
0
# currently enable channels
enabled_channels
=
0
# currently enable
d
channels
saveFileName
=
None
x393_axi_tasks
=
None
# verbose=1
...
...
x393_testbench01.tf
View file @
9b16ac66
...
...
@@ -580,8 +580,8 @@ always #(CLKIN_PERIOD/2) CLK = ~CLK;
end
// protect from never end
initial begin
//
#200000;
#50000;
#200000;
//
#50000;
$
display("finish testbench 2");
$
finish;
end
...
...
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