Messages in this thread Patch in this message |  | | Date | Mon, 30 Nov 2020 14:48:54 -0700 | From | Mathieu Poirier <> | Subject | Re: [PATCH v4 15/25] coresight: etm4x: Handle ETM architecture version |
| |
On Thu, Nov 19, 2020 at 04:45:37PM +0000, Suzuki K Poulose wrote: > We are about to rely on TRCDEVARCH for detecting the ETM > and its architecture version, falling back to TRCIDR1 if > the former is not implemented (in older broken implementations). > > Also, we use the architecture version information to do > make some decisions. Streamline the architecture version
s/to do make/to make
> handling by adding helpers. > > Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> > --- > .../coresight/coresight-etm4x-core.c | 2 +- > drivers/hwtracing/coresight/coresight-etm4x.h | 60 ++++++++++++++++++- > 2 files changed, 58 insertions(+), 4 deletions(-)
With the above:
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> > diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c > index 2342e72c5016..a91e7de77ab9 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c > +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c > @@ -819,7 +819,7 @@ static void etm4_init_arch_data(void *info) > * Otherwise for values 0x1 and above the number is N + 1 as per v4.2. > */ > drvdata->nr_resource = BMVAL(etmidr4, 16, 19); > - if ((drvdata->arch < ETM4X_ARCH_4V3) || (drvdata->nr_resource > 0)) > + if ((drvdata->arch < ETM_ARCH_V4_3) || (drvdata->nr_resource > 0)) > drvdata->nr_resource += 1; > /* > * NUMSSCC, bits[23:20] the number of single-shot > diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h > index 173ea7445c29..7a6e3cd34d58 100644 > --- a/drivers/hwtracing/coresight/coresight-etm4x.h > +++ b/drivers/hwtracing/coresight/coresight-etm4x.h > @@ -460,7 +460,6 @@ > #define ETM_MAX_RES_SEL 32 > #define ETM_MAX_SS_CMP 8 > > -#define ETM_ARCH_V4 0x40 > #define ETMv4_SYNC_MASK 0x1F > #define ETM_CYC_THRESHOLD_MASK 0xFFF > #define ETM_CYC_THRESHOLD_DEFAULT 0x100 > @@ -585,8 +584,63 @@ > #define TRCVICTLR_EXLEVEL_S_MASK (ETM_EXLEVEL_S_MASK << TRCVICTLR_EXLEVEL_SHIFT) > #define TRCVICTLR_EXLEVEL_NS_MASK (ETM_EXLEVEL_NS_MASK << TRCVICTLR_EXLEVEL_SHIFT) > > +#define ETM_TRCIDR1_ARCH_MAJOR_SHIFT 8 > +#define ETM_TRCIDR1_ARCH_MAJOR_MASK (0xfU << ETM_TRCIDR1_ARCH_MAJOR_SHIFT) > +#define ETM_TRCIDR1_ARCH_MAJOR(x) \ > + (((x) & ETM_TRCIDR1_ARCH_MAJOR_MASK) >> ETM_TRCIDR1_ARCH_MAJOR_SHIFT) > +#define ETM_TRCIDR1_ARCH_MINOR_SHIFT 4 > +#define ETM_TRCIDR1_ARCH_MINOR_MASK (0xfU << ETM_TRCIDR1_ARCH_MINOR_SHIFT) > +#define ETM_TRCIDR1_ARCH_MINOR(x) \ > + (((x) & ETM_TRCIDR1_ARCH_MINOR_MASK) >> ETM_TRCIDR1_ARCH_MINOR_SHIFT) > +#define ETM_TRCIDR1_ARCH_SHIFT ETM_TRCIDR1_ARCH_MINOR_SHIFT > +#define ETM_TRCIDR1_ARCH_MASK \ > + (ETM_TRCIDR1_ARCH_MAJOR_MASK | ETM_TRCIDR1_ARCH_MINOR_MASK) > + > +#define ETM_TRCIDR1_ARCH_ETMv4 0x4 > + > +/* > + * Driver representation of the ETM architecture. > + * The version of an ETM component can be detected from > + * > + * TRCDEVARCH - CoreSight architected register > + * - Bits[15:12] - Major version > + * - Bits[19:16] - Minor version > + * TRCIDR1 - ETM architected register > + * - Bits[11:8] - Major version > + * - Bits[7:4] - Minor version > + * We must rely on TRCDEVARCH for the version information, > + * however we don't want to break the support for potential > + * old implementations which might not implement it. Thus > + * we fall back to TRCIDR1 if TRCDEVARCH is not implemented > + * for memory mapped components. > + * Now to make certain decisions easier based on the version > + * we use an internal representation of the version in the > + * driver, as follows : > + * > + * ETM_ARCH_VERSION[7:0], where : > + * Bits[7:4] - Major version > + * Bits[3:0] - Minro version > + */ > +#define ETM_ARCH_VERSION(major, minor) \ > + ((((major) & 0xfU) << 4) | (((minor) & 0xfU))) > +#define ETM_ARCH_MAJOR_VERSION(arch) (((arch) >> 4) & 0xfU) > +#define ETM_ARCH_MINOR_VERSION(arch) ((arch) & 0xfU) > + > +#define ETM_ARCH_V4 ETM_ARCH_VERSION(4, 0) > /* Interpretation of resource numbers change at ETM v4.3 architecture */ > -#define ETM4X_ARCH_4V3 0x43 > +#define ETM_ARCH_V4_3 ETM_ARCH_VERSION(4, 3) > + > +static inline u8 etm_devarch_to_arch(u32 devarch) > +{ > + return ETM_ARCH_VERSION(ETM_DEVARCH_ARCHID_ARCH_VER(devarch), > + ETM_DEVARCH_REVISION(devarch)); > +} > + > +static inline u8 etm_trcidr_to_arch(u32 trcidr1) > +{ > + return ETM_ARCH_VERSION(ETM_TRCIDR1_ARCH_MAJOR(trcidr1), > + ETM_TRCIDR1_ARCH_MINOR(trcidr1)); > +} > > /** > * struct etmv4_config - configuration information related to an ETMv4 > @@ -748,7 +802,7 @@ struct etmv4_save_state { > * @spinlock: Only one at a time pls. > * @mode: This tracer's mode, i.e sysFS, Perf or disabled. > * @cpu: The cpu this component is affined to. > - * @arch: ETM version number. > + * @arch: ETM architecture version. > * @nr_pe: The number of processing entity available for tracing. > * @nr_pe_cmp: The number of processing entity comparator inputs that are > * available for tracing. > -- > 2.24.1 >
|  |