target/arm: Keep "internals.h" internal to target/arm/
RFC 1/1 target/arm: Keep "internals.h" internal to target/arm/
"target/arm/internals.h" is supposed to be *internal* to target/arm/. hw/arm/virt.c includes it to get arm_pamax() declaration. Move this declaration to "cpu.h" which can be included out of target/arm/, and move the implementation in machine.c which is always built with system emulation.
---
RFC: Do we need a new pair of c/h for architectural helpers?
ptw.c should be restricted to TCG.
--- hw/arm/virt.c | 2 +- target/arm/cpu.h | 9 +++++++++ target/arm/internals.h | 9 --------- target/arm/machine.c | 39 +++++++++++++++++++++++++++++++++++++++ target/arm/ptw.c | 39 --------------------------------------- 5 files changed, 49 insertions(+), 49 deletions(-)
hw/arm/virt.c +1 -1
@@ -70,7 +70,6 @@#include "standard-headers/linux/input.h" #include "hw/arm/smmuv3.h" #include "hw/acpi/acpi.h" -#include "target/arm/internals.h" #include "hw/mem/memory-device.h" #include "hw/mem/pc-dimm.h" #include "hw/mem/nvdimm.h"
@@ -79,6 +78,7 @@#include "hw/virtio/virtio-iommu.h" #include "hw/char/pl011.h" #include "qemu/guest-random.h" +#include "target/arm/cpu.h" #define DEFINE_VIRT_MACHINE_LATEST (major, minor, latest) \ static void virt_##major##_##minor##_class_init(ObjectClass *oc, \
target/arm/cpu.h +9 -0
@@ -3444,6 +3444,15 @@ static inline target_ulong cpu_untagged_addr(CPUState *cs, target_ulong x) }#endif +/* +* arm_pamax +* @cpu: ARMCPU +* +* Returns the implementation defined bit-width of physical addresses. +* The ARMv8 reference manuals refer to this as PAMax(). +*/ +unsigned int arm_pamax (ARMCPU *cpu); +/* * Naming convention for isar_feature functions: * Functions which test 32-bit ID registers should have _aa32_ in
target/arm/internals.h +0 -9
@@ -241,15 +241,6 @@ static inline void update_spsel(CPUARMState *env, uint32_t imm)aarch64_restore_sp (env, cur_el); } -/* -* arm_pamax -* @cpu: ARMCPU -* -* Returns the implementation defined bit-width of physical addresses. -* The ARMv8 reference manuals refer to this as PAMax(). -*/ -unsigned int arm_pamax (ARMCPU *cpu); -/* Return true if extended addresses are enabled. * This is always the case if our translation regime is 64 bit, * but depends on TTBCR.EAE for 32 bit.
target/arm/machine.c +39 -0
@@ -6,6 +6,45 @@#include "internals.h" #include "migration/cpu.h" +/* This mapping is common between ID_AA64MMFR0.PARANGE and TCR_ELx.{I}PS. */ +static const uint8_t pamax_map[] = { + [0 ] =32 , + [1 ] =36 , + [2 ] =40 , + [3 ] =42 , + [4 ] =44 , + [5 ] =48 , + [6 ] =52 , +}; + +/* The cpu-specific constant value of PAMax; also used by hw/arm/virt. */ +unsigned int arm_pamax (ARMCPU *cpu) +{ +if (arm_feature (&cpu->env,ARM_FEATURE_AARCH64 )) { +unsigned int parange = +FIELD_EX64 (cpu->isar.id_aa64mmfr0,ID_AA64MMFR0 ,PARANGE ); + +/* +* id_aa64mmfr0 is a read-only register so values outside of the +* supported mappings can be considered an implementation error. +*/ +assert (parange <ARRAY_SIZE (pamax_map)); +return pamax_map[parange]; + } + +/* +* In machvirt_init, we call arm_pamax on a cpu that is not fully +* initialized, so we can't rely on the propagation done in realize. +*/ +if (arm_feature (&cpu->env,ARM_FEATURE_LPAE ) || +arm_feature (&cpu->env,ARM_FEATURE_V7VE )) { +/* v7 with LPAE */ +return 40 ; + } +/* Anything else */ +return 32 ; +} +static bool vfp_needed (void *opaque) {ARMCPU *cpu = opaque;
target/arm/ptw.c +0 -39
@@ -42,45 +42,6 @@ static bool get_phys_addr_with_struct(CPUARMState *env, S1Translate *ptw, ARMMMUFaultInfo *fi) __attribute__((nonnull)); -/* This mapping is common between ID_AA64MMFR0.PARANGE and TCR_ELx.{I}PS. */ -static const uint8_t pamax_map[] = { - [0 ] =32 , - [1 ] =36 , - [2 ] =40 , - [3 ] =42 , - [4 ] =44 , - [5 ] =48 , - [6 ] =52 , -}; - -/* The cpu-specific constant value of PAMax; also used by hw/arm/virt. */ -unsigned int arm_pamax (ARMCPU *cpu) -{ -if (arm_feature (&cpu->env,ARM_FEATURE_AARCH64 )) { -unsigned int parange = -FIELD_EX64 (cpu->isar.id_aa64mmfr0,ID_AA64MMFR0 ,PARANGE ); - -/* -* id_aa64mmfr0 is a read-only register so values outside of the -* supported mappings can be considered an implementation error. -*/ -assert (parange <ARRAY_SIZE (pamax_map)); -return pamax_map[parange]; - } - -/* -* In machvirt_init, we call arm_pamax on a cpu that is not fully -* initialized, so we can't rely on the propagation done in realize. -*/ -if (arm_feature (&cpu->env,ARM_FEATURE_LPAE ) || -arm_feature (&cpu->env,ARM_FEATURE_V7VE )) { -/* v7 with LPAE */ -return 40 ; - } -/* Anything else */ -return 32 ; -} -/* * Convert a possible stage1+2 MMU index into the appropriate stage 1 MMU index */
Signature · 1 line
2.38.1
Quoted 6 lines · Philippe Mathieu-Daudé
"
target/arm/internals.h" is supposed to be *internal* to target/arm/.hw/arm/virt.cincludes it to getarm_pamax()declaration. Move this declaration to "cpu.h" which can be included out of target/arm/, and move the implementation inmachine.cwhich is always built with system emulation.
machine.c doesn't seem like the right place for this -- that file is purely concerned with migration. I don't know why we use 'machine.c' as our name for the file where the target CPU migration code lives, but that's fairly consistently what we name it across all architectures and we don't put other stuff in that file. I suppose it would be less confusing to rename all those files to migration.c...
thanks
-- PMM
Quoted 15 lines · Philippe Mathieu-Daudé
+++
b/target/arm/machine.ctarget/arm/machine.c +10
-0@@ -6,6 +6,45 @@#include "internals.h" #include "migration/cpu.h" +/* This mapping is common between ID_AA64MMFR0.PARANGE and TCR_ELx.{I}PS. */ +static const uint8_t pamax_map[] = { + [0 ] =32 , + [1 ] =36 , + [2 ] =40 , + [3 ] =42 , + [4 ] =44 , + [5 ] =48 , + [6 ] =52 , +};
...
Quoted 5 lines
+++
b/target/arm/ptw.ctarget/arm/ptw.c +0
-0@@ -42,45 +42,6 @@ static bool get_phys_addr_with_struct(CPUARMState *env, S1Translate *ptw, ARMMMUFaultInfo *fi) __attribute__((nonnull));
target/arm/ptw.c static bool get_phys_addr_with_struct(CPUARMState *env, S1Translate *ptw, · line 54
Quoted 10 lines
target/arm/ptw.c +0
-10-/* This mapping is common between ID_AA64MMFR0.PARANGE and TCR_ELx.{I}PS. */ -static const uint8_t pamax_map[] = { - [0 ] =32 , - [1 ] =36 , - [2 ] =40 , - [3 ] =42 , - [4 ] =44 , - [5 ] =48 , - [6 ] =52 , -};
How does this even compile with the remaining usage of pamax_map in get_phys_addr_lpae?
r~
Quoted 27 lines · Richard Henderson
Quoted 15 lines · Philippe Mathieu-Daudé
+++
b/target/arm/machine.ctarget/arm/machine.c +1
-0@@ -6,6 +6,45 @@ #include "internals.h" #include "migration/cpu.h" +/* This mapping is common between ID_AA64MMFR0.PARANGE and TCR_ELx.{I}PS. */
target/arm/machine.c +9
-0+static const uint8_t pamax_map[] = { + [0] = 32, + [1] = 36, + [2] = 40, + [3] = 42, + [4] = 44, + [5] = 48, + [6] = 52, +};...
Quoted 10 lines
+++
b/target/arm/ptw.ctarget/arm/ptw.c +0
-1@@ -42,45 +42,6 @@ static bool get_phys_addr_with_struct(CPUARMState *env, S1Translate *ptw, ARMMMUFaultInfo *fi) __attribute__((nonnull)); -/* This mapping is common between ID_AA64MMFR0.PARANGE and TCR_ELx.{I}PS. */
-static constuint8_tpamax_map[] = {
- [0] = 32,
- [1] = 36,
Quoted 8 lines
Quoted 6 lines
- [2] = 40,
- [3] = 42,
- [4] = 44,
- [5] = 48,
- [6] = 52,
-};How does this even compile with the remaining usage of
pamax_mapinget_phys_addr_lpae?
It does not :( I rebased 62 patches then tried to extract/post unrelated patches like this one, but didn't build at each step and failed to realize the broken rebase, *sigh*. Sorry.