Commit db74cd63 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Catalin Marinas
Browse files

arm64/sysreg: Fix a few missed conversions 



After the conversion to automatically generating the ID_AA64DFR0_EL1
definition names, the build fails in a few different places because some
of the definitions were not changed to their new names along the way.
Update the names to resolve the build errors.

Fixes: c0357a73 ("arm64/sysreg: Align field names in ID_AA64DFR0_EL1 with architecture")
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220919160928.3905780-1-nathan@kernel.org


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 10453bf1

drivers/hwtracing/coresight/coresight-etm4x-core.c

+2 −2
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ static inline bool cpu_supports_sysreg_trace(void) 
{

	u64 dfr0 = read_sysreg_s(SYS_ID_AA64DFR0_EL1);



	return ((dfr0 >> ID_AA64DFR0_TRACEVER_SHIFT) & 0xfUL) > 0;

	return ((dfr0 >> ID_AA64DFR0_EL1_TraceVer_SHIFT) & 0xfUL) > 0;

}



static bool etm4_init_sysreg_access(struct etmv4_drvdata *drvdata,
@@ -1054,7 +1054,7 @@ static void cpu_detect_trace_filtering(struct etmv4_drvdata *drvdata) 
	u64 trfcr;



	drvdata->trfcr = 0;

	if (!cpuid_feature_extract_unsigned_field(dfr0, ID_AA64DFR0_TRACE_FILT_SHIFT))

	if (!cpuid_feature_extract_unsigned_field(dfr0, ID_AA64DFR0_EL1_TraceFilt_SHIFT))

		return;



	/*

drivers/hwtracing/coresight/coresight-trbe.h

+2 −1
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ 
static inline bool is_trbe_available(void)

{

	u64 aa64dfr0 = read_sysreg_s(SYS_ID_AA64DFR0_EL1);

	unsigned int trbe = cpuid_feature_extract_unsigned_field(aa64dfr0, ID_AA64DFR0_TRBE_SHIFT);

	unsigned int trbe = cpuid_feature_extract_unsigned_field(aa64dfr0,

								 ID_AA64DFR0_EL1_TraceBuffer_SHIFT);



	return trbe >= 0b0001;

}

drivers/perf/arm_spe_pmu.c

+3 −3
Original line number Diff line number Diff line
@@ -674,9 +674,9 @@ static irqreturn_t arm_spe_pmu_irq_handler(int irq, void *dev) 
static u64 arm_spe_pmsevfr_res0(u16 pmsver)

{

	switch (pmsver) {

	case ID_AA64DFR0_PMSVER_8_2:

	case ID_AA64DFR0_EL1_PMSVer_IMP:

		return SYS_PMSEVFR_EL1_RES0_8_2;

	case ID_AA64DFR0_PMSVER_8_3:

	case ID_AA64DFR0_EL1_PMSVer_V1P1:

	/* Return the highest version we support in default */

	default:

		return SYS_PMSEVFR_EL1_RES0_8_3;
@@ -958,7 +958,7 @@ static void __arm_spe_pmu_dev_probe(void *info) 
	struct device *dev = &spe_pmu->pdev->dev;



	fld = cpuid_feature_extract_unsigned_field(read_cpuid(ID_AA64DFR0_EL1),

						   ID_AA64DFR0_PMSVER_SHIFT);

						   ID_AA64DFR0_EL1_PMSVer_SHIFT);

	if (!fld) {

		dev_err(dev,

			"unsupported ID_AA64DFR0_EL1.PMSVer [%d] on CPU %d\n",