Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/38796 )
Change subject: dev-arm, system-arm: Remove HDLcd from VExpress_GEM5_VX
platforms
......................................................................
dev-arm, system-arm: Remove HDLcd from VExpress_GEM5_VX platforms
This is a major change in our platform configuration.
At the moment the VExpress_GEM5_V1 and VExpress_GEM5_V2 platforms
both instantiate an HDLcd device. As the presence of the device
can slow down host performances when the software stack is
aware of its presence, we have historically been providing
an entry in the hdlcd DTB node to "hide" the entry from the
DTB parser:
status = "disable";
This default entry in the hdlcd node will in fact prevent the driver
from bringing up the device. Unfortunately this is useful for
experienced users only which are aware of this knob.
In order to make things more transparent, and to avoid any confusion
(e.g. having the hdlcd present in the config.ini, but not being able to
program it in Linux) we are deprecating this solution; we are removing
the HDLcd from the aforementioned platforms.
Users not interested on simulating a display controller won't
notice the difference.
Users interested on including it, will now have to switch to a new
VExpress_GEM5_Vx_HLCD platform
which will enabled the HDLcd without any further tweaking required
JIRA: https://gem5.atlassian.net/browse/GEM5-866
Change-Id: I4b1920efe764080115a57f52d8a3df2e6e2386a0
Signed-off-by: Giacomo Travaglini <giacomo.travagl...@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/38796
Tested-by: kokoro <noreply+kok...@google.com>
Reviewed-by: Andreas Sandberg <andreas.sandb...@arm.com>
Maintainer: Andreas Sandberg <andreas.sandb...@arm.com>
---
M src/dev/arm/RealView.py
M system/arm/dt/Makefile
R system/arm/dt/platforms/vexpress_gem5_v1_hdlcd.dtsi
R system/arm/dt/platforms/vexpress_gem5_v2_hdlcd.dtsi
4 files changed, 66 insertions(+), 16 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py
index f988452..c168cfd 100644
--- a/src/dev/arm/RealView.py
+++ b/src/dev/arm/RealView.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009-2020 ARM Limited
+# Copyright (c) 2009-2021 ARM Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -1299,11 +1299,18 @@
]
class VExpress_GEM5_V1(VExpress_GEM5_V1_Base):
+ """
+ We subclass VExpress_GEM5_V1_Base in order to alias it to
+ VExpress_GEM5_V1, which is what gem5 scripts are currently using
+ """
+ pass
+
+class VExpress_GEM5_V1_HDLcd(VExpress_GEM5_V1_Base):
hdlcd = HDLcd(pxl_clk=VExpress_GEM5_V1_Base.dcc.osc_pxl,
pio_addr=0x2b000000, interrupt=ArmSPI(num=95))
def _on_chip_devices(self):
- return super(VExpress_GEM5_V1,self)._on_chip_devices() + [
+ return super(VExpress_GEM5_V1_HDLcd,self)._on_chip_devices() + [
self.hdlcd,
]
@@ -1327,11 +1334,18 @@
cur_sys, boot_loader)
class VExpress_GEM5_V2(VExpress_GEM5_V2_Base):
+ """
+ We subclass VExpress_GEM5_V2_Base in order to alias it to
+ VExpress_GEM5_V2, which is what gem5 scripts are currently using
+ """
+ pass
+
+class VExpress_GEM5_V2_HDLcd(VExpress_GEM5_V2_Base):
hdlcd = HDLcd(pxl_clk=VExpress_GEM5_V2_Base.dcc.osc_pxl,
pio_addr=0x2b000000, interrupt=ArmSPI(num=95))
def _on_chip_devices(self):
- return super(VExpress_GEM5_V2,self)._on_chip_devices() + [
+ return super(VExpress_GEM5_V2_HDLcd,self)._on_chip_devices() + [
self.hdlcd,
]
diff --git a/system/arm/dt/Makefile b/system/arm/dt/Makefile
index fb7ac30..8332f76 100644
--- a/system/arm/dt/Makefile
+++ b/system/arm/dt/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2016, 2019-2020 ARM Limited
+# Copyright (c) 2015-2016, 2019-2021 ARM Limited
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -36,21 +36,34 @@
TARGET_PREFIX=\
armv7_gem5_v1 \
armv8_gem5_v1 \
- armv8_gem5_v2
+ armv8_gem5_v2 \
+ armv7_gem5_v1_hdlcd \
+ armv8_gem5_v1_hdlcd \
+ armv8_gem5_v2_hdlcd
TARGETS=\
$(foreach prefix, $(TARGET_PREFIX), $(call CREATE_TARGET, $(prefix))) \
armv8_gem5_v1_big_little_2_2.dtb \
armv8_gem5_v1_big_little_2_4.dtb \
armv8_gem5_v2_big_little_2_2.dtb \
- armv8_gem5_v2_big_little_2_4.dtb
+ armv8_gem5_v2_big_little_2_4.dtb \
+ armv8_gem5_v1_hdlcd_big_little_2_2.dtb \
+ armv8_gem5_v1_hdlcd_big_little_2_4.dtb \
+ armv8_gem5_v2_hdlcd_big_little_2_2.dtb \
+ armv8_gem5_v2_hdlcd_big_little_2_4.dtb
VEXPRESS_GEM5_V1_DTSIS=\
- platforms/vexpress_gem5_v1.dtsi \
+ platforms/vexpress_gem5_v1_base.dtsi
+
+VEXPRESS_GEM5_V1_HDLCD_DTSIS=\
+ platforms/vexpress_gem5_v1_hdlcd.dtsi \
platforms/vexpress_gem5_v1_base.dtsi
VEXPRESS_GEM5_V2_DTSIS=\
- platforms/vexpress_gem5_v2.dtsi \
+ platforms/vexpress_gem5_v2_base.dtsi
+
+VEXPRESS_GEM5_V2_HDLCD_DTSIS=\
+ platforms/vexpress_gem5_v2_hdlcd.dtsi \
platforms/vexpress_gem5_v2_base.dtsi
GEN_DTS=mkdir -p .gen; \
@@ -62,22 +75,45 @@
all: $(TARGETS)
-.gen/armv7_gem5_v1_%cpu.dts: armv7.dts $(VEXPRESS_GEM5_V1_DTSIS)
- $(call GEN_DTS,vexpress_gem5_v1.dtsi,$*)
+.gen/armv7_gem5_v1_%cpu.dts: armv7.dts \
+ $(VEXPRESS_GEM5_V1_DTSIS)
+ $(call GEN_DTS,vexpress_gem5_v1_base.dtsi,$*)
-.gen/armv8_gem5_v1_%cpu.dts: armv8.dts $(VEXPRESS_GEM5_V1_DTSIS)
- $(call GEN_DTS,vexpress_gem5_v1.dtsi,$*)
+.gen/armv7_gem5_v1_hdlcd_%cpu.dts: armv7.dts \
+ $(VEXPRESS_GEM5_V1_HDLCD_DTSIS)
+ $(call GEN_DTS,vexpress_gem5_v1_hdlcd.dtsi,$*)
-.gen/armv8_gem5_v2_%cpu.dts: armv8.dts $(VEXPRESS_GEM5_V2_DTSIS)
- $(call GEN_DTS,vexpress_gem5_v2.dtsi,$*)
+.gen/armv8_gem5_v1_%cpu.dts: armv8.dts \
+ $(VEXPRESS_GEM5_V1_DTSIS)
+ $(call GEN_DTS,vexpress_gem5_v1_base.dtsi,$*)
+
+.gen/armv8_gem5_v1_hdlcd_%cpu.dts: armv8.dts \
+ $(VEXPRESS_GEM5_V1_HDLCD_DTSIS)
+ $(call GEN_DTS,vexpress_gem5_v1_hdlcd.dtsi,$*)
+
+.gen/armv8_gem5_v2_%cpu.dts: armv8.dts \
+ $(VEXPRESS_GEM5_V2_DTSIS)
+ $(call GEN_DTS,vexpress_gem5_v2_base.dtsi,$*)
+
+.gen/armv8_gem5_v2_hdlcd_%cpu.dts: armv8.dts \
+ $(VEXPRESS_GEM5_V2_HDLCD_DTSIS)
+ $(call GEN_DTS,vexpress_gem5_v2_hdlcd.dtsi,$*)
.gen/armv8_gem5_v1_big_little%.dts: armv8_big_little.dts \
$(VEXPRESS_GEM5_V1_DTSIS)
- $(call GEN_DTS,vexpress_gem5_v1.dtsi,$*)
+ $(call GEN_DTS,vexpress_gem5_v1_base.dtsi,$*)
+
+.gen/armv8_gem5_v1_hdlcd_big_little%.dts: armv8_big_little.dts \
+ $(VEXPRESS_GEM5_V1_HDLCD_DTSIS)
+ $(call GEN_DTS,vexpress_gem5_v1_hdlcd.dtsi,$*)
.gen/armv8_gem5_v2_big_little%.dts: armv8_big_little.dts \
$(VEXPRESS_GEM5_V2_DTSIS)
- $(call GEN_DTS,vexpress_gem5_v2.dtsi,$*)
+ $(call GEN_DTS,vexpress_gem5_v2_base.dtsi,$*)
+
+.gen/armv8_gem5_v2_hdlcd_big_little%.dts: armv8_big_little.dts \
+ $(VEXPRESS_GEM5_V2_HDLCD_DTSIS)
+ $(call GEN_DTS,vexpress_gem5_v2_hdlcd.dtsi,$*)
%.dtb: .gen/%.dts
$(DTC) -I dts -O dtb -o $@ $<
diff --git a/system/arm/dt/platforms/vexpress_gem5_v1.dtsi
b/system/arm/dt/platforms/vexpress_gem5_v1_hdlcd.dtsi
similarity index 100%
rename from system/arm/dt/platforms/vexpress_gem5_v1.dtsi
rename to system/arm/dt/platforms/vexpress_gem5_v1_hdlcd.dtsi
diff --git a/system/arm/dt/platforms/vexpress_gem5_v2.dtsi
b/system/arm/dt/platforms/vexpress_gem5_v2_hdlcd.dtsi
similarity index 100%
rename from system/arm/dt/platforms/vexpress_gem5_v2.dtsi
rename to system/arm/dt/platforms/vexpress_gem5_v2_hdlcd.dtsi
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/38796
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: I4b1920efe764080115a57f52d8a3df2e6e2386a0
Gerrit-Change-Number: 38796
Gerrit-PatchSet: 4
Gerrit-Owner: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Adrian Herrera <adrian.herr...@arm.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
