gem5-dev@gem5.org

The gem5 Developer List

View all threads

[XS] Change in gem5/gem5[develop]: configs: Make the configuration of the gicv4 parameter robust

RC
Richard Cooper (Gerrit)
Thu, Apr 13, 2023 9:09 PM

Richard Cooper has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/69685?usp=email )

(

1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: configs: Make the configuration of the gicv4 parameter
robust
......................................................................

configs: Make the configuration of the gicv4 parameter robust

Only the GICv3 model has a gicv4 parameter, causing the current
baremetal.py config to throw an exception when used with the
VExpress_GEM5_V1 platform containing a GICv2.

This patch checks for the existence of the gicv4 parameter, allowing
all VExpress platforms to be used.

Change-Id: I72667a9caee64fa497bda516217cd424050eb242
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/69685
Tested-by: kokoro noreply+kokoro@google.com
Reviewed-by: Giacomo Travaglini giacomo.travaglini@arm.com
Maintainer: Giacomo Travaglini giacomo.travaglini@arm.com

M configs/example/arm/baremetal.py
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass

diff --git a/configs/example/arm/baremetal.py
b/configs/example/arm/baremetal.py
index 4af1ff1..345596d 100644
--- a/configs/example/arm/baremetal.py
+++ b/configs/example/arm/baremetal.py
@@ -142,7 +142,8 @@
system.auto_reset_addr = True

  # Using GICv3
  • system.realview.gic.gicv4 = False
  • if hasattr(system.realview.gic, "gicv4"):
  •    system.realview.gic.gicv4 = False
    
    system.highest_el_is_64 = True
    

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

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I72667a9caee64fa497bda516217cd424050eb242
Gerrit-Change-Number: 69685
Gerrit-PatchSet: 4
Gerrit-Owner: Richard Cooper richard.cooper@arm.com
Gerrit-Reviewer: Giacomo Travaglini giacomo.travaglini@arm.com
Gerrit-Reviewer: Jason Lowe-Power jason@lowepower.com
Gerrit-Reviewer: Richard Cooper richard.cooper@arm.com
Gerrit-Reviewer: kokoro noreply+kokoro@google.com
Gerrit-MessageType: merged

Richard Cooper has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/69685?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: configs: Make the configuration of the gicv4 parameter robust ...................................................................... configs: Make the configuration of the gicv4 parameter robust Only the GICv3 model has a `gicv4` parameter, causing the current `baremetal.py` config to throw an exception when used with the VExpress_GEM5_V1 platform containing a GICv2. This patch checks for the existence of the `gicv4` parameter, allowing all VExpress platforms to be used. Change-Id: I72667a9caee64fa497bda516217cd424050eb242 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/69685 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com> Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com> --- M configs/example/arm/baremetal.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Giacomo Travaglini: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/configs/example/arm/baremetal.py b/configs/example/arm/baremetal.py index 4af1ff1..345596d 100644 --- a/configs/example/arm/baremetal.py +++ b/configs/example/arm/baremetal.py @@ -142,7 +142,8 @@ system.auto_reset_addr = True # Using GICv3 - system.realview.gic.gicv4 = False + if hasattr(system.realview.gic, "gicv4"): + system.realview.gic.gicv4 = False system.highest_el_is_64 = True -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/69685?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: I72667a9caee64fa497bda516217cd424050eb242 Gerrit-Change-Number: 69685 Gerrit-PatchSet: 4 Gerrit-Owner: Richard Cooper <richard.cooper@arm.com> Gerrit-Reviewer: Giacomo Travaglini <giacomo.travaglini@arm.com> Gerrit-Reviewer: Jason Lowe-Power <jason@lowepower.com> Gerrit-Reviewer: Richard Cooper <richard.cooper@arm.com> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com> Gerrit-MessageType: merged