Hi Tao, On 9/25/25 6:26 PM, Tao Tang wrote: > The ARMSecuritySpace enum and its related helpers were defined in the > target-specific header target/arm/cpu.h. This prevented common, > target-agnostic code like the SMMU model from using these definitions > without triggering "cpu.h included from common code" errors. > > To resolve this, this commit introduces a new, lightweight header, > include/hw/arm/arm-security.h, which is safe for inclusion by common > code. > > The following changes were made: > > - The ARMSecuritySpace enum and the arm_space_is_secure() and > arm_secure_to_space() helpers have been moved from target/arm/cpu.h > to the new hw/arm/arm-security.h header. > > - Headers for common devices like the SMMU (smmu-common.h) have been > updated to include the new lightweight header instead of cpu.h. above is not done in that patch. > > This refactoring decouples the security state definitions from the core > CPU implementation, allowing common hardware models to correctly handle > security states without pulling in heavyweight, target-specific headers. > > Signed-off-by: Tao Tang <[email protected]> Besides Reviewed-by: Eric Auger <[email protected]> Thanks
Eric > --- > include/hw/arm/arm-security.h | 54 +++++++++++++++++++++++++++++++++++ > target/arm/cpu.h | 25 +--------------- > 2 files changed, 55 insertions(+), 24 deletions(-) > create mode 100644 include/hw/arm/arm-security.h > > diff --git a/include/hw/arm/arm-security.h b/include/hw/arm/arm-security.h > new file mode 100644 > index 0000000000..9664c0f95e > --- /dev/null > +++ b/include/hw/arm/arm-security.h > @@ -0,0 +1,54 @@ > +/* > + * ARM security space helpers > + * > + * Provide ARMSecuritySpace and helpers for code that is not tied to CPU. > + * > + * Copyright (c) 2003 Fabrice Bellard > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see > <http://www.gnu.org/licenses/>. > + */ > + > +#ifndef HW_ARM_ARM_SECURITY_H > +#define HW_ARM_ARM_SECURITY_H > + > +#include <stdbool.h> > + > +/* > + * ARM v9 security states. > + * The ordering of the enumeration corresponds to the low 2 bits > + * of the GPI value, and (except for Root) the concat of NSE:NS. > + */ > + > + typedef enum ARMSecuritySpace { > + ARMSS_Secure = 0, > + ARMSS_NonSecure = 1, > + ARMSS_Root = 2, > + ARMSS_Realm = 3, > +} ARMSecuritySpace; > + > +/* Return true if @space is secure, in the pre-v9 sense. */ > +static inline bool arm_space_is_secure(ARMSecuritySpace space) > +{ > + return space == ARMSS_Secure || space == ARMSS_Root; > +} > + > +/* Return the ARMSecuritySpace for @secure, assuming !RME or EL[0-2]. */ > +static inline ARMSecuritySpace arm_secure_to_space(bool secure) > +{ > + return secure ? ARMSS_Secure : ARMSS_NonSecure; > +} > + > +#endif /* HW_ARM_ARM_SECURITY_H */ > + > + > diff --git a/target/arm/cpu.h b/target/arm/cpu.h > index 1c0deb723d..2ff9343d0b 100644 > --- a/target/arm/cpu.h > +++ b/target/arm/cpu.h > @@ -31,6 +31,7 @@ > #include "exec/page-protection.h" > #include "qapi/qapi-types-common.h" > #include "target/arm/multiprocessing.h" > +#include "hw/arm/arm-security.h" > #include "target/arm/gtimer.h" > #include "target/arm/cpu-sysregs.h" > > @@ -2477,30 +2478,6 @@ static inline int arm_feature(CPUARMState *env, int > feature) > > void arm_cpu_finalize_features(ARMCPU *cpu, Error **errp); > > -/* > - * ARM v9 security states. > - * The ordering of the enumeration corresponds to the low 2 bits > - * of the GPI value, and (except for Root) the concat of NSE:NS. > - */ > - > -typedef enum ARMSecuritySpace { > - ARMSS_Secure = 0, > - ARMSS_NonSecure = 1, > - ARMSS_Root = 2, > - ARMSS_Realm = 3, > -} ARMSecuritySpace; > - > -/* Return true if @space is secure, in the pre-v9 sense. */ > -static inline bool arm_space_is_secure(ARMSecuritySpace space) > -{ > - return space == ARMSS_Secure || space == ARMSS_Root; > -} > - > -/* Return the ARMSecuritySpace for @secure, assuming !RME or EL[0-2]. */ > -static inline ARMSecuritySpace arm_secure_to_space(bool secure) > -{ > - return secure ? ARMSS_Secure : ARMSS_NonSecure; > -} > > #if !defined(CONFIG_USER_ONLY) > /**
