Skip to content

Commit

Permalink
[darjeeling,racl] Add RACL to AC Range check
Browse files Browse the repository at this point in the history 
Signed-off-by: Robert Schilling <[email protected]>
  • Loading branch information
@Razer6 @vogelpi
Razer6 authored and vogelpi committed Feb 3, 2025
1 parent b4157c3 commit 616c034
Show file tree
Hide file tree
Showing 9 changed files with 418 additions and 23 deletions.
217 changes: 206 additions & 11 deletions hw/top_darjeeling/data/autogen/top_darjeeling.gen.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9816,7 +9816,7 @@
name: NumSubscribingIps
desc: Number of subscribing RACL IPs
type: int
default: 8
default: 9
local: "true"
expose: "true"
name_top: RaclCtrlNumSubscribingIps
Expand Down Expand Up @@ -9867,7 +9867,7 @@
desc: Number of subscribing RACL IPs
param_type: int
unpacked_dimensions: null
default: 8
default: 9
local: true
expose: true
name_top: RaclCtrlNumSubscribingIps
Expand All @@ -9893,7 +9893,7 @@
desc: Number of subscribing RACL IPs
param_type: int
unpacked_dimensions: null
default: 8
default: 9
local: true
expose: true
name_top: RaclCtrlNumSubscribingIps
Expand Down Expand Up @@ -10101,6 +10101,8 @@
act: rcv
width: 1
inst_name: ac_range_check
default: ""
top_signame: racl_ctrl_racl_policies
index: -1
}
{
Expand All @@ -10115,7 +10117,10 @@
act: req
width: 1
inst_name: ac_range_check
index: -1
default: ""
package: ""
top_signame: racl_ctrl_racl_error
index: 8
}
{
name: racl_error_log
Expand All @@ -10126,7 +10131,9 @@
act: req
width: 1
inst_name: ac_range_check
index: -1
default: ""
top_signame: racl_ctrl_racl_error_log
index: 8
}
{
name: tl
Expand All @@ -10150,6 +10157,184 @@
}
}
generate_dif: true
racl_mappings:
{
null:
{
racl_group: Null
register_mapping:
{
INTR_STATE: 2
INTR_ENABLE: 2
INTR_TEST: 2
ALERT_TEST: 2
LOG_CONFIG: 2
LOG_STATUS: 2
LOG_ADDRESS: 2
RANGE_REGWEN_0: 2
RANGE_REGWEN_1: 2
RANGE_REGWEN_2: 2
RANGE_REGWEN_3: 2
RANGE_REGWEN_4: 2
RANGE_REGWEN_5: 2
RANGE_REGWEN_6: 2
RANGE_REGWEN_7: 2
RANGE_REGWEN_8: 2
RANGE_REGWEN_9: 2
RANGE_REGWEN_10: 2
RANGE_REGWEN_11: 2
RANGE_REGWEN_12: 2
RANGE_REGWEN_13: 2
RANGE_REGWEN_14: 2
RANGE_REGWEN_15: 2
RANGE_REGWEN_16: 2
RANGE_REGWEN_17: 2
RANGE_REGWEN_18: 2
RANGE_REGWEN_19: 2
RANGE_REGWEN_20: 2
RANGE_REGWEN_21: 2
RANGE_REGWEN_22: 2
RANGE_REGWEN_23: 2
RANGE_REGWEN_24: 2
RANGE_REGWEN_25: 2
RANGE_REGWEN_26: 2
RANGE_REGWEN_27: 2
RANGE_REGWEN_28: 2
RANGE_REGWEN_29: 2
RANGE_REGWEN_30: 2
RANGE_REGWEN_31: 2
RANGE_BASE_0: 2
RANGE_BASE_1: 2
RANGE_BASE_2: 2
RANGE_BASE_3: 2
RANGE_BASE_4: 2
RANGE_BASE_5: 2
RANGE_BASE_6: 2
RANGE_BASE_7: 2
RANGE_BASE_8: 2
RANGE_BASE_9: 2
RANGE_BASE_10: 2
RANGE_BASE_11: 2
RANGE_BASE_12: 2
RANGE_BASE_13: 2
RANGE_BASE_14: 2
RANGE_BASE_15: 2
RANGE_BASE_16: 2
RANGE_BASE_17: 2
RANGE_BASE_18: 2
RANGE_BASE_19: 2
RANGE_BASE_20: 2
RANGE_BASE_21: 2
RANGE_BASE_22: 2
RANGE_BASE_23: 2
RANGE_BASE_24: 2
RANGE_BASE_25: 2
RANGE_BASE_26: 2
RANGE_BASE_27: 2
RANGE_BASE_28: 2
RANGE_BASE_29: 2
RANGE_BASE_30: 2
RANGE_BASE_31: 2
RANGE_LIMIT_0: 2
RANGE_LIMIT_1: 2
RANGE_LIMIT_2: 2
RANGE_LIMIT_3: 2
RANGE_LIMIT_4: 2
RANGE_LIMIT_5: 2
RANGE_LIMIT_6: 2
RANGE_LIMIT_7: 2
RANGE_LIMIT_8: 2
RANGE_LIMIT_9: 2
RANGE_LIMIT_10: 2
RANGE_LIMIT_11: 2
RANGE_LIMIT_12: 2
RANGE_LIMIT_13: 2
RANGE_LIMIT_14: 2
RANGE_LIMIT_15: 2
RANGE_LIMIT_16: 2
RANGE_LIMIT_17: 2
RANGE_LIMIT_18: 2
RANGE_LIMIT_19: 2
RANGE_LIMIT_20: 2
RANGE_LIMIT_21: 2
RANGE_LIMIT_22: 2
RANGE_LIMIT_23: 2
RANGE_LIMIT_24: 2
RANGE_LIMIT_25: 2
RANGE_LIMIT_26: 2
RANGE_LIMIT_27: 2
RANGE_LIMIT_28: 2
RANGE_LIMIT_29: 2
RANGE_LIMIT_30: 2
RANGE_LIMIT_31: 2
RANGE_PERM_0: 2
RANGE_PERM_1: 2
RANGE_PERM_2: 2
RANGE_PERM_3: 2
RANGE_PERM_4: 2
RANGE_PERM_5: 2
RANGE_PERM_6: 2
RANGE_PERM_7: 2
RANGE_PERM_8: 2
RANGE_PERM_9: 2
RANGE_PERM_10: 2
RANGE_PERM_11: 2
RANGE_PERM_12: 2
RANGE_PERM_13: 2
RANGE_PERM_14: 2
RANGE_PERM_15: 2
RANGE_PERM_16: 2
RANGE_PERM_17: 2
RANGE_PERM_18: 2
RANGE_PERM_19: 2
RANGE_PERM_20: 2
RANGE_PERM_21: 2
RANGE_PERM_22: 2
RANGE_PERM_23: 2
RANGE_PERM_24: 2
RANGE_PERM_25: 2
RANGE_PERM_26: 2
RANGE_PERM_27: 2
RANGE_PERM_28: 2
RANGE_PERM_29: 2
RANGE_PERM_30: 2
RANGE_PERM_31: 2
RANGE_RACL_POLICY_SHADOWED_0: 2
RANGE_RACL_POLICY_SHADOWED_1: 2
RANGE_RACL_POLICY_SHADOWED_2: 2
RANGE_RACL_POLICY_SHADOWED_3: 2
RANGE_RACL_POLICY_SHADOWED_4: 2
RANGE_RACL_POLICY_SHADOWED_5: 2
RANGE_RACL_POLICY_SHADOWED_6: 2
RANGE_RACL_POLICY_SHADOWED_7: 2
RANGE_RACL_POLICY_SHADOWED_8: 2
RANGE_RACL_POLICY_SHADOWED_9: 2
RANGE_RACL_POLICY_SHADOWED_10: 2
RANGE_RACL_POLICY_SHADOWED_11: 2
RANGE_RACL_POLICY_SHADOWED_12: 2
RANGE_RACL_POLICY_SHADOWED_13: 2
RANGE_RACL_POLICY_SHADOWED_14: 2
RANGE_RACL_POLICY_SHADOWED_15: 2
RANGE_RACL_POLICY_SHADOWED_16: 2
RANGE_RACL_POLICY_SHADOWED_17: 2
RANGE_RACL_POLICY_SHADOWED_18: 2
RANGE_RACL_POLICY_SHADOWED_19: 2
RANGE_RACL_POLICY_SHADOWED_20: 2
RANGE_RACL_POLICY_SHADOWED_21: 2
RANGE_RACL_POLICY_SHADOWED_22: 2
RANGE_RACL_POLICY_SHADOWED_23: 2
RANGE_RACL_POLICY_SHADOWED_24: 2
RANGE_RACL_POLICY_SHADOWED_25: 2
RANGE_RACL_POLICY_SHADOWED_26: 2
RANGE_RACL_POLICY_SHADOWED_27: 2
RANGE_RACL_POLICY_SHADOWED_28: 2
RANGE_RACL_POLICY_SHADOWED_29: 2
RANGE_RACL_POLICY_SHADOWED_30: 2
RANGE_RACL_POLICY_SHADOWED_31: 2
}
window_mapping: {}
}
}
}
{
name: rv_core_ibex
Expand Down Expand Up @@ -11596,6 +11781,7 @@
mbx_jtag.racl_policies
mbx_pcie0.racl_policies
mbx_pcie1.racl_policies
ac_range_check.racl_policies
]
racl_ctrl.racl_error:
[
Expand All @@ -11607,6 +11793,7 @@
mbx_jtag.racl_error
mbx_pcie0.racl_error
mbx_pcie1.racl_error
ac_range_check.racl_error
]
racl_ctrl.racl_error_log:
[
Expand All @@ -11618,6 +11805,7 @@
mbx_jtag.racl_error_log
mbx_pcie0.racl_error_log
mbx_pcie1.racl_error_log
ac_range_check.racl_error_log
]
}
top:
Expand Down Expand Up @@ -25637,7 +25825,7 @@
desc: Number of subscribing RACL IPs
param_type: int
unpacked_dimensions: null
default: 8
default: 9
local: true
expose: true
name_top: RaclCtrlNumSubscribingIps
Expand All @@ -25663,7 +25851,7 @@
desc: Number of subscribing RACL IPs
param_type: int
unpacked_dimensions: null
default: 8
default: 9
local: true
expose: true
name_top: RaclCtrlNumSubscribingIps
Expand Down Expand Up @@ -25827,6 +26015,8 @@
act: rcv
width: 1
inst_name: ac_range_check
default: ""
top_signame: racl_ctrl_racl_policies
index: -1
}
{
Expand All @@ -25841,7 +26031,10 @@
act: req
width: 1
inst_name: ac_range_check
index: -1
default: ""
package: ""
top_signame: racl_ctrl_racl_error
index: 8
}
{
name: racl_error_log
Expand All @@ -25852,7 +26045,9 @@
act: req
width: 1
inst_name: ac_range_check
index: -1
default: ""
top_signame: racl_ctrl_racl_error_log
index: 8
}
{
name: tl
Expand Down Expand Up @@ -31478,7 +31673,7 @@
desc: Number of subscribing RACL IPs
param_type: int
unpacked_dimensions: null
default: 8
default: 9
local: true
expose: true
name_top: RaclCtrlNumSubscribingIps
Expand All @@ -31499,7 +31694,7 @@
desc: Number of subscribing RACL IPs
param_type: int
unpacked_dimensions: null
default: 8
default: 9
local: true
expose: true
name_top: RaclCtrlNumSubscribingIps
Expand Down
1 change: 1 addition & 0 deletions hw/top_darjeeling/data/top_darjeeling.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1027,6 +1027,7 @@
num_ranges: 32
}
attr: "ipgen",
racl_mapping: 'top_darjeeling/data/racl/soc_rot_mapping.hjson'
},
{ name: "rv_core_ibex",
type: "rv_core_ibex",
Expand Down
2 changes: 2 additions & 0 deletions ...op_darjeeling/ip_autogen/ac_range_check/data/top_darjeeling_ac_range_check.ipconfig.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
{
num_ranges: 32
module_instance_name: ac_range_check
nr_role_bits: 4
nr_ctn_uid_bits: 5
topname: darjeeling
}
}
2 changes: 1 addition & 1 deletion hw/top_darjeeling/ip_autogen/racl_ctrl/data/racl_ctrl.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
{ name: "NumSubscribingIps",
desc: "Number of subscribing RACL IPs",
type: "int",
default: "8",
default: "9",
expose: "true"
local: "true"
},
Expand Down
2 changes: 1 addition & 1 deletion hw/top_darjeeling/ip_autogen/racl_ctrl/data/top_darjeeling_racl_ctrl.ipconfig.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
nr_role_bits: 4
nr_ctn_uid_bits: 5
nr_policies: 3
nr_subscribing_ips: 8
nr_subscribing_ips: 9
policies:
[
{
Expand Down
3 changes: 3 additions & 0 deletions hw/top_darjeeling/lint/top_darjeeling.waiver
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,6 @@ waive -rules SAME_NAME_TYPE -location {spi_device.sv mbx.sv} -regexp {'mbx' is u
# intentionally unused
waive -rules {NOT_READ HIER_NET_NOT_READ} -location {top_darjeeling.sv} -regexp {.*cio_otp_ctrl_test_(en_)?d2p\[7:1\].* is not read} \
-comment "otp test bus made deliberately larger on purpose"

waive -rules {LINE_LENGTH} -location {top_racl_pkg.sv} -regexp {Line length of \[[0-9]+\] exceeds 100 character limit} \
-comment "top_racl_pkg is auto-generated and expected to exceed line length limit"
Loading

0 comments on commit 616c034

Please sign in to comment.