Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Сpuif error response, when the address is decoded incorrectly #107

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/peakrdl_regblock/addr_decode.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,8 @@ def enter_Reg(self, node: RegNode) -> None:
rhs = f"cpuif_req_masked & (cpuif_addr == {self._get_address_str(node)})"
s = f"{self.addr_decode.get_access_strobe(node)} = {rhs};"
self.add_content(s)
# Add address decoding flag
self.add_content(f"is_decoded |= {self.addr_decode.get_access_strobe(node)};")
if node.external:
readable = node.has_sw_readable
writable = node.has_sw_writable
Expand All @@ -195,6 +197,8 @@ def enter_Reg(self, node: RegNode) -> None:
rhs = f"cpuif_req_masked & (cpuif_addr == {self._get_address_str(node, subword_offset=(i*subword_stride))})"
s = f"{self.addr_decode.get_access_strobe(node)}[{i}] = {rhs};"
self.add_content(s)
# Add address decoding flag
self.add_content(f"is_decoded |= {self.addr_decode.get_access_strobe(node)}[{i}];")
if node.external:
readable = node.has_sw_readable
writable = node.has_sw_writable
Expand Down
6 changes: 6 additions & 0 deletions src/peakrdl_regblock/exporter.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ def export(self, node: Union[RootNode, AddrmapNode], output_dir:str, **kwargs: A
If overriden to True, default reset is active-low instead of active-high.
default_reset_async: bool
If overriden to True, default reset is asynchronous instead of synchronous.
generate_cpuif_err: bool
If overriden to True: If the address is decoded incorrectly, the cpuif response
signal shows an error. For example: APB.PSLVERR = 1'b1, AXI4LITE.*RESP = 2'b10.
"""
# If it is the root node, skip to top addrmap
if isinstance(node, RootNode):
Expand Down Expand Up @@ -227,6 +230,9 @@ def __init__(self, top_node: AddrmapNode, kwargs: Any) -> None:
self.default_reset_activelow = kwargs.pop("default_reset_activelow", False) # type: bool
self.default_reset_async = kwargs.pop("default_reset_async", False) # type: bool

# Generating a cpuif error
self.generate_cpuif_err = kwargs.pop("generate_cpuif_err", False) # type: bool

#------------------------
# Info about the design
#------------------------
Expand Down
8 changes: 8 additions & 0 deletions src/peakrdl_regblock/module_tmpl.sv
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ module {{ds.module_name}}
//--------------------------------------------------------------------------
{{address_decode.get_strobe_struct()|indent}}
decoded_reg_strb_t decoded_reg_strb;
logic undecoded_addr_strb;
{%- if ds.has_external_addressable %}
logic decoded_strb_is_external;
{% endif %}
Expand All @@ -136,11 +137,14 @@ module {{ds.module_name}}
logic [{{cpuif.data_width-1}}:0] decoded_wr_biten;

always_comb begin
automatic logic is_decoded;
{%- if ds.has_external_addressable %}
automatic logic is_external;
is_external = '0;
{%- endif %}
is_decoded = '0;
{{address_decode.get_implementation()|indent(8)}}
undecoded_addr_strb = ~is_decoded & decoded_req;
{%- if ds.has_external_addressable %}
decoded_strb_is_external = is_external;
external_req = is_external;
Expand Down Expand Up @@ -223,7 +227,11 @@ module {{ds.module_name}}
assign cpuif_wr_ack = decoded_req & decoded_req_is_wr;
{%- endif %}
// Writes are always granted with no error response
{%- if ds.generate_cpuif_err %}
assign cpuif_wr_err = undecoded_addr_strb;
{%- else %}
assign cpuif_wr_err = '0;
{%- endif %}

//--------------------------------------------------------------------------
// Readback
Expand Down
15 changes: 15 additions & 0 deletions src/peakrdl_regblock/readback/templates/readback.sv
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,15 @@ end

logic [{{cpuif.data_width-1}}:0] readback_array_r[{{fanin_array_size}}];
logic readback_done_r;
logic readback_err_r;
always_ff {{get_always_ff_event(cpuif.reset)}} begin
if({{get_resetsignal(cpuif.reset)}}) begin
for(int i=0; i<{{fanin_array_size}}; i++) readback_array_r[i] <= '0;
readback_done_r <= '0;
readback_err_r <= '0;
end else begin
readback_array_r <= readback_array_c;
readback_err_r <= undecoded_addr_strb;
{%- if ds.has_external_addressable %}
readback_done_r <= decoded_req & ~decoded_req_is_wr & ~decoded_strb_is_external;
{%- else %}
Expand All @@ -47,7 +50,11 @@ end
always_comb begin
automatic logic [{{cpuif.data_width-1}}:0] readback_data_var;
readback_done = readback_done_r;
{%- if ds.generate_cpuif_err %}
readback_err = readback_err_r;
{%- else %}
readback_err = '0;
{%- endif %}
readback_data_var = '0;
for(int i=0; i<{{fanin_array_size}}; i++) readback_data_var |= readback_array_r[i];
readback_data = readback_data_var;
Expand All @@ -63,7 +70,11 @@ always_comb begin
{%- else %}
readback_done = decoded_req & ~decoded_req_is_wr;
{%- endif %}
{%- if ds.generate_cpuif_err %}
readback_err = undecoded_addr_strb;
{%- else %}
readback_err = '0;
{%- endif %}
readback_data_var = '0;
for(int i=0; i<{{array_size}}; i++) readback_data_var |= readback_array[i];
readback_data = readback_data_var;
Expand All @@ -75,5 +86,9 @@ end
{%- else %}
assign readback_done = decoded_req & ~decoded_req_is_wr;
assign readback_data = '0;
{%- if ds.generate_cpuif_err %}
assign readback_err = undecoded_addr_strb;
{%- else %}
assign readback_err = '0;
{%- endif %}
{% endif %}