perf: arm_dsu: Support DSU ACPI devices
PATCH v4 1/1 perf: arm_dsu: Support DSU ACPI devices
Add support for probing device from ACPI node.
Each DSU ACPI node and its associated cpus are inside a cluster node.
---
Changes in v4:
- Addressed Will's comments.
Changes in v3:
- Based on the latest ARM ACPI binding at: https://developer.arm.com/documentation/den0093/c/
Changes in v2:
- Removed IRQF_SHARED.
- Fixed ACPI runtime detection.
drivers/perf/arm_dsu_pmu.c | 59 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 6 deletions(-)
drivers/perf/arm_dsu_pmu.c +53 -6
@@ -11,6 +11,7 @@#define DRVNAME PMUNAME "_pmu"#define pr_fmt (fmt) DRVNAME ": " fmt +#include <linux/acpi.h> #include <linux/bitmap.h> #include <linux/bitops.h> #include <linux/bug.h>
@@ -603,18 +604,19 @@ static struct dsu_pmu *dsu_pmu_alloc(struct platform_device *pdev) }/** -* dsu_pmu_dt_get_cpus: Get the list of CPUs in the cluster. +* dsu_pmu_dt_get_cpus: Get the list of CPUs in the cluster +* from device tree. */ -static int dsu_pmu_dt_get_cpus (struct device_node *dev,cpumask_t *mask) +static int dsu_pmu_dt_get_cpus (struct device *dev,cpumask_t *mask) {int i =0 , n, cpu;struct device_node *cpu_node; - n =of_count_phandle_with_args (dev,"cpus" ,NULL ); + n =of_count_phandle_with_args (dev->of_node,"cpus" ,NULL );if (n <=0 )return -ENODEV ;for (; i < n; i++) { - cpu_node =of_parse_phandle (dev,"cpus" , i); + cpu_node =of_parse_phandle (dev->of_node,"cpus" , i);if (!cpu_node)break ; cpu =of_cpu_node_to_id (cpu_node);
@@ -631,6 +633,34 @@ static int dsu_pmu_dt_get_cpus(struct device_node *dev, cpumask_t *mask)return 0 ; } +/** +* dsu_pmu_acpi_get_cpus: Get the list of CPUs in the cluster +* from ACPI. +*/ +static int dsu_pmu_acpi_get_cpus (struct device *dev,cpumask_t *mask) +{ +int cpu; + +/* +* A dsu pmu node is inside a cluster parent node along with cpu nodes. +* We need to find out all cpus that have the same parent with this pmu. +*/ +for_each_possible_cpu (cpu) { +struct acpi_device *acpi_dev; +struct device *cpu_dev =get_cpu_device (cpu); + +if (!cpu_dev) +continue ; + + acpi_dev =ACPI_COMPANION (cpu_dev); +if (acpi_dev && + acpi_dev->parent ==ACPI_COMPANION (dev)->parent) +cpumask_set_cpu (cpu, mask); + } + +return 0 ; +} +/* * dsu_pmu_probe_pmu: Probe the PMU details on a CPU in the cluster. */
@@ -676,6 +706,7 @@ static int dsu_pmu_device_probe(struct platform_device *pdev) {int irq, rc;struct dsu_pmu *dsu_pmu; +struct fwnode_handle *fwnode =dev_fwnode (&pdev->dev);char *name;static atomic_t pmu_idx =ATOMIC_INIT (-1 );
@@ -683,7 +714,16 @@ static int dsu_pmu_device_probe(struct platform_device *pdev)if (IS_ERR (dsu_pmu))return PTR_ERR (dsu_pmu); - rc =dsu_pmu_dt_get_cpus (pdev->dev.of_node, &dsu_pmu->associated_cpus); +if (IS_ERR_OR_NULL (fwnode)) +return -ENOENT ; + +if (is_of_node (fwnode)) + rc =dsu_pmu_dt_get_cpus (&pdev->dev, &dsu_pmu->associated_cpus); +else if (is_acpi_device_node (fwnode)) + rc =dsu_pmu_acpi_get_cpus (&pdev->dev, &dsu_pmu->associated_cpus); +else +return -ENOENT ; +if (rc) {dev_warn (&pdev->dev,"Failed to parse the CPUs\n" );return rc;
@@ -752,11 +792,19 @@ static const struct of_device_id dsu_pmu_of_match[] = { { .compatible = "arm,dsu-pmu", }, {}, }; +MODULE_DEVICE_TABLE (of, dsu_pmu_of_match); + +static const struct acpi_device_id dsu_pmu_acpi_match[] = { + {"ARMHD500" ,0 }, + {}, +}; +MODULE_DEVICE_TABLE (acpi, dsu_pmu_acpi_match);static struct platform_driver dsu_pmu_driver = { .driver = { .name =DRVNAME , .of_match_table =of_match_ptr (dsu_pmu_of_match), + .acpi_match_table =ACPI_PTR (dsu_pmu_acpi_match), .suppress_bind_attrs = true, }, .probe = dsu_pmu_device_probe,
@@ -826,7 +874,6 @@ static void __exit dsu_pmu_exit(void)module_init (dsu_pmu_init);module_exit (dsu_pmu_exit); -MODULE_DEVICE_TABLE (of, dsu_pmu_of_match);MODULE_DESCRIPTION ("Perf driver for ARM DynamIQ Shared Unit" );MODULE_AUTHOR ("Suzuki K Poulose <[email protected]>" );MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.7.4
kernel test robot
build botThank you for the patch! Yet something to improve:
Hi Tuan,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on linus/master]
[also build test ERROR on v5.9-rc4 next-20200909]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Tuan-Phan/perf-arm_dsu-Support-DSU-ACPI-devices/20200910-012936 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git 34d4ddd359dbcdf6c5fb3f85a179243d7a1cb7f8 config: arm64-randconfig-r012-20200909 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 8893d0816ccdf8998d2e21b5430e9d6abe7ef465)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/perf/arm_dsu_pmu.c:657:12: error: incomplete definition of type 'struct acpi_device'
acpi_dev->parent == ACPI_COMPANION(dev)->parent)
~~~~~~~~^
include/linux/acpi.h:724:8: note: forward declaration of 'struct acpi_device'
struct acpi_device;
^
>> drivers/perf/arm_dsu_pmu.c:657:43: error: member reference base type 'void' is not a structure or union
acpi_dev->parent == ACPI_COMPANION(dev)->parent)
~~~~~~~~~~~~~~~~~~~^ ~~~~~~2 errors generated.
# https://github.com/0day-ci/linux/commit/3bddaa8323fb79a93362259d94f9ca36c46f1885
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Tuan-Phan/perf-arm_dsu-Support-DSU-ACPI-devices/20200910-012936 git checkout 3bddaa8323fb79a93362259d94f9ca36c46f1885
vim +657 drivers/perf/arm_dsu_pmu.c
635
636 /**
637 * dsu_pmu_acpi_get_cpus: Get the list of CPUs in the cluster
638 * from ACPI.
639 */
640 static int dsu_pmu_acpi_get_cpus(struct device *dev, cpumask_t *mask)
641 {
642 int cpu;
643
644 /*
645 * A dsu pmu node is inside a cluster parent node along with cpu nodes.
646 * We need to find out all cpus that have the same parent with this pmu.
647 */
648 for_each_possible_cpu(cpu) {
649 struct acpi_device *acpi_dev;
650 struct device *cpu_dev = get_cpu_device(cpu);
651
652 if (!cpu_dev)
653 continue;
654
655 acpi_dev = ACPI_COMPANION(cpu_dev);
656 if (acpi_dev &&
> 657 acpi_dev->parent == ACPI_COMPANION(dev)->parent)
658 cpumask_set_cpu(cpu, mask);
659 }
660
661 return 0;
662 }
663
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org