* [PATCH] drivers/perf: arm_spe: fix ID_AA64DFR0_PMSVER_* undeclared
@ 2022-09-22 8:11 ` Liu Shixin
0 siblings, 0 replies; 4+ messages in thread
From: Liu Shixin @ 2022-09-22 8:11 UTC (permalink / raw)
To: Will Deacon, Mark Rutland, Mark Brown
Cc: linux-arm-kernel, linux-kernel, Liu Shixin
Convert ID_AA64DFR0_PMSVER_* to ID_AA64DFR0_EL1_PMSVer_*.
Signed-off-by: Liu Shixin <liushixin2@huawei.com>
---
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH] drivers/perf: arm_spe: fix ID_AA64DFR0_PMSVER_* undeclared
@ 2022-09-22 8:11 ` Liu Shixin
0 siblings, 0 replies; 4+ messages in thread
From: Liu Shixin @ 2022-09-22 8:11 UTC (permalink / raw)
To: Will Deacon, Mark Rutland, Mark Brown
Cc: linux-arm-kernel, linux-kernel, Liu Shixin
Convert ID_AA64DFR0_PMSVER_* to ID_AA64DFR0_EL1_PMSVer_*.
Signed-off-by: Liu Shixin <liushixin2@huawei.com>
---
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drivers/perf: arm_spe: fix ID_AA64DFR0_PMSVER_* undeclared
2022-09-22 8:11 ` Liu Shixin
@ 2022-09-22 11:15 ` Mark Brown
-1 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2022-09-22 11:15 UTC (permalink / raw)
To: Liu Shixin; +Cc: Will Deacon, Mark Rutland, linux-arm-kernel, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drivers/perf: arm_spe: fix ID_AA64DFR0_PMSVER_* undeclared
@ 2022-09-22 11:15 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2022-09-22 11:15 UTC (permalink / raw)
To: Liu Shixin; +Cc: Will Deacon, Mark Rutland, linux-arm-kernel, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 192 bytes --]
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.
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-22 11:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-22 8:11 [PATCH] drivers/perf: arm_spe: fix ID_AA64DFR0_PMSVER_* undeclared Liu Shixin
2022-09-22 8:11 ` Liu Shixin
2022-09-22 11:15 ` Mark Brown
2022-09-22 11:15 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.