cores/hyperbus: Add status register to report configured latency_mode to software and allow corresponding configuration.
This commit is contained in:
parent
576ab24b6c
commit
62b9c64212
|
@ -49,6 +49,7 @@ class HyperRAM(LiteXModule):
|
||||||
# ---------------------
|
# ---------------------
|
||||||
self.conf_rst = Signal()
|
self.conf_rst = Signal()
|
||||||
self.conf_latency = Signal(8, reset=latency)
|
self.conf_latency = Signal(8, reset=latency)
|
||||||
|
self.stat_latency_mode = Signal(reset={"fixed": 0, "variable": 1}[latency_mode])
|
||||||
self.reg_write = Signal()
|
self.reg_write = Signal()
|
||||||
self.reg_read = Signal()
|
self.reg_read = Signal()
|
||||||
self.reg_addr = Signal(2)
|
self.reg_addr = Signal(2)
|
||||||
|
@ -317,8 +318,8 @@ class HyperRAM(LiteXModule):
|
||||||
return t
|
return t
|
||||||
|
|
||||||
def add_csr(self, default_latency=6):
|
def add_csr(self, default_latency=6):
|
||||||
# Config Interface.
|
# Config/Status Interface.
|
||||||
# -----------------
|
# ------------------------
|
||||||
self.config = CSRStorage(fields=[
|
self.config = CSRStorage(fields=[
|
||||||
CSRField("rst", offset=0, size=1, pulse=True, description="HyperRAM Rst."),
|
CSRField("rst", offset=0, size=1, pulse=True, description="HyperRAM Rst."),
|
||||||
CSRField("latency", offset=8, size=8, description="HyperRAM Latency (X1).", reset=default_latency),
|
CSRField("latency", offset=8, size=8, description="HyperRAM Latency (X1).", reset=default_latency),
|
||||||
|
@ -327,6 +328,13 @@ class HyperRAM(LiteXModule):
|
||||||
self.conf_rst.eq( self.config.fields.rst),
|
self.conf_rst.eq( self.config.fields.rst),
|
||||||
self.conf_latency.eq(self.config.fields.latency),
|
self.conf_latency.eq(self.config.fields.latency),
|
||||||
]
|
]
|
||||||
|
self.status = CSRStatus(fields=[
|
||||||
|
CSRField("latency_mode", offset=0, size=1, values=[
|
||||||
|
("``0b0``", "Fixed Latency."),
|
||||||
|
("``0b1``", "Variable Latency."),
|
||||||
|
])
|
||||||
|
])
|
||||||
|
self.comb += self.status.fields.latency_mode.eq(self.stat_latency_mode)
|
||||||
|
|
||||||
# Reg Interface.
|
# Reg Interface.
|
||||||
# --------------
|
# --------------
|
||||||
|
|
|
@ -239,6 +239,7 @@ __attribute__((__used__)) int main(int i, char **c)
|
||||||
hyperram_config_write(core_latency_setting << CSR_HYPERRAM_CONFIG_LATENCY_OFFSET);
|
hyperram_config_write(core_latency_setting << CSR_HYPERRAM_CONFIG_LATENCY_OFFSET);
|
||||||
|
|
||||||
/* Enable Variable Latency on HyperRAM Chip */
|
/* Enable Variable Latency on HyperRAM Chip */
|
||||||
|
if (hyperram_status_read() & 0x1)
|
||||||
config_reg_0 &= ~(0b1 << 3); /* Enable Variable Latency */
|
config_reg_0 &= ~(0b1 << 3); /* Enable Variable Latency */
|
||||||
|
|
||||||
/* Update Latency on HyperRAM Chip */
|
/* Update Latency on HyperRAM Chip */
|
||||||
|
|
Loading…
Reference in New Issue