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

Added trigger type 2 (mcontrol) #750

Merged

Conversation

silabs-oysteink
Copy link
Contributor

Adding label do-not-merge as we may need an ISS update due to the changes in tdata1 legal values and reset value.

Signed-off-by: Oystein Knauserud <[email protected]>
Signed-off-by: Oystein Knauserud <[email protected]>
@silabs-oysteink silabs-oysteink added Component:RTL For issues in the RTL (e.g. for files in the rtl directory) Status:Do-not-merge Pull request that should not be merged (yet) labels Jan 3, 2023
2'b00, // sizelo : hardwired to zero, match any size
4'b0001, // action : enter debug on match
1'b0, // chain : hardwired to zero
mcontrol6_match_resolve(csr_wdata_i[MCONTROL2_6_MATCH_HIGH:MCONTROL2_6_MATCH_LOW]), // match, WARL(0,2,3) 10:7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also rename mcontrol6_match_resolve -> mcontrol2_6_match_resolve

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

csr_wdata_i[6], // m : match in machine mode
1'b0, // : hardwired to zero
1'b0, // s : hardwired to zer0
mcontrol6_u_resolve(csr_wdata_i[MCONTROL2_6_U]), // zero, U 3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also rename mcontrol6_u_resolve -> mcontrol2_6_u_resolve

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@@ -153,11 +174,11 @@ import cv32e40x_pkg::*;
4'b0000, // zero, size (match any size) 19:16
4'b0001, // action, WARL(1), enter debug 15:12
1'b0, // zero, chain 11
mcontrol6_match_resolve(csr_wdata_i[MCONTROL6_MATCH_HIGH:MCONTROL6_MATCH_LOW]), // match, WARL(0,2,3) 10:7
mcontrol6_match_resolve(csr_wdata_i[MCONTROL2_6_MATCH_HIGH:MCONTROL2_6_MATCH_LOW]), // match, WARL(0,2,3) 10:7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here and other places

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

Copy link
Contributor

@Silabs-ArjanB Silabs-ArjanB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment and behavior at line

// Unsupported exception codes enabled, keep value of tdata1
do not reflect tdata1.type = 0xF being the resolution value.

…ype 0x5 when unsupported bits are set in tdata2. Defaulting to disabled trigger (type 0xF) instead of keeping tdata1 unchanged.

Signed-off-by: Oystein Knauserud <[email protected]>
@Silabs-ArjanB Silabs-ArjanB removed the Status:Do-not-merge Pull request that should not be merged (yet) label Jan 23, 2023
@Silabs-ArjanB Silabs-ArjanB merged commit 6a5cfdf into openhwgroup:master Jan 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component:RTL For issues in the RTL (e.g. for files in the rtl directory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants