gem5-dev@gem5.org

The gem5 Developer List

View all threads

[XS] Change in gem5/gem5[develop]: arch-arm: Map MIDR_EL1 to AArch32 version

GT
Giacomo Travaglini (Gerrit)
Thu, May 11, 2023 8:25 AM

Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/70461?usp=email )

Change subject: arch-arm: Map MIDR_EL1 to AArch32 version
......................................................................

arch-arm: Map MIDR_EL1 to AArch32 version

Signed-off-by: Giacomo Travaglini giacomo.travaglini@arm.com
Change-Id: Id3ddc18ebfc296389bed6dc7615899bef83178ea
Reviewed-by: Richard Cooper richard.cooper@arm.com
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/70461
Reviewed-by: Jason Lowe-Power power.jg@gmail.com
Tested-by: kokoro noreply+kokoro@google.com
Maintainer: Jason Lowe-Power power.jg@gmail.com

M src/arch/arm/isa.cc
M src/arch/arm/regs/misc.cc
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
Richard Cooper: Looks good to me, approved

diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc
index b0a856e..65d8b97 100644
--- a/src/arch/arm/isa.cc
+++ b/src/arch/arm/isa.cc
@@ -334,7 +334,6 @@
midr = 0x410fc0f0;

  miscRegs[MISCREG_MIDR] = midr;
  • miscRegs[MISCREG_MIDR_EL1] = midr;
    miscRegs[MISCREG_VPIDR] = midr;

    miscRegs[MISCREG_ID_ISAR0] = p.id_isar0;
    diff --git a/src/arch/arm/regs/misc.cc b/src/arch/arm/regs/misc.cc
    index 4221a15..000124c 100644
    --- a/src/arch/arm/regs/misc.cc
    +++ b/src/arch/arm/regs/misc.cc
    @@ -3507,7 +3507,8 @@

    // AArch64 registers (Op0=1,3);
    InitReg(MISCREG_MIDR_EL1)

  •  .allPrivileges().exceptUserMode().writes(0);
    
  •  .allPrivileges().exceptUserMode().writes(0)
    
  •  .mapsTo(MISCREG_MIDR);
    InitReg(MISCREG_MPIDR_EL1)
      .allPrivileges().exceptUserMode().writes(0);
    InitReg(MISCREG_REVIDR_EL1)
    

--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/70461?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings?usp=email

Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Id3ddc18ebfc296389bed6dc7615899bef83178ea
Gerrit-Change-Number: 70461
Gerrit-PatchSet: 2
Gerrit-Owner: Giacomo Travaglini giacomo.travaglini@arm.com
Gerrit-Reviewer: Andreas Sandberg andreas.sandberg@arm.com
Gerrit-Reviewer: Giacomo Travaglini giacomo.travaglini@arm.com
Gerrit-Reviewer: Jason Lowe-Power power.jg@gmail.com
Gerrit-Reviewer: Richard Cooper richard.cooper@arm.com
Gerrit-Reviewer: kokoro noreply+kokoro@google.com

Giacomo Travaglini has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/70461?usp=email ) Change subject: arch-arm: Map MIDR_EL1 to AArch32 version ...................................................................... arch-arm: Map MIDR_EL1 to AArch32 version Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Change-Id: Id3ddc18ebfc296389bed6dc7615899bef83178ea Reviewed-by: Richard Cooper <richard.cooper@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/70461 Reviewed-by: Jason Lowe-Power <power.jg@gmail.com> Tested-by: kokoro <noreply+kokoro@google.com> Maintainer: Jason Lowe-Power <power.jg@gmail.com> --- M src/arch/arm/isa.cc M src/arch/arm/regs/misc.cc 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass Richard Cooper: Looks good to me, approved diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc index b0a856e..65d8b97 100644 --- a/src/arch/arm/isa.cc +++ b/src/arch/arm/isa.cc @@ -334,7 +334,6 @@ midr = 0x410fc0f0; miscRegs[MISCREG_MIDR] = midr; - miscRegs[MISCREG_MIDR_EL1] = midr; miscRegs[MISCREG_VPIDR] = midr; miscRegs[MISCREG_ID_ISAR0] = p.id_isar0; diff --git a/src/arch/arm/regs/misc.cc b/src/arch/arm/regs/misc.cc index 4221a15..000124c 100644 --- a/src/arch/arm/regs/misc.cc +++ b/src/arch/arm/regs/misc.cc @@ -3507,7 +3507,8 @@ // AArch64 registers (Op0=1,3); InitReg(MISCREG_MIDR_EL1) - .allPrivileges().exceptUserMode().writes(0); + .allPrivileges().exceptUserMode().writes(0) + .mapsTo(MISCREG_MIDR); InitReg(MISCREG_MPIDR_EL1) .allPrivileges().exceptUserMode().writes(0); InitReg(MISCREG_REVIDR_EL1) -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/70461?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: Id3ddc18ebfc296389bed6dc7615899bef83178ea Gerrit-Change-Number: 70461 Gerrit-PatchSet: 2 Gerrit-Owner: Giacomo Travaglini <giacomo.travaglini@arm.com> Gerrit-Reviewer: Andreas Sandberg <andreas.sandberg@arm.com> Gerrit-Reviewer: Giacomo Travaglini <giacomo.travaglini@arm.com> Gerrit-Reviewer: Jason Lowe-Power <power.jg@gmail.com> Gerrit-Reviewer: Richard Cooper <richard.cooper@arm.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com>