[gem5-dev] Change in gem5/gem5[master]: arch-arm: CPTR_EL3.TCPAC traps EL2 accesses to CPACR_EL1
Giacomo Travaglini has submitted this change and it was merged. ( https://gem5-review.googlesource.com/c/public/gem5/+/13775 ) Change subject: arch-arm: CPTR_EL3.TCPAC traps EL2 accesses to CPACR_EL1 .. arch-arm: CPTR_EL3.TCPAC traps EL2 accesses to CPACR_EL1 According to the arm arm, CPTR_EL3.TCPAC traps EL2 accesses to the CPTR_EL2 or HCPTR, and EL2 and EL1 accesses to the CPACR_EL1 or CPACR, are trapped to EL3, unless they are trapped by CPTR_EL2.TCPAC. Change-Id: I637be35b29db39f044dda0c6cc4fe986c9620371 Signed-off-by: Giacomo Travaglini Reviewed-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/13775 Maintainer: Andreas Sandberg --- M src/arch/arm/utility.cc 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Andreas Sandberg: Looks good to me, approved; Looks good to me, approved diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc index e642250..0494c20 100644 --- a/src/arch/arm/utility.cc +++ b/src/arch/arm/utility.cc @@ -792,7 +792,7 @@ break; // CPACR, CPTR case MISCREG_CPACR_EL1: -if (el == EL1) { +if (el == EL1 || el == EL2) { trapToMon = cptr.tcpac; } break; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13775 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: master Gerrit-Change-Id: I637be35b29db39f044dda0c6cc4fe986c9620371 Gerrit-Change-Number: 13775 Gerrit-PatchSet: 2 Gerrit-Owner: Giacomo Travaglini Gerrit-Reviewer: Andreas Sandberg Gerrit-Reviewer: Giacomo Travaglini Gerrit-MessageType: merged ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: arch-arm: CPTR_EL3.TCPAC traps EL2 accesses to CPACR_EL1
Hello Andreas Sandberg, I'd like you to do a code review. Please visit https://gem5-review.googlesource.com/c/public/gem5/+/13775 to review the following change. Change subject: arch-arm: CPTR_EL3.TCPAC traps EL2 accesses to CPACR_EL1 .. arch-arm: CPTR_EL3.TCPAC traps EL2 accesses to CPACR_EL1 According to the arm arm, CPTR_EL3.TCPAC traps EL2 accesses to the CPTR_EL2 or HCPTR, and EL2 and EL1 accesses to the CPACR_EL1 or CPACR, are trapped to EL3, unless they are trapped by CPTR_EL2.TCPAC. Change-Id: I637be35b29db39f044dda0c6cc4fe986c9620371 Signed-off-by: Giacomo Travaglini Reviewed-by: Andreas Sandberg --- M src/arch/arm/utility.cc 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc index e642250..0494c20 100644 --- a/src/arch/arm/utility.cc +++ b/src/arch/arm/utility.cc @@ -792,7 +792,7 @@ break; // CPACR, CPTR case MISCREG_CPACR_EL1: -if (el == EL1) { +if (el == EL1 || el == EL2) { trapToMon = cptr.tcpac; } break; -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13775 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: master Gerrit-Change-Id: I637be35b29db39f044dda0c6cc4fe986c9620371 Gerrit-Change-Number: 13775 Gerrit-PatchSet: 1 Gerrit-Owner: Giacomo Travaglini Gerrit-Reviewer: Andreas Sandberg Gerrit-MessageType: newchange ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev