Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cores/hyperbus: Fix bytes order on register writes.

This commit is contained in:
Florent Kermarrec 2024-04-12 16:06:26 +02:00
parent fb519ac260
commit b192103822
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
litex/soc/cores/hyperbus.py
View File

@ -44,6 +44,9 @@ class HyperRAM(LiteXModule):
self.reg_write_data = Signal(16) self.reg_write_data = Signal(16)
self.reg_read_data = Signal(16) self.reg_read_data = Signal(16)
if with_csr:
self.add_csr()
self.reg_debug = CSRStatus(32) self.reg_debug = CSRStatus(32)
# # # # # #
@ -211,7 +214,7 @@ class HyperRAM(LiteXModule):
# Wait for 6*2 cycles... # Wait for 6*2 cycles...
If(cycles == (6*2 - 1), If(cycles == (6*2 - 1),
If(reg_write_req, If(reg_write_req,
NextValue(sr, Cat(Signal(40), self.reg_write_data[:8])), NextValue(sr, Cat(Signal(40), self.reg_write_data[8:])),
NextState("REG-WRITE-0") NextState("REG-WRITE-0")
).Else( ).Else(
NextState("WAIT-LATENCY") NextState("WAIT-LATENCY")
@ -226,7 +229,7 @@ class HyperRAM(LiteXModule):
dq.oe.eq(1), dq.oe.eq(1),
# Wait for 2 cycles... # Wait for 2 cycles...
If(cycles == (2 - 1), If(cycles == (2 - 1),
NextValue(sr, Cat(Signal(40), self.reg_write_data[8:])), NextValue(sr, Cat(Signal(40), self.reg_write_data[:8])),
NextState("REG-WRITE-1") NextState("REG-WRITE-1")
) )
) )
@ -315,7 +318,7 @@ class HyperRAM(LiteXModule):
self.reg_control = CSRStorage(fields=[ self.reg_control = CSRStorage(fields=[
CSRField("write", offset=0, size=1, pulse=True, description="Issue Register Write."), CSRField("write", offset=0, size=1, pulse=True, description="Issue Register Write."),
CSRField("read", offset=1, size=1, pulse=True, description="Issue Register Read."), CSRField("read", offset=1, size=1, pulse=True, description="Issue Register Read."),
CSRField("reg", offset=8, size=4, values=[ CSRField("addr", offset=8, size=4, values=[
("``0``", "Identification Register 0 (Read Only)."), ("``0``", "Identification Register 0 (Read Only)."),
("``1``", "Identification Register 1 (Read Only)."), ("``1``", "Identification Register 1 (Read Only)."),
("``2``", "Configuration Register 0."), ("``2``", "Configuration Register 0."),

2
test/test_hyperbus.py
View File

@ -103,7 +103,7 @@ class TestHyperBus(unittest.TestCase):
clk = "___--__--__--__--___________" clk = "___--__--__--__--___________"
cs_n = "--________________----------" cs_n = "--________________----------"
dq_oe = "__----------------__________" dq_oe = "__----------------__________"
dq_o = "0060000100000034120000000000" dq_o = "0060000100000012340000000000"
rwds_oe = "____________________________" rwds_oe = "____________________________"
rwds_o = "____________________________" rwds_o = "____________________________"
for i in range(3): for i in range(3):