Support disabling TCG on ARM (part 2)
Subsystems (2)
v6 cover Support disabling TCG on ARM (part 2)
Cover from Samuel Ortiz from (part 1) [1]:
This patchset allows for building and running ARM targets with TCG disabled. [...]
The rationale behind this work comes from the NEMU project where we're trying to only support x86 and ARM 64-bit architectures, without including the TCG code base. We can only do so if we can build and run ARM binaries with TCG disabled.
Peter mentioned in v5 [6] that since 32-bit host has been removed, we have to remove v7 targets. This is not done in this series, as linking succeeds, and there is enough material to review (no need to spend time on that extra patch if the current approach is not accepted).
CI: https://gitlab.com/philmd/qemu/-/pipelines/249272441
v6:
- rebased on "target/arm/Kconfig" series
- introduce/use tcg_builtin() for realview machines
v5:
- addressed Paolo/Richard/Thomas review comments from v4 [5].
v4 almost 2 years later... [2]:
- Rebased on Meson
- Addressed Richard review comments
- Addressed Claudio review comments
v3 almost 18 months later [3]:
- Rebased
- Addressed Thomas review comments
- Added Travis-CI job to keep building --disable-tcg on ARM
v2 [4]:
- Addressed review comments from Richard and Thomas from v1 [1]
Regards,
Phil.
[1]: https://lists.gnu.org/archive/html/qemu-devel/2018-11/msg02451.html
[2]: https://www.mail-archive.com/[email protected]/msg689168.html
[3]: https://www.mail-archive.com/[email protected]/msg641796.html
[4]: https://lists.gnu.org/archive/html/qemu-devel/2019-08/msg05003.html
[5]: https://www.mail-archive.com/[email protected]/msg746041.html
[6]: https://www.mail-archive.com/[email protected]/msg777669.html
Based-on: <[email protected]>
"target: Provide target-specific Kconfig"
Philippe Mathieu-Daudé (9):
sysemu/tcg: Introduce tcg_builtin() helper
exec: Restrict TCG specific headers target/arm: Restrict ARMv4 cpus to TCG accel target/arm: Restrict ARMv5 cpus to TCG accel target/arm: Restrict ARMv6 cpus to TCG accel target/arm: Restrict ARMv7 R-profile cpus to TCG accel target/arm: Restrict ARMv7 M-profile cpus to TCG accel target/arm: Reorder meson.build rules .travis.yml: Add a KVM-only Aarch64 job
Samuel Ortiz (1):
target/arm: Do not build TCG objects when TCG is off
Thomas Huth (1):
target/arm: Make m_helper.c optional via CONFIG_ARM_V7M
default-configs/devices/aarch64-softmmu.mak | 1 - default-configs/devices/arm-softmmu.mak | 27 -------- include/exec/helper-proto.h | 2 + include/sysemu/tcg.h | 2 + target/arm/cpu.h | 12 ---- hw/arm/realview.c | 7 +- target/arm/cpu_tcg.c | 4 +- target/arm/helper.c | 7 -- target/arm/m_helper-stub.c | 73 +++++++++++++++++++++ tests/qtest/cdrom-test.c | 6 +- .travis.yml | 32 +++++++++ hw/arm/Kconfig | 38 +++++++++++ target/arm/Kconfig | 17 +++++ target/arm/meson.build | 28 +++++--- 14 files changed, 196 insertions(+), 60 deletions(-) create mode 100644 target/arm/m_helper-stub.c
Signature · 1 line
2.26.2
PATCH v6 1/11 sysemu/tcg: Introduce tcg_builtin() helper
Modules are registered early with type_register_static().
We would like to call tcg_enabled() when registering QOM types, but tcg_enabled() returns tcg_allowed which is a runtime property initialized later (See commit 2f181fbd5a9 which introduced the MachineInitPhase in "hw/qdev-core.h" representing the different phases of machine initialization and commit 0427b6257e2 which document the initialization order).
As we are only interested if the TCG accelerator is builtin, regardless of being enabled, introduce the tcg_builtin() helper.
---
Cc: Markus Armbruster <[email protected]>
--- include/sysemu/tcg.h | 2 ++ 1 file changed, 2 insertions(+)
include/sysemu/tcg.h +2 -0
@@ -13,8 +13,10 @@ void tcg_exec_init(unsigned long tb_size, int splitwx);#ifdef CONFIG_TCG extern bool tcg_allowed;#define tcg_enabled () (tcg_allowed) +#define tcg_builtin () 1#else #define tcg_enabled () 0 +#define tcg_builtin () 0#endif #endif
Signature · 1 line
2.26.2
Re: [PATCH v6 01/11] sysemu/tcg: Introduce tcg_builtin() helper
Quoted 3 lines · Philippe Mathieu-Daudé
Modules are registered early with
type_register_static().We would like to call
tcg_enabled()when registering QOM types,
Hi Philippe,
could this not be controlled by meson at this stage?
On X86, I register the tcg-specific types in tcg/* in modules that are only built for TCG.
Maybe tcg_builtin() is useful anyway, thinking long term at loadable modules,
but there we are interested in whether tcg code is available or not, regardless of whether it's builtin, or needs to be loaded via a .so plugin..
maybe tcg_available()?
Ciao,
Claudio
Quoted 32 lines
but
tcg_enabled()returnstcg_allowedwhich is a runtime property initialized later (See commit2f181fbd5a9which introduced the MachineInitPhase in "hw/qdev-core.h" representing the different phases of machine initialization and commit0427b6257e2which document the initialization order).As we are only interested if the TCG accelerator is builtin, regardless of being enabled, introduce the
tcg_builtin()helper.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Cc: Markus Armbruster <[email protected]>--- include/sysemu/tcg.h | 2 ++ 1 file changed, 2 insertions(+)include/sysemu/tcg.h +2
-0@@ -13,8 +13,10 @@ void tcg_exec_init(unsigned long tb_size, int splitwx);#ifdef CONFIG_TCG extern bool tcg_allowed;#define tcg_enabled () (tcg_allowed) +#define tcg_builtin () 1#else #define tcg_enabled () 0 +#define tcg_builtin () 0#endif #endif
Re: [PATCH v6 01/11] sysemu/tcg: Introduce tcg_builtin() helper
Quoted 8 lines · Claudio Fontana
Quoted 3 lines · Philippe Mathieu-Daudé
Modules are registered early with
type_register_static().We would like to call
tcg_enabled()when registering QOM types,Hi Philippe,
Quoted 8 lines
could this not be controlled by meson at this stage?
On X86, I register the tcg-specific types in tcg/* in modules that are only built for TCG.Maybe
tcg_builtin()is useful anyway, thinking long term at loadable modules,
but there we are interested in whether tcg code is available or not, regardless of whether it's builtin, or needs to be loaded via a .so plugin..maybe
tcg_available()?
The alternatives I found:
- reorder things in vl.c?
- use ugly #ifdef'ry, see this patch:
https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg08037.html
- this earlier approach I previously discarded:
-- >8 --
include/qom/object.h +5 -1
@@ -403,9 +403,12 @@ struct Object* parent class initialization has occurred, but before the class itself * is initialized. This is the function to use to undo the effects of * memcpy from the parent class to the descendants. -* @class_data: Data to pass to the @class_init, +* @class_data: Data to pass to the @class_registerable, @class_init, * @class_base_init. This can be useful when building dynamic * classes. +* @registerable: This function is called when modules are registered, +* prior to any class initialization. When present and returning %false, +* the type is not registered, the class is not present (not usable). * @interfaces: The list of interfaces associated with this type. This * should point to a static array that's terminated with a zero filled * element.
@@ -428,6 +431,7 @@ struct TypeInfovoid (*class_base_init)(ObjectClass *klass,void *data);void *class_data; +bool (*registerable)(void *data);InterfaceInfo *interfaces; };
qom/object.c +4 -0
@@ -138,6 +138,10 @@ static TypeImpl *type_new(const TypeInfo *info)static TypeImpl *type_register_internal (const TypeInfo *info) {TypeImpl *ti; + +if (info->registerable && !info->registerable (info->class_data)) { +return NULL ; + } ti =type_new (info);type_table_add (ti);
hw/arm/raspi.c +1 -0
@@ -24,6 +24,7 @@#include "hw/loader.h" #include "hw/arm/boot.h" #include "sysemu/sysemu.h" +#include "sysemu/tcg.h" #include "qom/object.h" #define SMPBOOT_ADDR 0x300/* this should leave enough space for
ATAGS */
@@ -368,18 +369,26 @@ static void raspi3b_machine_class_init(ObjectClass *oc, void *data)
};
#endif /* TARGET_AARCH64 */
+static bool raspi_machine_requiring_tcg_accel(void *data) +{
+ return tcg_builtin();
+}
+
static const TypeInfo raspi_machine_types[] = {
{
.name = MACHINE_TYPE_NAME("raspi0"),
.parent = TYPE_RASPI_MACHINE,
+ .registerable = raspi_machine_requiring_tcg_accel,
.class_init = raspi0_machine_class_init,
}, {
.name = MACHINE_TYPE_NAME("raspi1ap"),
.parent = TYPE_RASPI_MACHINE,
+ .registerable = raspi_machine_requiring_tcg_accel,
.class_init = raspi1ap_machine_class_init,
}, {
.name = MACHINE_TYPE_NAME("raspi2b"),
.parent = TYPE_RASPI_MACHINE,
+ .registerable = raspi_machine_requiring_tcg_accel,
.class_init = raspi2b_machine_class_init,
#ifdef TARGET_AARCH64
}, {---
Quoted 38 lines
Ciao,
Claudio
Quoted 32 lines
but
tcg_enabled()returnstcg_allowedwhich is a runtime property initialized later (See commit2f181fbd5a9which introduced the MachineInitPhase in "hw/qdev-core.h" representing the different phases of machine initialization and commit0427b6257e2which document the initialization order).As we are only interested if the TCG accelerator is builtin, regardless of being enabled, introduce the
tcg_builtin()helper.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Cc: Markus Armbruster <[email protected]>--- include/sysemu/tcg.h | 2 ++ 1 file changed, 2 insertions(+)include/sysemu/tcg.h +2
-0@@ -13,8 +13,10 @@ void tcg_exec_init(unsigned long tb_size, int splitwx);#ifdef CONFIG_TCG extern bool tcg_allowed;#define tcg_enabled () (tcg_allowed) +#define tcg_builtin () 1#else #define tcg_enabled () 0 +#define tcg_builtin () 0#endif #endif
Re: [PATCH v6 01/11] sysemu/tcg: Introduce tcg_builtin() helper
Quoted 16 lines · Philippe Mathieu-Daudé
Quoted 15 lines · Claudio Fontana
Quoted 3 lines · Philippe Mathieu-Daudé
Modules are registered early with
type_register_static().We would like to call
tcg_enabled()when registering QOM types,Hi Philippe,
could this not be controlled by meson at this stage?
On X86, I register the tcg-specific types in tcg/* in modules that are only built for TCG.Maybe
tcg_builtin()is useful anyway, thinking long term at loadable modules,
but there we are interested in whether tcg code is available or not, regardless of whether it's builtin, or needs to be loaded via a .so plugin..
Quoted 8 lines
Quoted 1 line
maybe
tcg_available()?The alternatives I found:
- reorder things in
vl.c?- use ugly #ifdef'ry, see this patch:
https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg08037.html
Not sure it's that ugly,
if it is followed (or replaced by) exporting those pieces to separate files, which are only built by meson on CONFIG_TCG.
I did not try to do it, so you know best of course.
Ciao,
Claudio
Quoted 128 lines
- this earlier approach I previously discarded:
-- >8 --
include/qom/object.h +5
-1@@ -403,9 +403,12 @@ struct Object* parent class initialization has occurred, but before the class itself * is initialized. This is the function to use to undo the effects of * memcpy from the parent class to the descendants. -* @class_data: Data to pass to the @class_init, +* @class_data: Data to pass to the @class_registerable, @class_init, * @class_base_init. This can be useful when building dynamic * classes. +* @registerable: This function is called when modules are registered, +* prior to any class initialization. When present and returning %false, +* the type is not registered, the class is not present (not usable). * @interfaces: The list of interfaces associated with this type. This * should point to a static array that's terminated with a zero filled * element. @@ -428,6 +431,7 @@ struct TypeInfovoid (*class_base_init)(ObjectClass *klass,void *data);void *class_data; +bool (*registerable)(void *data);InterfaceInfo *interfaces; };qom/object.c +4
-0@@ -138,6 +138,10 @@ static TypeImpl *type_new(const TypeInfo *info)static TypeImpl *type_register_internal (const TypeInfo *info) {TypeImpl *ti; + +if (info->registerable && !info->registerable (info->class_data)) { +return NULL ; + } ti =type_new (info);type_table_add (ti);hw/arm/raspi.c +1
-0@@ -24,6 +24,7 @@#include "hw/loader.h" #include "hw/arm/boot.h" #include "sysemu/sysemu.h" +#include "sysemu/tcg.h" #include "qom/object.h" #define SMPBOOT_ADDR 0x300/* this should leave enough space for ATAGS */
hw/arm/raspi.c +8
-0@@ -368,18 +369,26 @@ static void raspi3b_machine_class_init(ObjectClass *oc, void *data) };#endif /* TARGET_AARCH64 */ +static bool raspi_machine_requiring_tcg_accel (void *data) +{ +return tcg_builtin (); +} +static const TypeInfo raspi_machine_types[] = { { .name =MACHINE_TYPE_NAME ("raspi0" ), .parent =TYPE_RASPI_MACHINE , + .registerable = raspi_machine_requiring_tcg_accel, .class_init = raspi0_machine_class_init, }, { .name =MACHINE_TYPE_NAME ("raspi1ap" ), .parent =TYPE_RASPI_MACHINE , + .registerable = raspi_machine_requiring_tcg_accel, .class_init = raspi1ap_machine_class_init, }, { .name =MACHINE_TYPE_NAME ("raspi2b" ), .parent =TYPE_RASPI_MACHINE , + .registerable = raspi_machine_requiring_tcg_accel, .class_init = raspi2b_machine_class_init, #ifdef TARGET_AARCH64}, {---
Quoted 38 lines
Ciao,
Claudio
Quoted 32 lines
but
tcg_enabled()returnstcg_allowedwhich is a runtime property initialized later (See commit2f181fbd5a9which introduced the MachineInitPhase in "hw/qdev-core.h" representing the different phases of machine initialization and commit0427b6257e2which document the initialization order).As we are only interested if the TCG accelerator is builtin, regardless of being enabled, introduce the
tcg_builtin()helper.Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Cc: Markus Armbruster <[email protected]>--- include/sysemu/tcg.h | 2 ++ 1 file changed, 2 insertions(+)include/sysemu/tcg.h +2
-0@@ -13,8 +13,10 @@ void tcg_exec_init(unsigned long tb_size, int splitwx);#ifdef CONFIG_TCG extern bool tcg_allowed;#define tcg_enabled () (tcg_allowed) +#define tcg_builtin () 1#else #define tcg_enabled () 0 +#define tcg_builtin () 0#endif #endif
PATCH v6 2/11 exec: Restrict TCG specific headers
In reply to Philippe Mathieu-DaudéFixes when building with --disable-tcg on ARM:
In file included from target/arm/helper.c:16:
include/exec/helper-proto.h:42:10: fatal error: tcg-runtime.h: No such file or directory
42 | #include "tcg-runtime.h"
| ^~~~~~~~~~~~~~~--- include/exec/helper-proto.h | 2 ++ 1 file changed, 2 insertions(+)
include/exec/helper-proto.h +2 -0
@@ -39,8 +39,10 @@ dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \#include "helper.h" #include "trace/generated-helpers.h" +#ifdef CONFIG_TCG #include "tcg-runtime.h" #include "plugin-helpers.h" +#endif /* CONFIG_TCG */ #undef IN_HELPER_PROTO
Signature · 1 line
2.26.2
Re: [PATCH v6 02/11] exec: Restrict TCG specific headers
Quoted 18 lines · Philippe Mathieu-Daudé
Fixes when building with --disable-tcg on ARM:
In file included from
target/arm/helper.c:16:
include/exec/helper-proto.h:42:10: fatal error:tcg-runtime.h: No such file or directory42 | #include "tcg-runtime.h" | ^~~~~~~~~~~~~~~Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/exec/helper-proto.h | 2 ++ 1 file changed, 2 insertions(+)include/exec/helper-proto.h +0
-0
include/exec/helper-proto.h dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \ · line 48
Quoted 10 lines
include/exec/helper-proto.h +2
-0@@ -39,8 +39,10 @@ dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \#include "helper.h" #include "trace/generated-helpers.h" +#ifdef CONFIG_TCG #include "tcg-runtime.h" #include "plugin-helpers.h" +#endif /* CONFIG_TCG */ #undef IN_HELPER_PROTO
Ok, this would go away when applying the refactoring to ARM though right?
Ie the file should not need including at all later on right?
Anyway:
Re: [PATCH v6 02/11] exec: Restrict TCG specific headers
In reply to Philippe Mathieu-DaudéQuoted 6 lines · Philippe Mathieu-Daudé
Fixes when building with --disable-tcg on ARM:
In file included from
target/arm/helper.c:16:
include/exec/helper-proto.h:42:10: fatal error:tcg-runtime.h: No such file or directory42 | #include "tcg-runtime.h" | ^~~~~~~~~~~~~~~
I think the problem here is that we have stuff in helper.c which is needed by non-TCG builds.
Quoted 11 lines
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- include/exec/helper-proto.h | 2 ++ 1 file changed, 2 insertions(+)include/exec/helper-proto.h +0
-0
include/exec/helper-proto.h dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \ · line 45
Quoted 7 lines
include/exec/helper-proto.h +2
-0@@ -39,8 +39,10 @@ dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \#include "helper.h" #include "trace/generated-helpers.h" +#ifdef CONFIG_TCG #include "tcg-runtime.h" #include "plugin-helpers.h" +#endif /* CONFIG_TCG */
If we are including helper-proto.h then we are defining helpers which are (should be) TCG only.
Quoted 2 lines
include/exec/helper-proto.h +0
-0#undef IN_HELPER_PROTO
Signature · 1 line
Alex Bennée
PATCH v6 3/11 target/arm: Restrict ARMv4 cpus to TCG accel
In reply to Philippe Mathieu-DaudéKVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit 82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").
Only enable the following ARMv4 CPUs when TCG is available:
- StrongARM (SA1100/1110)
- OMAP1510 (TI925T)
The following machines are no more built when TCG is disabled:
- cheetah Palm Tungsten|E aka. Cheetah PDA (OMAP310) - sx1 Siemens SX1 (OMAP310) V2 - sx1-v1 Siemens SX1 (OMAP310) V1
--- default-configs/devices/arm-softmmu.mak | 2 -- hw/arm/Kconfig | 4 ++++ target/arm/Kconfig | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-)
default-configs/devices/arm-softmmu.mak +0 -2
@@ -14,8 +14,6 @@ CONFIG_INTEGRATOR=y CONFIG_FSL_IMX31=y CONFIG_MUSICPAL=y CONFIG_MUSCA=y -CONFIG_CHEETAH=y -CONFIG_SX1=y CONFIG_NSERIES=y CONFIG_STELLARIS=y CONFIG_REALVIEW=y
hw/arm/Kconfig +4 -0
@@ -31,6 +31,8 @@ config ARM_VIRT config CHEETAH bool + default y if TCG && ARM + select ARM_V4 select OMAP select TSC210X
@@ -249,6 +251,8 @@ config COLLIE config SX1 bool + default y if TCG && ARM + select ARM_V4 select OMAP config VERSATILE
target/arm/Kconfig +4 -0
@@ -6,6 +6,10 @@ config AARCH64 bool select ARM +config ARM_V4 + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER
Signature · 1 line
2.26.2
Re: [PATCH v6 03/11] target/arm: Restrict ARMv4 cpus to TCG accel
Quoted 63 lines · Philippe Mathieu-Daudé
KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit
82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").Only enable the following ARMv4 CPUs when TCG is available:
- StrongARM (SA1100/1110)
- OMAP1510 (TI925T)The following machines are no more built when TCG is disabled:
- cheetah Palm Tungsten|E aka. Cheetah PDA (OMAP310) - sx1 Siemens SX1 (OMAP310) V2 - sx1-v1 Siemens SX1 (OMAP310) V1Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/devices/arm-softmmu.mak | 2 -- hw/arm/Kconfig | 4 ++++ target/arm/Kconfig | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-)default-configs/devices/arm-softmmu.mak +0
-2@@ -14,8 +14,6 @@ CONFIG_INTEGRATOR=y CONFIG_FSL_IMX31=y CONFIG_MUSICPAL=y CONFIG_MUSCA=y -CONFIG_CHEETAH=y -CONFIG_SX1=y CONFIG_NSERIES=y CONFIG_STELLARIS=y CONFIG_REALVIEW=yhw/arm/Kconfig +4
-0@@ -31,6 +31,8 @@ config ARM_VIRT config CHEETAH bool + default y if TCG && ARM + select ARM_V4 select OMAP select TSC210X@@ -249,6 +251,8 @@ config COLLIE config SX1 bool + default y if TCG && ARM + select ARM_V4 select OMAP config VERSATILEtarget/arm/Kconfig +0
-0
target/arm/Kconfig config AARCH64 · line 15
Quoted 10 lines
target/arm/Kconfig +4
-0@@ -6,6 +6,10 @@ config AARCH64 bool select ARM +config ARM_V4 + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER
Looks good to me
Re: [PATCH v6 03/11] target/arm: Restrict ARMv4 cpus to TCG accel
In reply to Philippe Mathieu-DaudéQuoted 9 lines · Philippe Mathieu-Daudé
KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit
82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").Only enable the following ARMv4 CPUs when TCG is available:
- StrongARM (SA1100/1110)
- OMAP1510 (TI925T)
Quoted 7 lines
The following machines are no more built when TCG is disabled:
- cheetah Palm Tungsten|E aka. Cheetah PDA (OMAP310) - sx1 Siemens SX1 (OMAP310) V2 - sx1-v1 Siemens SX1 (OMAP310) V1Signed-off-by Philippe Mathieu-Daudé <[email protected]>
Signature · 1 line
Alex Bennée
Re: [PATCH v6 03/11] target/arm: Restrict ARMv4 cpus to TCG accel
In reply to Philippe Mathieu-DaudéHi,
I am trying to take these patches,
in the hope that they help with some of the test issues I am having with the kvm-only build,
but they fail with:
target/arm/Kconfig: does not exist in index
so I guess I need the "target/arm/Kconfig" series right, how can I find that one?
Thanks,
Claudio
Quoted 73 lines · Philippe Mathieu-Daudé
KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit
82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").Only enable the following ARMv4 CPUs when TCG is available:
- StrongARM (SA1100/1110)
- OMAP1510 (TI925T)The following machines are no more built when TCG is disabled:
- cheetah Palm Tungsten|E aka. Cheetah PDA (OMAP310) - sx1 Siemens SX1 (OMAP310) V2 - sx1-v1 Siemens SX1 (OMAP310) V1Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/devices/arm-softmmu.mak | 2 -- hw/arm/Kconfig | 4 ++++ target/arm/Kconfig | 4 ++++ 3 files changed, 8 insertions(+), 2 deletions(-)default-configs/devices/arm-softmmu.mak +0
-2@@ -14,8 +14,6 @@ CONFIG_INTEGRATOR=y CONFIG_FSL_IMX31=y CONFIG_MUSICPAL=y CONFIG_MUSCA=y -CONFIG_CHEETAH=y -CONFIG_SX1=y CONFIG_NSERIES=y CONFIG_STELLARIS=y CONFIG_REALVIEW=yhw/arm/Kconfig +4
-0@@ -31,6 +31,8 @@ config ARM_VIRT config CHEETAH bool + default y if TCG && ARM + select ARM_V4 select OMAP select TSC210X@@ -249,6 +251,8 @@ config COLLIE config SX1 bool + default y if TCG && ARM + select ARM_V4 select OMAP config VERSATILEtarget/arm/Kconfig +4
-0@@ -6,6 +6,10 @@ config AARCH64 bool select ARM +config ARM_V4 + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER
Re: [PATCH v6 03/11] target/arm: Restrict ARMv4 cpus to TCG accel
Quoted 10 lines · Claudio Fontana
Hi,
I am trying to take these patches,
in the hope that they help with some of the test issues I am having with the kvm-only build,but they fail with:
target/arm/Kconfig: does not exist in index
so I guess I need the "target/arm/Kconfig" series right, how can I find that one?
See the Based-on in the cover ;)
https://www.mail-archive.com/[email protected]/msg79924.html
Regards,
Phil.
PATCH v6 4/11 target/arm: Restrict ARMv5 cpus to TCG accel
In reply to Philippe Mathieu-DaudéKVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit 82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").
Only enable the following ARMv5 CPUs when TCG is available:
- ARM926
- ARM946
- ARM1026
- XScale (PXA250/255/260/261/262/270)
The following machines are no more built when TCG is disabled:
- akita Sharp SL-C1000 (Akita) PDA (PXA270) - ast2500-evb Aspeed AST2500 EVB (ARM1176) - ast2600-evb Aspeed AST2600 EVB (Cortex A7) - borzoi Sharp SL-C3100 (Borzoi) PDA (PXA270) - canon-a1100 Canon PowerShot A1100 IS (ARM946) - collie Sharp SL-5500 (Collie) PDA (SA-1110) - connex Gumstix Connex (PXA255) - g220a-bmc Bytedance G220A BMC (ARM1176) - imx25-pdk ARM i.MX25 PDK board (ARM926) - integratorcp ARM Integrator/CP (ARM926EJ-S) - mainstone Mainstone II (PXA27x) - musicpal Marvell 88w8618 / MusicPal (ARM926EJ-S) - palmetto-bmc OpenPOWER Palmetto BMC (ARM926EJ-S) - realview-eb ARM RealView Emulation Baseboard (ARM926EJ-S) - romulus-bmc OpenPOWER Romulus BMC (ARM1176) - sonorapass-bmc OCP SonoraPass BMC (ARM1176) - spitz Sharp SL-C3000 (Spitz) PDA (PXA270) - supermicrox11-bmc Supermicro X11 BMC (ARM926EJ-S) - swift-bmc OpenPOWER Swift BMC (ARM1176) - tacoma-bmc OpenPOWER Tacoma BMC (Cortex A7) - terrier Sharp SL-C3200 (Terrier) PDA (PXA270) - tosa Sharp SL-6000 (Tosa) PDA (PXA255) - verdex Gumstix Verdex (PXA270) - versatileab ARM Versatile/AB (ARM926EJ-S) - versatilepb ARM Versatile/PB (ARM926EJ-S) - witherspoon-bmc OpenPOWER Witherspoon BMC (ARM1176) - z2 Zipit Z2 (PXA27x)
--- default-configs/devices/arm-softmmu.mak | 12 ------------ hw/arm/realview.c | 5 ++++- tests/qtest/cdrom-test.c | 6 +++++- hw/arm/Kconfig | 19 +++++++++++++++++++ target/arm/Kconfig | 4 ++++ 5 files changed, 32 insertions(+), 14 deletions(-)
default-configs/devices/arm-softmmu.mak +0 -12
@@ -10,33 +10,21 @@ CONFIG_ARM_VIRT=y CONFIG_CUBIEBOARD=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y -CONFIG_INTEGRATOR=y CONFIG_FSL_IMX31=y -CONFIG_MUSICPAL=y CONFIG_MUSCA=y CONFIG_NSERIES=y CONFIG_STELLARIS=y CONFIG_REALVIEW=y -CONFIG_VERSATILE=y CONFIG_VEXPRESS=y CONFIG_ZYNQ=y -CONFIG_MAINSTONE=y -CONFIG_GUMSTIX=y -CONFIG_SPITZ=y -CONFIG_TOSA=y -CONFIG_Z2=y CONFIG_NPCM7XX=y -CONFIG_COLLIE=y -CONFIG_ASPEED_SOC=y CONFIG_NETDUINO2=y CONFIG_NETDUINOPLUS2=y CONFIG_MPS2=y CONFIG_RASPI=y -CONFIG_DIGIC=y CONFIG_SABRELITE=y CONFIG_EMCRAFT_SF2=y CONFIG_MICROBIT=y -CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y CONFIG_ALLWINNER_H3=y
hw/arm/realview.c +4 -1
@@ -18,6 +18,7 @@#include "hw/pci/pci.h" #include "net/net.h" #include "sysemu/sysemu.h" +#include "sysemu/tcg.h" #include "hw/boards.h" #include "hw/i2c/i2c.h" #include "exec/address-spaces.h"
@@ -460,7 +461,9 @@ static const TypeInfo realview_pbx_a9_type = {static void realview_machine_init (void ) { -type_register_static (&realview_eb_type); +if (tcg_builtin ()) { +type_register_static (&realview_eb_type); + }type_register_static (&realview_eb_mpcore_type);type_register_static (&realview_pb_a8_type);type_register_static (&realview_pbx_a9_type);
tests/qtest/cdrom-test.c +5 -1
@@ -222,7 +222,11 @@ int main(int argc, char **argv)add_cdrom_param_tests (mips64machines); }else if (g_str_equal (arch,"arm" ) ||g_str_equal (arch,"aarch64" )) {const char *armmachines[] = { -"realview-eb" ,"realview-eb-mpcore" ,"realview-pb-a8" , +#ifdef CONFIG_TCG +"realview-eb" , +#endif /* CONFIG_TCG */ +"realview-eb-mpcore" , +"realview-pb-a8" ,"realview-pbx-a9" ,"versatileab" ,"versatilepb" ,"vexpress-a15" ,"vexpress-a9" ,"virt" ,NULL };
hw/arm/Kconfig +19 -0
@@ -42,6 +42,8 @@ config CUBIEBOARD config DIGIC bool + default y if TCG && ARM + select ARM_V5 select PTIMER select PFLASH_CFI02
@@ -72,6 +74,8 @@ config HIGHBANK config INTEGRATOR bool + default y if TCG && ARM + select ARM_V5 select ARM_TIMER select INTEGRATOR_DEBUG select PL011 # UART
@@ -84,6 +88,7 @@ config INTEGRATOR config MAINSTONE bool + default y if TCG && ARM select PXA2XX select PFLASH_CFI01 select SMC91C111
@@ -98,6 +103,8 @@ config MUSCA config MUSICPAL bool + default y if TCG && ARM + select ARM_V5 select OR_IRQ select BITBANG_I2C select MARVELL_88W8618
@@ -138,6 +145,7 @@ config OMAP config PXA2XX bool + select ARM_V5 select FRAMEBUFFER select I2C select SERIAL
@@ -147,12 +155,14 @@ config PXA2XX config GUMSTIX bool + default y if TCG && ARM select PFLASH_CFI01 select SMC91C111 select PXA2XX config TOSA bool + default y if TCG && ARM select ZAURUS # scoop select MICRODRIVE select PXA2XX
@@ -160,6 +170,7 @@ config TOSA config SPITZ bool + default y if TCG && ARM select ADS7846 # touch-screen controller select MAX111X # A/D converter select WM8750 # audio codec
@@ -172,6 +183,7 @@ config SPITZ config Z2 bool + default y if TCG && ARM select PFLASH_CFI01 select WM8750 select PL011 # UART
@@ -245,6 +257,7 @@ config STRONGARM config COLLIE bool + default y if TCG && ARM select PFLASH_CFI01 select ZAURUS # scoop select STRONGARM
@@ -257,6 +270,8 @@ config SX1 config VERSATILE bool + default y if TCG && ARM + select ARM_V5 select ARM_TIMER # sp804 select PFLASH_CFI01 select LSI_SCSI_PCI
@@ -376,6 +391,8 @@ config NPCM7XX config FSL_IMX25 bool + default y if TCG && ARM + select ARM_V5 select IMX select IMX_FEC select IMX_I2C
@@ -402,6 +419,8 @@ config FSL_IMX6 config ASPEED_SOC bool + default y if TCG && ARM + select ARM_V5 select DS1338 select FTGMAC100 select I2C
target/arm/Kconfig +4 -0
@@ -10,6 +10,10 @@ config ARM_V4 bool depends on TCG && ARM +config ARM_V5 + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER
Signature · 1 line
2.26.2
Re: [PATCH v6 04/11] target/arm: Restrict ARMv5 cpus to TCG accel
Quoted 247 lines · Philippe Mathieu-Daudé
KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit
82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").Only enable the following ARMv5 CPUs when TCG is available:
- ARM926
- ARM946
- ARM1026
- XScale (PXA250/255/260/261/262/270)The following machines are no more built when TCG is disabled:
- akita Sharp SL-C1000 (Akita) PDA (PXA270) - ast2500-evb Aspeed AST2500 EVB (ARM1176) - ast2600-evb Aspeed AST2600 EVB (Cortex A7) - borzoi Sharp SL-C3100 (Borzoi) PDA (PXA270) - canon-a1100 Canon PowerShot A1100 IS (ARM946) - collie Sharp SL-5500 (Collie) PDA (SA-1110) - connex Gumstix Connex (PXA255) - g220a-bmc Bytedance G220A BMC (ARM1176) - imx25-pdk ARM i.MX25 PDK board (ARM926) - integratorcp ARM Integrator/CP (ARM926EJ-S) - mainstone Mainstone II (PXA27x) - musicpal Marvell 88w8618 / MusicPal (ARM926EJ-S) - palmetto-bmc OpenPOWER Palmetto BMC (ARM926EJ-S) - realview-eb ARM RealView Emulation Baseboard (ARM926EJ-S) - romulus-bmc OpenPOWER Romulus BMC (ARM1176) - sonorapass-bmc OCP SonoraPass BMC (ARM1176) - spitz Sharp SL-C3000 (Spitz) PDA (PXA270) - supermicrox11-bmc Supermicro X11 BMC (ARM926EJ-S) - swift-bmc OpenPOWER Swift BMC (ARM1176) - tacoma-bmc OpenPOWER Tacoma BMC (Cortex A7) - terrier Sharp SL-C3200 (Terrier) PDA (PXA270) - tosa Sharp SL-6000 (Tosa) PDA (PXA255) - verdex Gumstix Verdex (PXA270) - versatileab ARM Versatile/AB (ARM926EJ-S) - versatilepb ARM Versatile/PB (ARM926EJ-S) - witherspoon-bmc OpenPOWER Witherspoon BMC (ARM1176) - z2 Zipit Z2 (PXA27x)Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/devices/arm-softmmu.mak | 12 ------------ hw/arm/realview.c | 5 ++++- tests/qtest/cdrom-test.c | 6 +++++- hw/arm/Kconfig | 19 +++++++++++++++++++ target/arm/Kconfig | 4 ++++ 5 files changed, 32 insertions(+), 14 deletions(-)default-configs/devices/arm-softmmu.mak +0
-12@@ -10,33 +10,21 @@ CONFIG_ARM_VIRT=y CONFIG_CUBIEBOARD=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y -CONFIG_INTEGRATOR=y CONFIG_FSL_IMX31=y -CONFIG_MUSICPAL=y CONFIG_MUSCA=y CONFIG_NSERIES=y CONFIG_STELLARIS=y CONFIG_REALVIEW=y -CONFIG_VERSATILE=y CONFIG_VEXPRESS=y CONFIG_ZYNQ=y -CONFIG_MAINSTONE=y -CONFIG_GUMSTIX=y -CONFIG_SPITZ=y -CONFIG_TOSA=y -CONFIG_Z2=y CONFIG_NPCM7XX=y -CONFIG_COLLIE=y -CONFIG_ASPEED_SOC=y CONFIG_NETDUINO2=y CONFIG_NETDUINOPLUS2=y CONFIG_MPS2=y CONFIG_RASPI=y -CONFIG_DIGIC=y CONFIG_SABRELITE=y CONFIG_EMCRAFT_SF2=y CONFIG_MICROBIT=y -CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y CONFIG_ALLWINNER_H3=yhw/arm/realview.c +4
-1@@ -18,6 +18,7 @@#include "hw/pci/pci.h" #include "net/net.h" #include "sysemu/sysemu.h" +#include "sysemu/tcg.h" #include "hw/boards.h" #include "hw/i2c/i2c.h" #include "exec/address-spaces.h" @@ -460,7 +461,9 @@ static const TypeInfo realview_pbx_a9_type = {static void realview_machine_init (void ) { -type_register_static (&realview_eb_type); +if (tcg_builtin ()) { +type_register_static (&realview_eb_type); + }type_register_static (&realview_eb_mpcore_type);type_register_static (&realview_pb_a8_type);type_register_static (&realview_pbx_a9_type);tests/qtest/cdrom-test.c +5
-1@@ -222,7 +222,11 @@ int main(int argc, char **argv)add_cdrom_param_tests (mips64machines); }else if (g_str_equal (arch,"arm" ) ||g_str_equal (arch,"aarch64" )) {const char *armmachines[] = { -"realview-eb" ,"realview-eb-mpcore" ,"realview-pb-a8" , +#ifdef CONFIG_TCG +"realview-eb" , +#endif /* CONFIG_TCG */ +"realview-eb-mpcore" , +"realview-pb-a8" ,"realview-pbx-a9" ,"versatileab" ,"versatilepb" ,"vexpress-a15" ,"vexpress-a9" ,"virt" ,NULL };hw/arm/Kconfig +19
-0@@ -42,6 +42,8 @@ config CUBIEBOARD config DIGIC bool + default y if TCG && ARM + select ARM_V5 select PTIMER select PFLASH_CFI02@@ -72,6 +74,8 @@ config HIGHBANK config INTEGRATOR bool + default y if TCG && ARM + select ARM_V5 select ARM_TIMER select INTEGRATOR_DEBUG select PL011 # UART@@ -84,6 +88,7 @@ config INTEGRATOR config MAINSTONE bool + default y if TCG && ARM select PXA2XX select PFLASH_CFI01 select SMC91C111@@ -98,6 +103,8 @@ config MUSCA config MUSICPAL bool + default y if TCG && ARM + select ARM_V5 select OR_IRQ select BITBANG_I2C select MARVELL_88W8618@@ -138,6 +145,7 @@ config OMAP config PXA2XX bool + select ARM_V5 select FRAMEBUFFER select I2C select SERIAL@@ -147,12 +155,14 @@ config PXA2XX config GUMSTIX bool + default y if TCG && ARM select PFLASH_CFI01 select SMC91C111 select PXA2XX config TOSA bool + default y if TCG && ARM select ZAURUS # scoop select MICRODRIVE select PXA2XX@@ -160,6 +170,7 @@ config TOSA config SPITZ bool + default y if TCG && ARM select ADS7846 # touch-screen controller select MAX111X # A/D converter select WM8750 # audio codec@@ -172,6 +183,7 @@ config SPITZ config Z2 bool + default y if TCG && ARM select PFLASH_CFI01 select WM8750 select PL011 # UART@@ -245,6 +257,7 @@ config STRONGARM config COLLIE bool + default y if TCG && ARM select PFLASH_CFI01 select ZAURUS # scoop select STRONGARM@@ -257,6 +270,8 @@ config SX1 config VERSATILE bool + default y if TCG && ARM + select ARM_V5 select ARM_TIMER # sp804 select PFLASH_CFI01 select LSI_SCSI_PCI@@ -376,6 +391,8 @@ config NPCM7XX config FSL_IMX25 bool + default y if TCG && ARM + select ARM_V5 select IMX select IMX_FEC select IMX_I2C@@ -402,6 +419,8 @@ config FSL_IMX6 config ASPEED_SOC bool + default y if TCG && ARM + select ARM_V5 select DS1338 select FTGMAC100 select I2Ctarget/arm/Kconfig +0
-0
target/arm/Kconfig config ARM_V4 · line 19
Quoted 10 lines
target/arm/Kconfig +4
-0@@ -10,6 +10,10 @@ config ARM_V4 bool depends on TCG && ARM +config ARM_V5 + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER
Looks good to me
PATCH v6 5/11 target/arm: Restrict ARMv6 cpus to TCG accel
In reply to Philippe Mathieu-DaudéKVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit 82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").
Only enable the following ARMv6 CPUs when TCG is available:
- ARM1136
- ARM1176
- ARM11MPCore
- Cortex-M0
The following machines are no more built when TCG is disabled:
- kzm ARM KZM Emulation Baseboard (ARM1136) - microbit BBC micro:bit (Cortex-M0) - n800 Nokia N800 tablet aka. RX-34 (OMAP2420) - n810 Nokia N810 tablet aka. RX-44 (OMAP2420) - realview-eb-mpcore ARM RealView Emulation Baseboard (ARM11MPCore)
--- default-configs/devices/arm-softmmu.mak | 2 -- hw/arm/realview.c | 2 +- tests/qtest/cdrom-test.c | 2 +- hw/arm/Kconfig | 6 ++++++ target/arm/Kconfig | 4 ++++ 5 files changed, 12 insertions(+), 4 deletions(-)
default-configs/devices/arm-softmmu.mak +0 -2
@@ -10,9 +10,7 @@ CONFIG_ARM_VIRT=y CONFIG_CUBIEBOARD=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y -CONFIG_FSL_IMX31=y CONFIG_MUSCA=y -CONFIG_NSERIES=y CONFIG_STELLARIS=y CONFIG_REALVIEW=y CONFIG_VEXPRESS=y
hw/arm/realview.c +1 -1
@@ -463,8 +463,8 @@ static void realview_machine_init(void) {if (tcg_builtin ()) {type_register_static (&realview_eb_type); +type_register_static (&realview_eb_mpcore_type); } -type_register_static (&realview_eb_mpcore_type);type_register_static (&realview_pb_a8_type);type_register_static (&realview_pbx_a9_type); }
tests/qtest/cdrom-test.c +1 -1
@@ -224,8 +224,8 @@ int main(int argc, char **argv)const char *armmachines[] = { #ifdef CONFIG_TCG"realview-eb" , -#endif /* CONFIG_TCG */"realview-eb-mpcore" , +#endif /* CONFIG_TCG */"realview-pb-a8" ,"realview-pbx-a9" ,"versatileab" ,"versatilepb" ,"vexpress-a15" ,"vexpress-a9" ,"virt" ,NULL
hw/arm/Kconfig +6 -0
@@ -123,6 +123,8 @@ config NETDUINOPLUS2 config NSERIES bool + default y if TCG && ARM + select ARM_V6 select OMAP select TMP105 # tempature sensor select BLIZZARD # LCD/TV controller
@@ -401,6 +403,8 @@ config FSL_IMX25 config FSL_IMX31 bool + default y if TCG && ARM + select ARM_V6 select SERIAL select IMX select IMX_I2C
@@ -478,11 +482,13 @@ config FSL_IMX6UL config MICROBIT bool + default y if TCG && ARM select NRF51_SOC config NRF51_SOC bool select I2C + select ARM_V6 select ARM_V7M select UNIMP
target/arm/Kconfig +4 -0
@@ -14,6 +14,10 @@ config ARM_V5 bool depends on TCG && ARM +config ARM_V6 + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER
Signature · 1 line
2.26.2
Re: [PATCH v6 05/11] target/arm: Restrict ARMv6 cpus to TCG accel
Quoted 112 lines · Philippe Mathieu-Daudé
KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit
82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").Only enable the following ARMv6 CPUs when TCG is available:
- ARM1136
- ARM1176
- ARM11MPCore
- Cortex-M0The following machines are no more built when TCG is disabled:
- kzm ARM KZM Emulation Baseboard (ARM1136) - microbit BBC micro:bit (Cortex-M0) - n800 Nokia N800 tablet aka. RX-34 (OMAP2420) - n810 Nokia N810 tablet aka. RX-44 (OMAP2420) - realview-eb-mpcore ARM RealView Emulation Baseboard (ARM11MPCore)Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/devices/arm-softmmu.mak | 2 -- hw/arm/realview.c | 2 +- tests/qtest/cdrom-test.c | 2 +- hw/arm/Kconfig | 6 ++++++ target/arm/Kconfig | 4 ++++ 5 files changed, 12 insertions(+), 4 deletions(-)default-configs/devices/arm-softmmu.mak +0
-2@@ -10,9 +10,7 @@ CONFIG_ARM_VIRT=y CONFIG_CUBIEBOARD=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y -CONFIG_FSL_IMX31=y CONFIG_MUSCA=y -CONFIG_NSERIES=y CONFIG_STELLARIS=y CONFIG_REALVIEW=y CONFIG_VEXPRESS=yhw/arm/realview.c +1
-1@@ -463,8 +463,8 @@ static void realview_machine_init(void) {if (tcg_builtin ()) {type_register_static (&realview_eb_type); +type_register_static (&realview_eb_mpcore_type); } -type_register_static (&realview_eb_mpcore_type);type_register_static (&realview_pb_a8_type);type_register_static (&realview_pbx_a9_type); }tests/qtest/cdrom-test.c +1
-1@@ -224,8 +224,8 @@ int main(int argc, char **argv)const char *armmachines[] = { #ifdef CONFIG_TCG"realview-eb" , -#endif /* CONFIG_TCG */"realview-eb-mpcore" , +#endif /* CONFIG_TCG */"realview-pb-a8" ,"realview-pbx-a9" ,"versatileab" ,"versatilepb" ,"vexpress-a15" ,"vexpress-a9" ,"virt" ,NULL hw/arm/Kconfig +6
-0@@ -123,6 +123,8 @@ config NETDUINOPLUS2 config NSERIES bool + default y if TCG && ARM + select ARM_V6 select OMAP select TMP105 # tempature sensor select BLIZZARD # LCD/TV controller@@ -401,6 +403,8 @@ config FSL_IMX25 config FSL_IMX31 bool + default y if TCG && ARM + select ARM_V6 select SERIAL select IMX select IMX_I2C@@ -478,11 +482,13 @@ config FSL_IMX6UL config MICROBIT bool + default y if TCG && ARM select NRF51_SOC config NRF51_SOC bool select I2C + select ARM_V6 select ARM_V7M select UNIMPtarget/arm/Kconfig +0
-0
target/arm/Kconfig config ARM_V5 · line 23
Quoted 10 lines
target/arm/Kconfig +4
-0@@ -14,6 +14,10 @@ config ARM_V5 bool depends on TCG && ARM +config ARM_V6 + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER
Added Cc: Eduardo,
Looks good to me in general,
I am just wondering about that if (tcg_builtin()) / (or _available() as I suggest elsewhere), should we instead use the build system already at this stage, so no such check is necessary?
It could be a successive change, but then tcg_builtin() would be introduced, only to become useless after the proper refactoring is done, and the build system is used to select the right modules to compile, which would do the registration.
Ciao,
Claudio
Re: [PATCH v6 05/11] target/arm: Restrict ARMv6 cpus to TCG accel
In reply to Philippe Mathieu-DaudéQuoted 47 lines · Philippe Mathieu-Daudé
KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit
82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").Only enable the following ARMv6 CPUs when TCG is available:
- ARM1136
- ARM1176
- ARM11MPCore
- Cortex-M0The following machines are no more built when TCG is disabled:
- kzm ARM KZM Emulation Baseboard (ARM1136) - microbit BBC micro:bit (Cortex-M0) - n800 Nokia N800 tablet aka. RX-34 (OMAP2420) - n810 Nokia N810 tablet aka. RX-44 (OMAP2420) - realview-eb-mpcore ARM RealView Emulation Baseboard (ARM11MPCore)Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/devices/arm-softmmu.mak | 2 -- hw/arm/realview.c | 2 +- tests/qtest/cdrom-test.c | 2 +- hw/arm/Kconfig | 6 ++++++ target/arm/Kconfig | 4 ++++ 5 files changed, 12 insertions(+), 4 deletions(-)default-configs/devices/arm-softmmu.mak +0
-2@@ -10,9 +10,7 @@ CONFIG_ARM_VIRT=y CONFIG_CUBIEBOARD=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y -CONFIG_FSL_IMX31=y CONFIG_MUSCA=y -CONFIG_NSERIES=y CONFIG_STELLARIS=y CONFIG_REALVIEW=y CONFIG_VEXPRESS=yhw/arm/realview.c +0
-0
hw/arm/realview.c static void realview_machine_init(void) · line 470
Quoted 9 lines
hw/arm/realview.c +1
-1@@ -463,8 +463,8 @@ static void realview_machine_init(void) {if (tcg_builtin ()) {type_register_static (&realview_eb_type); +type_register_static (&realview_eb_mpcore_type); } -type_register_static (&realview_eb_mpcore_type);type_register_static (&realview_pb_a8_type);type_register_static (&realview_pbx_a9_type); }
This confuses me - are we even able to run a realview image under KVM? Surely the whole of realview should be TCG only?
The rest looks fine to me though:
Signature · 1 line
Alex Bennée
PATCH v6 6/11 target/arm: Restrict ARMv7 R-profile cpus to TCG accel
In reply to Philippe Mathieu-DaudéKVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit 82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").
Beside, KVM only supports A-profile, thus won't be able to run R-profile cpus.
Only enable the following ARMv7 R-Profile CPUs when TCG is available:
- Cortex-R5
- Cortex-R5F
The following machine is no more built when TCG is disabled:
- xlnx-zcu102 Xilinx ZynqMP ZCU102 board with 4xA53s and 2xR5Fs
--- default-configs/devices/aarch64-softmmu.mak | 1 - hw/arm/Kconfig | 2 ++ target/arm/Kconfig | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-)
default-configs/devices/aarch64-softmmu.mak +0 -1
@@ -3,6 +3,5 @@ # We support all the 32 bit boards so need all their config include arm-softmmu.mak -CONFIG_XLNX_ZYNQMP_ARM=y CONFIG_XLNX_VERSAL=y CONFIG_SBSA_REF=y
hw/arm/Kconfig +2 -0
@@ -360,8 +360,10 @@ config STM32F405_SOC config XLNX_ZYNQMP_ARM bool + default y if TCG && ARM select AHCI select ARM_GIC + select ARM_V7R select CADENCE select DDC select DPCD
target/arm/Kconfig +4 -0
@@ -18,6 +18,10 @@ config ARM_V6 bool depends on TCG && ARM +config ARM_V7R + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER
Signature · 1 line
2.26.2
Re: [PATCH v6 06/11] target/arm: Restrict ARMv7 R-profile cpus to TCG accel
Quoted 39 lines · Philippe Mathieu-Daudé
KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit
82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").Beside, KVM only supports A-profile, thus won't be able to run R-profile cpus.
Only enable the following ARMv7 R-Profile CPUs when TCG is available:
- Cortex-R5
- Cortex-R5FThe following machine is no more built when TCG is disabled:
- xlnx-zcu102 Xilinx ZynqMP ZCU102 board with 4xA53s and 2xR5Fs
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/devices/aarch64-softmmu.mak | 1 - hw/arm/Kconfig | 2 ++ target/arm/Kconfig | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-)default-configs/devices/aarch64-softmmu.mak +0
-1@@ -3,6 +3,5 @@ # We support all the 32 bit boards so need all their config include arm-softmmu.mak -CONFIG_XLNX_ZYNQMP_ARM=y CONFIG_XLNX_VERSAL=y CONFIG_SBSA_REF=yhw/arm/Kconfig +0
-0
hw/arm/Kconfig config STM32F405_SOC · line 363
Quoted 4 lines
hw/arm/Kconfig +1
-0@@ -360,8 +360,10 @@ config STM32F405_SOC config XLNX_ZYNQMP_ARM bool + default y if TCG && ARM
The correct line is:
"default y if TCG && AARCH64"
Quoted 22 lines
hw/arm/Kconfig +1
-0select AHCI select ARM_GIC + select ARM_V7R select CADENCE select DDC select DPCDtarget/arm/Kconfig +4
-0@@ -18,6 +18,10 @@ config ARM_V6 bool depends on TCG && ARM +config ARM_V7R + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER
Alex Bennée
Reviewed-byRe: [PATCH v6 06/11] target/arm: Restrict ARMv7 R-profile cpus to TCG accel
Quoted 41 lines · Philippe Mathieu-Daudé
Quoted 40 lines · Philippe Mathieu-Daudé
KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit
82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").Beside, KVM only supports A-profile, thus won't be able to run R-profile cpus.
Only enable the following ARMv7 R-Profile CPUs when TCG is available:
- Cortex-R5
- Cortex-R5FThe following machine is no more built when TCG is disabled:
- xlnx-zcu102 Xilinx ZynqMP ZCU102 board with 4xA53s and 2xR5Fs
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/devices/aarch64-softmmu.mak | 1 - hw/arm/Kconfig | 2 ++ target/arm/Kconfig | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-)default-configs/devices/aarch64-softmmu.mak +0
-1@@ -3,6 +3,5 @@ # We support all the 32 bit boards so need all their config include arm-softmmu.mak -CONFIG_XLNX_ZYNQMP_ARM=y CONFIG_XLNX_VERSAL=y CONFIG_SBSA_REF=yhw/arm/Kconfig +0
-0@@ -360,8 +360,10 @@ config STM32F405_SOC
Quoted 7 lines
hw/arm/Kconfig config STM32F405_SOC · line 363
Quoted 3 lines
hw/arm/Kconfig +1
-0config XLNX_ZYNQMP_ARM bool + default y if TCG && ARMThe correct line is:
"default y if TCG && AARCH64"
Ahh yes, TIL we had some R-profile cores in QEMU ;-)
with the fix:
Signature · 1 line
Alex Bennée
Re: [PATCH v6 06/11] target/arm: Restrict ARMv7 R-profile cpus to TCG accel
In reply to Philippe Mathieu-DaudéQuoted 55 lines · Philippe Mathieu-Daudé
KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit
82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").Beside, KVM only supports A-profile, thus won't be able to run R-profile cpus.
Only enable the following ARMv7 R-Profile CPUs when TCG is available:
- Cortex-R5
- Cortex-R5FThe following machine is no more built when TCG is disabled:
- xlnx-zcu102 Xilinx ZynqMP ZCU102 board with 4xA53s and 2xR5Fs
Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/devices/aarch64-softmmu.mak | 1 - hw/arm/Kconfig | 2 ++ target/arm/Kconfig | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-)default-configs/devices/aarch64-softmmu.mak +0
-1@@ -3,6 +3,5 @@ # We support all the 32 bit boards so need all their config include arm-softmmu.mak -CONFIG_XLNX_ZYNQMP_ARM=y CONFIG_XLNX_VERSAL=y CONFIG_SBSA_REF=yhw/arm/Kconfig +2
-0@@ -360,8 +360,10 @@ config STM32F405_SOC config XLNX_ZYNQMP_ARM bool + default y if TCG && ARM select AHCI select ARM_GIC + select ARM_V7R select CADENCE select DDC select DPCDtarget/arm/Kconfig +0
-0
target/arm/Kconfig config ARM_V6 · line 27
Quoted 10 lines
target/arm/Kconfig +4
-0@@ -18,6 +18,10 @@ config ARM_V6 bool depends on TCG && ARM +config ARM_V7R + bool + depends on TCG && ARM + config ARM_V7M bool select PTIMER
PATCH v6 7/11 target/arm: Restrict ARMv7 M-profile cpus to TCG accel
In reply to Philippe Mathieu-DaudéKVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit 82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").
Beside, KVM only supports A-profile, thus won't be able to run M-profile cpus.
Only enable the following ARMv7 M-Profile CPUs when TCG is available:
- Cortex-M0
- Cortex-M3
- Cortex-M4
- Cortex-M33
The following machines are no more built when TCG is disabled:
- emcraft-sf2 SmartFusion2 SOM kit from Emcraft (M2S010) - highbank Calxeda Highbank (ECX-1000) - lm3s6965evb Stellaris LM3S6965EVB (Cortex-M3) - lm3s811evb Stellaris LM3S811EVB (Cortex-M3) - midway Calxeda Midway (ECX-2000) - mps2-an385 ARM MPS2 with AN385 FPGA image for Cortex-M3 - mps2-an386 ARM MPS2 with AN386 FPGA image for Cortex-M4 - mps2-an500 ARM MPS2 with AN500 FPGA image for Cortex-M7 - mps2-an505 ARM MPS2 with AN505 FPGA image for Cortex-M33 - mps2-an511 ARM MPS2 with AN511 DesignStart FPGA image for Cortex-M3 - mps2-an521 ARM MPS2 with AN521 FPGA image for dual Cortex-M33 - musca-a ARM Musca-A board (dual Cortex-M33) - musca-b1 ARM Musca-B1 board (dual Cortex-M33) - netduino2 Netduino 2 Machine (Cortex-M3) - netduinoplus2 Netduino Plus 2 Machine(Cortex-M4)
We don't need to enforce CONFIG_ARM_V7M in default-configs anymore.
--- default-configs/devices/arm-softmmu.mak | 11 ----------- hw/arm/Kconfig | 7 +++++++ target/arm/Kconfig | 1 + 3 files changed, 8 insertions(+), 11 deletions(-)
default-configs/devices/arm-softmmu.mak +0 -11
@@ -1,28 +1,17 @@ # Default configuration for arm-softmmu -# TODO: ARM_V7M is currently always required - make this more flexible! -CONFIG_ARM_V7M=y - # CONFIG_PCI_DEVICES=n # CONFIG_TEST_DEVICES=n CONFIG_ARM_VIRT=y CONFIG_CUBIEBOARD=y CONFIG_EXYNOS4=y -CONFIG_HIGHBANK=y -CONFIG_MUSCA=y -CONFIG_STELLARIS=y CONFIG_REALVIEW=y CONFIG_VEXPRESS=y CONFIG_ZYNQ=y CONFIG_NPCM7XX=y -CONFIG_NETDUINO2=y -CONFIG_NETDUINOPLUS2=y -CONFIG_MPS2=y CONFIG_RASPI=y CONFIG_SABRELITE=y -CONFIG_EMCRAFT_SF2=y -CONFIG_MICROBIT=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y CONFIG_ALLWINNER_H3=y
hw/arm/Kconfig +7 -0
@@ -60,6 +60,7 @@ config EXYNOS4 config HIGHBANK bool + default y if TCG && ARM select A9MPCORE select A15MPCORE select AHCI
@@ -95,6 +96,7 @@ config MAINSTONE config MUSCA bool + default y if TCG && ARM select ARMSSE select PL011 select PL031
@@ -115,10 +117,12 @@ config MUSICPAL config NETDUINO2 bool + default y if TCG && ARM select STM32F205_SOC config NETDUINOPLUS2 bool + default y if TCG && ARM select STM32F405_SOC config NSERIES
@@ -240,6 +244,7 @@ config SABRELITE config STELLARIS bool + default y if TCG && ARM select ARM_V7M select CMSDK_APB_WATCHDOG select I2C
@@ -443,6 +448,7 @@ config ASPEED_SOC config MPS2 bool + default y if TCG && ARM select ARMSSE select LAN9118 select MPS2_FPGAIO
@@ -496,6 +502,7 @@ config NRF51_SOC config EMCRAFT_SF2 bool + default y if TCG && ARM select MSF2 select SSI_M25P80
target/arm/Kconfig +1 -0
@@ -24,4 +24,5 @@ config ARM_V7R config ARM_V7M bool + depends on TCG && ARM select PTIMER
Signature · 1 line
2.26.2
Re: [PATCH v6 07/11] target/arm: Restrict ARMv7 M-profile cpus to TCG accel
Quoted 137 lines · Philippe Mathieu-Daudé
KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit
82bf7ae84ce:
"target/arm: Remove KVM support for 32-bit Arm hosts").Beside, KVM only supports A-profile, thus won't be able to run M-profile cpus.
Only enable the following ARMv7 M-Profile CPUs when TCG is available:
- Cortex-M0
- Cortex-M3
- Cortex-M4
- Cortex-M33The following machines are no more built when TCG is disabled:
- emcraft-sf2 SmartFusion2 SOM kit from Emcraft (M2S010) - highbank Calxeda Highbank (ECX-1000) - lm3s6965evb Stellaris LM3S6965EVB (Cortex-M3) - lm3s811evb Stellaris LM3S811EVB (Cortex-M3) - midway Calxeda Midway (ECX-2000) - mps2-an385 ARM MPS2 with AN385 FPGA image for Cortex-M3 - mps2-an386 ARM MPS2 with AN386 FPGA image for Cortex-M4 - mps2-an500 ARM MPS2 with AN500 FPGA image for Cortex-M7 - mps2-an505 ARM MPS2 with AN505 FPGA image for Cortex-M33 - mps2-an511 ARM MPS2 with AN511 DesignStart FPGA image for Cortex-M3 - mps2-an521 ARM MPS2 with AN521 FPGA image for dual Cortex-M33 - musca-a ARM Musca-A board (dual Cortex-M33) - musca-b1 ARM Musca-B1 board (dual Cortex-M33) - netduino2 Netduino 2 Machine (Cortex-M3) - netduinoplus2 Netduino Plus 2 Machine(Cortex-M4)We don't need to enforce
CONFIG_ARM_V7Min default-configs anymore.Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- default-configs/devices/arm-softmmu.mak | 11 ----------- hw/arm/Kconfig | 7 +++++++ target/arm/Kconfig | 1 + 3 files changed, 8 insertions(+), 11 deletions(-)default-configs/devices/arm-softmmu.mak +0
-11@@ -1,28 +1,17 @@ # Default configuration for arm-softmmu -# TODO: ARM_V7M is currently always required - make this more flexible! -CONFIG_ARM_V7M=y - # CONFIG_PCI_DEVICES=n # CONFIG_TEST_DEVICES=n CONFIG_ARM_VIRT=y CONFIG_CUBIEBOARD=y CONFIG_EXYNOS4=y -CONFIG_HIGHBANK=y -CONFIG_MUSCA=y -CONFIG_STELLARIS=y CONFIG_REALVIEW=y CONFIG_VEXPRESS=y CONFIG_ZYNQ=y CONFIG_NPCM7XX=y -CONFIG_NETDUINO2=y -CONFIG_NETDUINOPLUS2=y -CONFIG_MPS2=y CONFIG_RASPI=y CONFIG_SABRELITE=y -CONFIG_EMCRAFT_SF2=y -CONFIG_MICROBIT=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y CONFIG_ALLWINNER_H3=yhw/arm/Kconfig +7
-0@@ -60,6 +60,7 @@ config EXYNOS4 config HIGHBANK bool + default y if TCG && ARM select A9MPCORE select A15MPCORE select AHCI@@ -95,6 +96,7 @@ config MAINSTONE config MUSCA bool + default y if TCG && ARM select ARMSSE select PL011 select PL031@@ -115,10 +117,12 @@ config MUSICPAL config NETDUINO2 bool + default y if TCG && ARM select STM32F205_SOC config NETDUINOPLUS2 bool + default y if TCG && ARM select STM32F405_SOC config NSERIES@@ -240,6 +244,7 @@ config SABRELITE config STELLARIS bool + default y if TCG && ARM select ARM_V7M select CMSDK_APB_WATCHDOG select I2C@@ -443,6 +448,7 @@ config ASPEED_SOC config MPS2 bool + default y if TCG && ARM select ARMSSE select LAN9118 select MPS2_FPGAIO@@ -496,6 +502,7 @@ config NRF51_SOC config EMCRAFT_SF2 bool + default y if TCG && ARM select MSF2 select SSI_M25P80target/arm/Kconfig +0
-0
target/arm/Kconfig config ARM_V7R · line 28
Quoted 5 lines
target/arm/Kconfig +1
-0@@ -24,4 +24,5 @@ config ARM_V7R config ARM_V7M bool + depends on TCG && ARM select PTIMER
PATCH v6 8/11 target/arm: Make m_helper.c optional via CONFIG_ARM_V7M
In reply to Philippe Mathieu-DaudéFrom: Thomas Huth <[email protected]>
We've already got the CONFIG_ARM_V7M switch, but it currently can not be disabled yet. The m_helper.c code should not be compiled into the binary if the switch is not enabled. We also have to provide some stubs in a separate file to make sure that we still can link the other code without CONFIG_ARM_V7M.
Message-Id: <[email protected]>
---
Rewrite since v3, therefore removed Richard R-b tag.
--- target/arm/cpu.h | 12 ------- target/arm/cpu_tcg.c | 4 ++- target/arm/helper.c | 7 ---- target/arm/m_helper-stub.c | 73 ++++++++++++++++++++++++++++++++++++++ target/arm/meson.build | 4 ++- 5 files changed, 79 insertions(+), 21 deletions(-) create mode 100644 target/arm/m_helper-stub.c
target/arm/cpu.h +0 -12
@@ -2281,12 +2281,6 @@ uint32_t arm_phys_excp_target_el(CPUState *cs, uint32_t excp_idx,/* Interface between CPU and Interrupt controller. */ #ifndef CONFIG_USER_ONLY bool armv7m_nvic_can_take_pending_exception (void *opaque); -#else -static inline bool armv7m_nvic_can_take_pending_exception (void *opaque) -{ -return true; -} -#endif /** * armv7m_nvic_set_pending: mark the specified exception as pending * @opaque: the NVIC
@@ -2392,13 +2386,7 @@ int armv7m_nvic_raw_execution_priority(void *opaque);* @secure: the security state to test * This corresponds to the pseudocode IsReqExecPriNeg(). */ -#ifndef CONFIG_USER_ONLY bool armv7m_nvic_neg_prio_requested (void *opaque,bool secure); -#else -static inline bool armv7m_nvic_neg_prio_requested (void *opaque,bool secure) -{ -return false; -}#endif /* Interface for defining coprocessor registers.
target/arm/cpu_tcg.c +3 -1
@@ -15,6 +15,7 @@/* CPU models. These are not needed for the AArch64 linux-user build. */ #if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) +#ifndef CONFIG_USER_ONLY static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { CPUClass *cc = CPU_GET_CLASS(cs);
@@ -38,6 +39,7 @@ static bool arm_v7m_cpu_exec_interrupt(CPUState *cs, int interrupt_request) }return ret; } +#endif /* CONFIG_USER_ONLY */ static void arm926_initfn (Object *obj) {
@@ -666,9 +668,9 @@ static void arm_v7m_class_init(ObjectClass *oc, void *data) acc->info = data;#ifndef CONFIG_USER_ONLY cc->do_interrupt = arm_v7m_cpu_do_interrupt; + cc->cpu_exec_interrupt = arm_v7m_cpu_exec_interrupt;#endif - cc->cpu_exec_interrupt = arm_v7m_cpu_exec_interrupt; cc->gdb_core_xml_file ="arm-m-profile.xml" ; }
target/arm/helper.c +0 -7
@@ -12825,13 +12825,6 @@ int arm_mmu_idx_to_el(ARMMMUIdx mmu_idx) } } -#ifndef CONFIG_TCG -ARMMMUIdx arm_v7m_mmu_idx_for_secstate (CPUARMState *env,bool secstate) -{ -g_assert_not_reached (); -} -#endif -ARMMMUIdx arm_mmu_idx_el (CPUARMState *env,int el) {ARMMMUIdx idx;
target/arm/m_helper-stub.c new file +73 -0
73 lines not on this page · raw message
target/arm/meson.build +3 -1
@@ -21,7 +21,6 @@ 'gdbstub.c', 'helper.c', 'iwmmxt_helper.c', - 'm_helper.c', 'neon_helper.c', 'op_helper.c', 'tlb_helper.c',
@@ -32,6 +31,9 @@ )) arm_ss.add(zlib) +arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c')) +arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c')) + arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c')) arm_ss.add(when: 'TARGET_AARCH64', if_true: files(
Signature · 1 line
2.26.2
PATCH v6 9/11 target/arm: Reorder meson.build rules
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
Reorder the rules to make this file easier to modify. No logical change introduced in this commit.
--- target/arm/meson.build | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
target/arm/meson.build +12 -7
@@ -14,31 +14,36 @@ arm_ss = ss.source_set() arm_ss.add(gen) +arm_ss.add(zlib) arm_ss.add(files( 'cpu.c', - 'crypto_helper.c', - 'debug_helper.c', 'gdbstub.c', 'helper.c', + 'vfp_helper.c', +)) + +arm_ss.add(when: 'TARGET_AARCH64', if_true: files( + 'cpu64.c', + 'gdbstub64.c', +)) + +arm_ss.add(files( + 'crypto_helper.c', + 'debug_helper.c', 'iwmmxt_helper.c', 'neon_helper.c', 'op_helper.c', 'tlb_helper.c', 'translate.c', 'vec_helper.c', - 'vfp_helper.c', 'cpu_tcg.c', )) -arm_ss.add(zlib) - arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c')) arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c')) arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c')) arm_ss.add(when: 'TARGET_AARCH64', if_true: files( - 'cpu64.c', - 'gdbstub64.c', 'helper-a64.c', 'mte_helper.c', 'pauth_helper.c',
Signature · 1 line
2.26.2
PATCH v6 10/11 target/arm: Do not build TCG objects when TCG is off
In reply to Philippe Mathieu-DaudéFrom: Samuel Ortiz <[email protected]>
We can now safely turn all TCG dependent build off when CONFIG_TCG is off. This allows building ARM binaries with --disable-tcg.
--- target/arm/meson.build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
target/arm/meson.build +7 -4
@@ -27,7 +27,8 @@ 'gdbstub64.c', )) -arm_ss.add(files( +arm_tcg_ss = ss.source_set() +arm_tcg_ss.add(files( 'crypto_helper.c', 'debug_helper.c', 'iwmmxt_helper.c',
@@ -38,12 +39,12 @@ 'vec_helper.c', 'cpu_tcg.c', )) -arm_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c')) +arm_tcg_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('m_helper.c'), if_false: files('m_helper-stub.c')) arm_ss.add(when: 'CONFIG_TCG', if_false: files('m_helper-stub.c')) arm_ss.add(when: 'CONFIG_KVM', if_true: files('kvm.c', 'kvm64.c'), if_false: files('kvm-stub.c')) -arm_ss.add(when: 'TARGET_AARCH64', if_true: files( +arm_tcg_ss.add(when: 'TARGET_AARCH64', if_true: files( 'helper-a64.c', 'mte_helper.c', 'pauth_helper.c',
@@ -52,14 +53,16 @@ 'translate-sve.c', )) +arm_ss.add_all(when: 'CONFIG_TCG', if_true: arm_tcg_ss) + arm_softmmu_ss = ss.source_set() arm_softmmu_ss.add(files( 'arch_dump.c', 'arm-powerctl.c', 'machine.c', 'monitor.c', - 'psci.c', )) +arm_softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('psci.c')) target_arch += {'arm': arm_ss} target_softmmu_arch += {'arm': arm_softmmu_ss}
Signature · 1 line
2.26.2
PATCH v6 11/11 .travis.yml: Add a KVM-only Aarch64 job
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
Add a job to build QEMU on Aarch64 with TCG disabled, so this configuration won't bitrot over time.
We explicitly modify default-configs/aarch64-softmmu.mak to only select the 'virt' and 'SBSA-REF' machines.
---
Job ran for 7 min 30 sec
https://travis-ci.org/github/philmd/qemu/jobs/731428859
--- .travis.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+)
.travis.yml +32 -0
@@ -264,6 +264,38 @@ jobs: - CONFIG="--disable-containers --target-list=${MAIN_SOFTMMU_TARGETS}" - UNRELIABLE=true + - name: "[aarch64] GCC (disable-tcg)" + arch: arm64 + dist: focal + addons: + apt_packages: + - libaio-dev + - libattr1-dev + - libbrlapi-dev + - libcap-ng-dev + - libgcrypt20-dev + - libgnutls28-dev + - libgtk-3-dev + - libiscsi-dev + - liblttng-ust-dev + - libncurses5-dev + - libnfs-dev + - libnss3-dev + - libpixman-1-dev + - libpng-dev + - librados-dev + - libsdl2-dev + - libseccomp-dev + - liburcu-dev + - libusb-1.0-0-dev + - libvdeplug-dev + - libvte-2.91-dev + - ninja-build + env: + - CONFIG="--disable-containers --disable-tcg --enable-kvm --disable-xen --disable-tools --disable-docs" + - TEST_CMD="make check-unit" + - CACHE_NAME="${TRAVIS_BRANCH}-linux-gcc-aarch64" + - name: "[ppc64] GCC check-tcg" arch: ppc64le dist: focal
Signature · 1 line
2.26.2
Re: [PATCH v6 11/11] .travis.yml: Add a KVM-only Aarch64 job
Quoted 6 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <[email protected]>
Add a job to build QEMU on Aarch64 with TCG disabled, so this configuration won't bitrot over time.
Quoted 7 lines
We explicitly modify default-configs/aarch64-softmmu.mak to only select the 'virt' and 'SBSA-REF' machines.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
Job ran for 7 min 30 sec
https://travis-ci.org/github/philmd/qemu/jobs/731428859
BTW I added this patch for completeness but I couldn't test it again as I don't have anymore Travis-CI credit. I however tested it on a similar Ubuntu Aarch64 host.
Quoted 69 lines · Philippe Mathieu-Daudé
Cover from Samuel Ortiz from (part 1) [1]:
This patchset allows for building and running ARM targets with TCG disabled. [...]
The rationale behind this work comes from the NEMU project where we're trying to only support x86 and ARM 64-bit architectures, without including the TCG code base. We can only do so if we can build and run ARM binaries with TCG disabled.
Peter mentioned in v5 [6] that since 32-bit host has been removed, we have to remove v7 targets. This is not done in this series, as linking succeeds, and there is enough material to review (no need to spend time on that extra patch if the current approach is not accepted).
CI: https://gitlab.com/philmd/qemu/-/pipelines/249272441
v6:
- rebased on "target/arm/Kconfig" series
- introduce/usetcg_builtin()for realview machinesv5:
- addressed Paolo/Richard/Thomas review comments from v4 [5].v4 almost 2 years later... [2]:
- Rebased on Meson
- Addressed Richard review comments
- Addressed Claudio review commentsv3 almost 18 months later [3]:
- Rebased
- Addressed Thomas review comments
- Added Travis-CI job to keep building --disable-tcg on ARMv2 [4]:
- Addressed review comments from Richard and Thomas from v1 [1]Regards,
Phil.
[1]: https://lists.gnu.org/archive/html/qemu-devel/2018-11/msg02451.html
[2]: https://www.mail-archive.com/[email protected]/msg689168.html
[3]: https://www.mail-archive.com/[email protected]/msg641796.html
[4]: https://lists.gnu.org/archive/html/qemu-devel/2019-08/msg05003.html
[5]: https://www.mail-archive.com/[email protected]/msg746041.html
[6]: https://www.mail-archive.com/[email protected]/msg777669.htmlBased-on: <[email protected]>
"target: Provide target-specificKconfig"Philippe Mathieu-Daudé (9):
sysemu/tcg: Introducetcg_builtin()helper
exec: Restrict TCG specific headers target/arm: Restrict ARMv4 cpus to TCG accel target/arm: Restrict ARMv5 cpus to TCG accel target/arm: Restrict ARMv6 cpus to TCG accel target/arm: Restrict ARMv7 R-profile cpus to TCG accel target/arm: Restrict ARMv7 M-profile cpus to TCG accel target/arm: Reorder meson.build rules .travis.yml: Add a KVM-only Aarch64 jobSamuel Ortiz (1):
target/arm: Do not build TCG objects when TCG is offThomas Huth (1):
target/arm: Makem_helper.coptional viaCONFIG_ARM_V7M
Quoted 17 lines
default-configs/devices/aarch64-softmmu.mak | 1 - default-configs/devices/arm-softmmu.mak | 27 -------- include/exec/helper-proto.h | 2 + include/sysemu/tcg.h | 2 + target/arm/cpu.h | 12 ---- hw/arm/realview.c | 7 +- target/arm/cpu_tcg.c | 4 +- target/arm/helper.c | 7 -- target/arm/m_helper-stub.c | 73 +++++++++++++++++++++ tests/qtest/cdrom-test.c | 6 +- .travis.yml | 32 +++++++++ hw/arm/Kconfig | 38 +++++++++++ target/arm/Kconfig | 17 +++++ target/arm/meson.build | 28 +++++--- 14 files changed, 196 insertions(+), 60 deletions(-) create mode 100644 target/arm/m_helper-stub.c
Looking at this series, just my 2 cents on how I would suggest to go forward:
I could again split my series in two parts, with only the TCG Ops in the first part.
Then this series could be merged, enabling --disable-tcg for ARM,
then I could extend the second part of my series to include ARM as well.
Wdyt? (Probably Richard?)
Thanks,
Claudio
Quoted 88 lines · Claudio Fontana
Quoted 69 lines · Philippe Mathieu-Daudé
Cover from Samuel Ortiz from (part 1) [1]:
This patchset allows for building and running ARM targets with TCG disabled. [...]
The rationale behind this work comes from the NEMU project where we're trying to only support x86 and ARM 64-bit architectures, without including the TCG code base. We can only do so if we can build and run ARM binaries with TCG disabled.
Peter mentioned in v5 [6] that since 32-bit host has been removed, we have to remove v7 targets. This is not done in this series, as linking succeeds, and there is enough material to review (no need to spend time on that extra patch if the current approach is not accepted).
CI: https://gitlab.com/philmd/qemu/-/pipelines/249272441
v6:
- rebased on "target/arm/Kconfig" series
- introduce/usetcg_builtin()for realview machinesv5:
- addressed Paolo/Richard/Thomas review comments from v4 [5].v4 almost 2 years later... [2]:
- Rebased on Meson
- Addressed Richard review comments
- Addressed Claudio review commentsv3 almost 18 months later [3]:
- Rebased
- Addressed Thomas review comments
- Added Travis-CI job to keep building --disable-tcg on ARMv2 [4]:
- Addressed review comments from Richard and Thomas from v1 [1]Regards,
Phil.
[1]: https://lists.gnu.org/archive/html/qemu-devel/2018-11/msg02451.html
[2]: https://www.mail-archive.com/[email protected]/msg689168.html
[3]: https://www.mail-archive.com/[email protected]/msg641796.html
[4]: https://lists.gnu.org/archive/html/qemu-devel/2019-08/msg05003.html
[5]: https://www.mail-archive.com/[email protected]/msg746041.html
[6]: https://www.mail-archive.com/[email protected]/msg777669.htmlBased-on: <[email protected]>
"target: Provide target-specificKconfig"Philippe Mathieu-Daudé (9):
sysemu/tcg: Introducetcg_builtin()helper
exec: Restrict TCG specific headers target/arm: Restrict ARMv4 cpus to TCG accel target/arm: Restrict ARMv5 cpus to TCG accel target/arm: Restrict ARMv6 cpus to TCG accel target/arm: Restrict ARMv7 R-profile cpus to TCG accel target/arm: Restrict ARMv7 M-profile cpus to TCG accel target/arm: Reorder meson.build rules .travis.yml: Add a KVM-only Aarch64 jobSamuel Ortiz (1):
target/arm: Do not build TCG objects when TCG is offThomas Huth (1):
target/arm: Makem_helper.coptional viaCONFIG_ARM_V7MQuoted 17 lines
default-configs/devices/aarch64-softmmu.mak | 1 - default-configs/devices/arm-softmmu.mak | 27 -------- include/exec/helper-proto.h | 2 + include/sysemu/tcg.h | 2 + target/arm/cpu.h | 12 ---- hw/arm/realview.c | 7 +- target/arm/cpu_tcg.c | 4 +- target/arm/helper.c | 7 -- target/arm/m_helper-stub.c | 73 +++++++++++++++++++++ tests/qtest/cdrom-test.c | 6 +- .travis.yml | 32 +++++++++ hw/arm/Kconfig | 38 +++++++++++ target/arm/Kconfig | 17 +++++ target/arm/meson.build | 28 +++++--- 14 files changed, 196 insertions(+), 60 deletions(-) create mode 100644 target/arm/m_helper-stub.c
Quoted 8 lines
Looking at this series, just my 2 cents on how I would suggest to go forward:
I could again split my series in two parts, with only the TCG Ops in the first part.Then this series could be merged, enabling --disable-tcg for ARM,
then I could extend the second part of my series to include ARM as well.
Wdyt? (Probably Richard?)
¯\_(ツ)_/¯
I respun because Richard unqueue your series, and it looks there is no big clashing.
Anyhow meanwhile peer review is useful, and thanks for yours ;)
Quoted 8 lines
Thanks,
Claudio