perf: arm_spe: Use new PMSIDR_EL1 register enums
authorRob Herring <robh@kernel.org>
Mon, 9 Jan 2023 19:26:21 +0000 (13:26 -0600)
committerWill Deacon <will@kernel.org>
Thu, 19 Jan 2023 18:30:23 +0000 (18:30 +0000)
Now that the SPE register definitions include enums for some PMSIDR_EL1
fields, use them in the driver in place of magic values.

Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com>
Link: https://lore.kernel.org/r/20220825-arm-spe-v8-7-v4-5-327f860daf28@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
drivers/perf/arm_spe_pmu.c

index 9b4bd72087ea270e90cce96286bb0afda2d09baa..af6d3867c3e708a73e7451a7786cf84f9847163c 100644 (file)
@@ -1006,32 +1006,32 @@ static void __arm_spe_pmu_dev_probe(void *info)
        /* This field has a spaced out encoding, so just use a look-up */
        fld = FIELD_GET(PMSIDR_EL1_INTERVAL, reg);
        switch (fld) {
-       case 0:
+       case PMSIDR_EL1_INTERVAL_256:
                spe_pmu->min_period = 256;
                break;
-       case 2:
+       case PMSIDR_EL1_INTERVAL_512:
                spe_pmu->min_period = 512;
                break;
-       case 3:
+       case PMSIDR_EL1_INTERVAL_768:
                spe_pmu->min_period = 768;
                break;
-       case 4:
+       case PMSIDR_EL1_INTERVAL_1024:
                spe_pmu->min_period = 1024;
                break;
-       case 5:
+       case PMSIDR_EL1_INTERVAL_1536:
                spe_pmu->min_period = 1536;
                break;
-       case 6:
+       case PMSIDR_EL1_INTERVAL_2048:
                spe_pmu->min_period = 2048;
                break;
-       case 7:
+       case PMSIDR_EL1_INTERVAL_3072:
                spe_pmu->min_period = 3072;
                break;
        default:
                dev_warn(dev, "unknown PMSIDR_EL1.Interval [%d]; assuming 8\n",
                         fld);
                fallthrough;
-       case 8:
+       case PMSIDR_EL1_INTERVAL_4096:
                spe_pmu->min_period = 4096;
        }
 
@@ -1050,10 +1050,10 @@ static void __arm_spe_pmu_dev_probe(void *info)
                dev_warn(dev, "unknown PMSIDR_EL1.CountSize [%d]; assuming 2\n",
                         fld);
                fallthrough;
-       case 2:
+       case PMSIDR_EL1_COUNTSIZE_12_BIT_SAT:
                spe_pmu->counter_sz = 12;
                break;
-       case 3:
+       case PMSIDR_EL1_COUNTSIZE_16_BIT_SAT:
                spe_pmu->counter_sz = 16;
        }