perf: arm_dsu: Support DSU ACPI devices
PATCH v5 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 v5:
- Used CONFIG_ACPI to fix compiling issue.
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 | 61 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 6 deletions(-)
drivers/perf/arm_dsu_pmu.c +55 -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,36 @@ 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) +{ +#ifdef CONFIG_ACPI +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); + } +#endif + +return 0 ; +} +/* * dsu_pmu_probe_pmu: Probe the PMU details on a CPU in the cluster. */
@@ -676,6 +708,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 +716,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 +794,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 +876,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 · 7 lines
2.7.4 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
kernel test robot
build botThank you for the patch! Perhaps something to improve:
Hi Tuan,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.9-rc4 next-20200910]
[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-105630 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git ab29a807a7ddaa7c84d2f4cb8d29e74e33759072 config: arm64-randconfig-r012-20200909 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 0a5dc7effb191eff740e0e7ae7bd8e1f6bdb3ad9)
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 warnings (new ones prefixed by >>):
>> drivers/perf/arm_dsu_pmu.c:799:36: warning: unused variable 'dsu_pmu_acpi_match' [-Wunused-const-variable]
static const struct acpi_device_id dsu_pmu_acpi_match[] = {
^1 warning generated.
# https://github.com/0day-ci/linux/commit/40c3a0c70d4472e2fe1f5364d50939b863874fa1
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-105630 git checkout 40c3a0c70d4472e2fe1f5364d50939b863874fa1
vim +/dsu_pmu_acpi_match +799 drivers/perf/arm_dsu_pmu.c
798
> 799 static const struct acpi_device_id dsu_pmu_acpi_match[] = { 800 { "ARMHD500", 0},
801 {},
802 };
803 MODULE_DEVICE_TABLE(acpi, dsu_pmu_acpi_match);
804
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Hi Will,
Quoted 25 lines · kernel test robot
Hi Tuan,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.9-rc4 next-20200910]
[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-105630 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git ab29a807a7ddaa7c84d2f4cb8d29e74e33759072 config: arm64-randconfig-r012-20200909 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 0a5dc7effb191eff740e0e7ae7bd8e1f6bdb3ad9)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=arm64If you fix the issue, kindly add following tag as appropriate
Quoted 9 lines
Reported-by kernel test robot <[email protected]>All warnings (new ones prefixed by >>):
Quoted 1 line
Quoted 1 line
drivers/perf/arm_dsu_pmu.c:799:36: warning: unused variable 'dsu_pmu_acpi_match' [-Wunused-const-variable]static const struct acpi_device_id dsu_pmu_acpi_match[] = { ^1 warning generated.
Do you need me to fix this warning when CONFIG_ACPI not defined?
Tuan
Quoted 14 lines
# https://github.com/0day-ci/linux/commit/40c3a0c70d4472e2fe1f5364d50939b863874fa1
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-105630 git checkout40c3a0c70d4472e2fe1f5364d50939b863874fa1
vim +/dsu_pmu_acpi_match +799drivers/perf/arm_dsu_pmu.c798
Quoted 1 line
799 static const struct
acpi_device_iddsu_pmu_acpi_match[] = {800 { "ARMHD500", 0},
801 {},
802 };
803MODULE_DEVICE_TABLE(acpi, dsu_pmu_acpi_match);
804
Quoted 4 lines
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
<.config.gz>
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 31 lines · Tuan Phan
Hi Will,
Quoted 29 lines · kernel test robot
Hi Tuan,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on linus/master]
[also build test WARNING on v5.9-rc4 next-20200910]
[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-105630 base: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git ab29a807a7ddaa7c84d2f4cb8d29e74e33759072 config: arm64-randconfig-r012-20200909 (attached as .config) compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 0a5dc7effb191eff740e0e7ae7bd8e1f6bdb3ad9)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=arm64If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All warnings (new ones prefixed by >>):
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Quoted 1 line
drivers/perf/arm_dsu_pmu.c:799:36: warning: unused variable 'dsu_pmu_acpi_match' [-Wunused-const-variable]static const struct acpi_device_id dsu_pmu_acpi_match[] = { ^1 warning generated.
Do you need me to fix this warning when
CONFIG_ACPInot defined?
Yes, please. The kernel should compile fine in any config. Any compiler warning is not good (unless the compiler is wrong).
Cheers
Suzuki
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi Tuan
Quoted 9 lines · Tuan Phan
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Reported-by kernel test robot <[email protected] <mailto:[email protected]>>All warnings (new ones prefixed by >>):
Quoted 1 line
Quoted 1 line
drivers/perf/arm_dsu_pmu.c:799:36: warning: unused variable 'dsu_pmu_acpi_match' [-Wunused-const-variable]static const struct
acpi_device_iddsu_pmu_acpi_match[] = { ^
1 warning generated.
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Do you need me to fix this warning when
CONFIG_ACPInot defined?Yes, please. The kernel should compile fine in any config. Any compiler warning is not good (unless the compiler is wrong).
I will fix it. I asked because with no
CONFIG_ACPI, i saw the same message on other drivers.
Please could you share the logs here, we could fix them too. Or patches welcome.
Cheers
Suzuki