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

cores/hyperbus: Simplify reg_write/read_done.

This commit is contained in:
Florent Kermarrec 2024-04-15 14:43:15 +02:00
parent 8e48d0d330
commit 1597791fb6
2 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,42 +122,34 @@ class HyperRAM(LiteXModule):
] ]
# Register Access/Buffer ------------------------------------------------------------------- # Register Access/Buffer -------------------------------------------------------------------
reg_write_req = Signal()
reg_write_req = Signal() reg_read_req = Signal()
reg_write_done = Signal() self.reg_buf = reg_buf = stream.SyncFIFO(
reg_read_req = Signal()
reg_read_done = Signal()
self.reg_buffer = reg_buffer = stream.SyncFIFO(
layout = [("write", 1), ("read", 1), ("addr", 4), ("data", 16)], layout = [("write", 1), ("read", 1), ("addr", 4), ("data", 16)],
depth = 4, depth = 4,
) )
self.comb += [ self.comb += [
reg_buffer.sink.valid.eq(self.reg_write | self.reg_read), reg_buf.sink.valid.eq(self.reg_write | self.reg_read),
reg_buffer.sink.write.eq(self.reg_write), reg_buf.sink.write.eq(self.reg_write),
reg_buffer.sink.read.eq(self.reg_read), reg_buf.sink.read.eq(self.reg_read),
reg_buffer.sink.addr.eq(self.reg_addr), reg_buf.sink.addr.eq(self.reg_addr),
reg_buffer.sink.data.eq(self.reg_write_data), reg_buf.sink.data.eq(self.reg_write_data),
reg_write_req.eq(reg_buffer.source.valid & reg_buffer.source.write), reg_write_req.eq(reg_buf.source.valid & reg_buf.source.write),
reg_read_req.eq( reg_buffer.source.valid & reg_buffer.source.read), reg_read_req.eq( reg_buf.source.valid & reg_buf.source.read),
] ]
self.sync += If(reg_buffer.sink.valid, self.sync += If(reg_buf.sink.valid,
reg_write_done.eq(0), self.reg_write_done.eq(0),
reg_read_done.eq(0), self.reg_read_done.eq(0),
) )
self.comb += [
self.reg_write_done.eq(reg_write_done),
self.reg_read_done.eq(reg_read_done),
]
# Command generation ----------------------------------------------------------------------- # Command generation -----------------------------------------------------------------------
ashift = {8:1, 16:0}[dw] ashift = {8:1, 16:0}[dw]
self.comb += [ self.comb += [
If(reg_write_req | reg_read_req, If(reg_write_req | reg_read_req,
ca[47].eq(reg_buffer.source.read), # R/W# ca[47].eq(reg_buf.source.read), # R/W#
ca[46].eq(1), # Register Space. ca[46].eq(1), # Register Space.
ca[45].eq(1), # Burst Type (Linear) ca[45].eq(1), # Burst Type (Linear)
Case(reg_buffer.source.addr, { Case(reg_buf.source.addr, {
0 : ca[0:40].eq(0x00_00_00_00_00), # Identification Register 0 (Read Only). 0 : ca[0:40].eq(0x00_00_00_00_00), # Identification Register 0 (Read Only).
1 : ca[0:40].eq(0x00_00_00_00_01), # Identification Register 1 (Read Only). 1 : ca[0:40].eq(0x00_00_00_00_01), # Identification Register 1 (Read Only).
2 : ca[0:40].eq(0x00_01_00_00_00), # Configuration Register 0. 2 : ca[0:40].eq(0x00_01_00_00_00), # Configuration Register 0.
@ -238,8 +230,8 @@ 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),
reg_buffer.source.ready.eq(1), reg_buf.source.ready.eq(1),
NextValue(reg_write_done, 1), NextValue(self.reg_write_done, 1),
NextState("IDLE") NextState("IDLE")
) )
) )
@ -293,8 +285,8 @@ class HyperRAM(LiteXModule):
# Read Ack (when dat_r ready). # Read Ack (when dat_r ready).
If((n == 0) & ~first, If((n == 0) & ~first,
If(reg_read_req, If(reg_read_req,
reg_buffer.source.ready.eq(1), reg_buf.source.ready.eq(1),
NextValue(reg_read_done, 1), NextValue(self.reg_read_done, 1),
NextValue(self.reg_read_data, bus.dat_r), NextValue(self.reg_read_data, bus.dat_r),
NextState("IDLE"), NextState("IDLE"),
).Else( ).Else(

12
litex/soc/software/bios/main.c
View File

@ -179,7 +179,7 @@ __attribute__((__used__)) int main(int i, char **c)
/* HyperRAM Configuration */ /* HyperRAM Configuration */
uint16_t config_reg_0; uint16_t config_reg_0;
hyperram_latency_write(7); hyperram_config_write(7 << CSR_HYPERRAM_CONFIG_LATENCY_OFFSET);
hyperram_reg_control_write( hyperram_reg_control_write(
0 << CSR_HYPERRAM_REG_CONTROL_WRITE_OFFSET | 0 << CSR_HYPERRAM_REG_CONTROL_WRITE_OFFSET |
1 << CSR_HYPERRAM_REG_CONTROL_READ_OFFSET | 1 << CSR_HYPERRAM_REG_CONTROL_READ_OFFSET |
@ -203,11 +203,11 @@ __attribute__((__used__)) int main(int i, char **c)
2 << CSR_HYPERRAM_REG_CONTROL_ADDR_OFFSET 2 << CSR_HYPERRAM_REG_CONTROL_ADDR_OFFSET
); );
while ((hyperram_reg_status_read() & (1 << CSR_HYPERRAM_REG_STATUS_WRITE_DONE_OFFSET)) == 0); while ((hyperram_reg_status_read() & (1 << CSR_HYPERRAM_REG_STATUS_WRITE_DONE_OFFSET)) == 0);
//hyperram_latency_write(7); //hyperram_config_write(7 << CSR_HYPERRAM_CONFIG_LATENCY_OFFSET);
//hyperram_latency_write(6); //hyperram_config_write(6 << CSR_HYPERRAM_CONFIG_LATENCY_OFFSET);
//hyperram_latency_write(5); //hyperram_config_write(5 << CSR_HYPERRAM_CONFIG_LATENCY_OFFSET);
//hyperram_latency_write(4); //hyperram_config_write(4 << CSR_HYPERRAM_CONFIG_LATENCY_OFFSET);
hyperram_latency_write(3); hyperram_config_write(3 << CSR_HYPERRAM_CONFIG_LATENCY_OFFSET);
hyperram_reg_control_write( hyperram_reg_control_write(
0 << CSR_HYPERRAM_REG_CONTROL_WRITE_OFFSET | 0 << CSR_HYPERRAM_REG_CONTROL_WRITE_OFFSET |
1 << CSR_HYPERRAM_REG_CONTROL_READ_OFFSET | 1 << CSR_HYPERRAM_REG_CONTROL_READ_OFFSET |