2022-09-22 08:05:19

by Liu Shixin

[permalink] [raw]

Subject: [PATCH] drivers/perf: arm_spe: fix ID_AA64DFR0_PMSVER_* undeclared

---

Convert ID_AA64DFR0_PMSVER_* to ID_AA64DFR0_EL1_PMSVer_*.

Signed-off-by: Liu Shixin <[email protected]>
---
drivers/perf/arm_spe_pmu.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c
index db8a0a841062..00e3a637f7b6 100644
--- a/drivers/perf/arm_spe_pmu.c
+++ b/drivers/perf/arm_spe_pmu.c
@@ -676,9 +676,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;
@@ -960,7 +960,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",
--
2.25.1

2022-09-22 11:26:44

by Mark Brown

[permalink] [raw]

Subject: Re: [PATCH] drivers/perf: arm_spe: fix ID_AA64DFR0_PMSVER_* undeclared

---

On Thu, Sep 22, 2022 at 04:11:36PM +0800, Liu Shixin wrote:
> Convert ID_AA64DFR0_PMSVER_* to ID_AA64DFR0_EL1_PMSVer_*.

This should already have been fixed by a patch from Nathan
Chancellor.

---

Attachments:

(No filename) (197.00 B)
signature.asc (499.00 B)
Download all attachments