From 6c8dda19e5f484f8544365fd71d965f0afc39244 Mon Sep 17 00:00:00 2001 From: Chris Kay Date: Mon, 17 May 2021 14:47:25 +0100 Subject: [PATCH] refactor(amu)!: remove `PLAT_AMU_GROUP1_COUNTERS_MASK` With the introduction of MPMM, the auxiliary AMU counter logic requires refactoring to move away from a single platform-defined group 1 counter mask in order to support microarchitectural (per-core) group 1 counters. BREAKING CHANGE: The `PLAT_AMU_GROUP1_COUNTERS_MASK` platform definition has been removed. Platforms should specify per-core AMU counter masks via FCONF or a platform-specific mechanism going forward. Change-Id: I1e852797c7954f92409222b066a1ae57bc72bb05 Signed-off-by: Chris Kay --- docs/getting_started/porting-guide.rst | 9 --------- include/lib/extensions/amu.h | 4 ---- 2 files changed, 13 deletions(-) diff --git a/docs/getting_started/porting-guide.rst b/docs/getting_started/porting-guide.rst index 6569a4768..6f577f942 100644 --- a/docs/getting_started/porting-guide.rst +++ b/docs/getting_started/porting-guide.rst @@ -562,15 +562,6 @@ behaviour of the ``assert()`` function (for example, to save memory). doesn't print anything to the console. If ``PLAT_LOG_LEVEL_ASSERT`` isn't defined, it defaults to ``LOG_LEVEL``. -If the platform port uses the Activity Monitor Unit, the following constant -may be defined: - -- **PLAT_AMU_GROUP1_COUNTERS_MASK** - This mask reflects the set of group counters that should be enabled. The - maximum number of group 1 counters supported by AMUv1 is 16 so the mask - can be at most 0xffff. If the platform does not define this mask, no group 1 - counters are enabled. - File : plat_macros.S [mandatory] ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/include/lib/extensions/amu.h b/include/lib/extensions/amu.h index 3a254c9b1..768e72c25 100644 --- a/include/lib/extensions/amu.h +++ b/include/lib/extensions/amu.h @@ -20,11 +20,7 @@ #define AMU_GROUP0_COUNTERS_MASK U(0xf) #define AMU_GROUP0_NR_COUNTERS U(4) -#ifdef PLAT_AMU_GROUP1_COUNTERS_MASK -#define AMU_GROUP1_COUNTERS_MASK PLAT_AMU_GROUP1_COUNTERS_MASK -#else #define AMU_GROUP1_COUNTERS_MASK U(0) -#endif /* Calculate number of group 1 counters */ #if (AMU_GROUP1_COUNTERS_MASK & (1 << 15))