-
Notifications
You must be signed in to change notification settings - Fork 792
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
[regtool/rtl] Add missing CM annotations #21315
Conversation
Fixes part of lowRISC#20887 Signed-off-by: Michael Schaffner <[email protected]>
Fixes part of lowRISC#20887 Signed-off-by: Michael Schaffner <[email protected]>
6a9bdbb
to
cd73707
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM for KMAC and Keymgr. I am not very familiar with the flow that checks these comment lines though.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One query about the last commit, but this looks sensible to me.
hw/ip/rom_ctrl/rtl/rom_ctrl.sv
Outdated
@@ -193,7 +193,7 @@ module rom_ctrl | |||
.ErrOnWrite(1), | |||
.CmdIntgCheck(1), | |||
.EnableRspIntgGen(1), | |||
.EnableDataIntgGen(SecDisableScrambling), | |||
.EnableDataIntgGen(SecDisableScrambling), // SEC_CM: CTRL.MEM.INTEGRITY |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure this is quite what we want? This flag tells the module to generate integrity bits on the fly when scrambling is disabled. I don't think this is quite the right place to put the annotation?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any suggestion where else we could put it?
I put it here since this enables end-to-end integrity passthrough in case scrambling is enabled, and there is not really a specific datapath block that implements end-to-end integrity.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I moved this label to the definition of the DataWidth
parameter, where this is explained a bit better in the comment - PTAL. The issue is a bit that the bus integrity feature is only implicitly visible here, e.g. in the data width that is 32+7 bits.
604269b
to
f9b6fb9
Compare
Fixes part of lowRISC#20887 Signed-off-by: Michael Schaffner <[email protected]>
Fixes part of lowRISC#20887 Signed-off-by: Michael Schaffner <[email protected]>
f9b6fb9
to
e42de1a
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That makes lots of sense, thanks!
This fixes #20887.
Note that #10071 can only be closed once all autogen'd IPs have been transitioned to IPGen, since the annotation checker does not look in the right RTL locations otherwise. I.e., there are some IPs like
pinmux
which are correctly annotated, but will fail since the top-specific Hjson resides in a different subtree than the associated RTL (which will be fixes once transitioned to IPGen).