Add device-tree support to the SMMUv3 PMCG driver.

Signed-off-by: Jay Chen <jkc...@linux.alibaba.com>
Signed-off-by: Jean-Philippe Brucker <jean-phili...@linaro.org>
Signed-off-by: Robin Murphy <robin.mur...@arm.com>
---
 drivers/perf/arm_smmuv3_pmu.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c
index 226348822ab3..19697617153a 100644
--- a/drivers/perf/arm_smmuv3_pmu.c
+++ b/drivers/perf/arm_smmuv3_pmu.c
@@ -47,6 +47,7 @@
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/msi.h>
+#include <linux/of.h>
 #include <linux/perf_event.h>
 #include <linux/platform_device.h>
 #include <linux/smp.h>
@@ -834,7 +835,8 @@ static int smmu_pmu_probe(struct platform_device *pdev)
                return -EINVAL;
        }
 
-       smmu_pmu_get_acpi_options(smmu_pmu);
+       if (!dev->of_node)
+               smmu_pmu_get_acpi_options(smmu_pmu);
 
        /* Pick one CPU to be the preferred one to use */
        smmu_pmu->on_cpu = raw_smp_processor_id();
@@ -884,9 +886,16 @@ static void smmu_pmu_shutdown(struct platform_device *pdev)
        smmu_pmu_disable(&smmu_pmu->pmu);
 }
 
+static const struct of_device_id smmu_pmu_of_match[] = {
+       { .compatible = "arm,smmu-v3-pmcg" },
+       {}
+};
+MODULE_DEVICE_TABLE(of, smmu_pmu_of_match);
+
 static struct platform_driver smmu_pmu_driver = {
        .driver = {
                .name = "arm-smmu-v3-pmcg",
+               .of_match_table = of_match_ptr(smmu_pmu_of_match),
                .suppress_bind_attrs = true,
        },
        .probe = smmu_pmu_probe,
-- 
2.33.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to