| .. | .. |
|---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
|---|
| 1 | 2 | /* |
|---|
| 2 | 3 | * HiSilicon SoC L3C uncore Hardware event counters support |
|---|
| 3 | 4 | * |
|---|
| .. | .. |
|---|
| 6 | 7 | * Shaokun Zhang <zhangshaokun@hisilicon.com> |
|---|
| 7 | 8 | * |
|---|
| 8 | 9 | * This code is based on the uncore PMUs like arm-cci and arm-ccn. |
|---|
| 9 | | - * |
|---|
| 10 | | - * This program is free software; you can redistribute it and/or modify |
|---|
| 11 | | - * it under the terms of the GNU General Public License version 2 as |
|---|
| 12 | | - * published by the Free Software Foundation. |
|---|
| 13 | 10 | */ |
|---|
| 14 | 11 | #include <linux/acpi.h> |
|---|
| 15 | 12 | #include <linux/bug.h> |
|---|
| .. | .. |
|---|
| 209 | 206 | |
|---|
| 210 | 207 | /* Read and init IRQ */ |
|---|
| 211 | 208 | irq = platform_get_irq(pdev, 0); |
|---|
| 212 | | - if (irq < 0) { |
|---|
| 213 | | - dev_err(&pdev->dev, "L3C PMU get irq fail; irq:%d\n", irq); |
|---|
| 209 | + if (irq < 0) |
|---|
| 214 | 210 | return irq; |
|---|
| 215 | | - } |
|---|
| 216 | 211 | |
|---|
| 217 | 212 | ret = devm_request_irq(&pdev->dev, irq, hisi_l3c_pmu_isr, |
|---|
| 218 | 213 | IRQF_NOBALANCING | IRQF_NO_THREAD, |
|---|
| .. | .. |
|---|
| 238 | 233 | struct hisi_pmu *l3c_pmu) |
|---|
| 239 | 234 | { |
|---|
| 240 | 235 | unsigned long long id; |
|---|
| 241 | | - struct resource *res; |
|---|
| 242 | 236 | acpi_status status; |
|---|
| 243 | 237 | |
|---|
| 244 | 238 | status = acpi_evaluate_integer(ACPI_HANDLE(&pdev->dev), |
|---|
| .. | .. |
|---|
| 264 | 258 | return -EINVAL; |
|---|
| 265 | 259 | } |
|---|
| 266 | 260 | |
|---|
| 267 | | - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
|---|
| 268 | | - l3c_pmu->base = devm_ioremap_resource(&pdev->dev, res); |
|---|
| 261 | + l3c_pmu->base = devm_platform_ioremap_resource(pdev, 0); |
|---|
| 269 | 262 | if (IS_ERR(l3c_pmu->base)) { |
|---|
| 270 | 263 | dev_err(&pdev->dev, "ioremap failed for l3c_pmu resource\n"); |
|---|
| 271 | 264 | return PTR_ERR(l3c_pmu->base); |
|---|
| .. | .. |
|---|
| 387 | 380 | l3c_pmu->sccl_id, l3c_pmu->index_id); |
|---|
| 388 | 381 | l3c_pmu->pmu = (struct pmu) { |
|---|
| 389 | 382 | .name = name, |
|---|
| 383 | + .module = THIS_MODULE, |
|---|
| 390 | 384 | .task_ctx_nr = perf_invalid_context, |
|---|
| 391 | 385 | .event_init = hisi_uncore_pmu_event_init, |
|---|
| 392 | 386 | .pmu_enable = hisi_uncore_pmu_enable, |
|---|
| .. | .. |
|---|
| 397 | 391 | .stop = hisi_uncore_pmu_stop, |
|---|
| 398 | 392 | .read = hisi_uncore_pmu_read, |
|---|
| 399 | 393 | .attr_groups = hisi_l3c_pmu_attr_groups, |
|---|
| 394 | + .capabilities = PERF_PMU_CAP_NO_EXCLUDE, |
|---|
| 400 | 395 | }; |
|---|
| 401 | 396 | |
|---|
| 402 | 397 | ret = perf_pmu_register(&l3c_pmu->pmu, name, -1); |
|---|
| 403 | 398 | if (ret) { |
|---|
| 404 | 399 | dev_err(l3c_pmu->dev, "L3C PMU register failed!\n"); |
|---|
| 405 | | - cpuhp_state_remove_instance(CPUHP_AP_PERF_ARM_HISI_L3_ONLINE, |
|---|
| 406 | | - &l3c_pmu->node); |
|---|
| 400 | + cpuhp_state_remove_instance_nocalls( |
|---|
| 401 | + CPUHP_AP_PERF_ARM_HISI_L3_ONLINE, &l3c_pmu->node); |
|---|
| 402 | + irq_set_affinity_hint(l3c_pmu->irq, NULL); |
|---|
| 407 | 403 | } |
|---|
| 408 | 404 | |
|---|
| 409 | 405 | return ret; |
|---|
| .. | .. |
|---|
| 414 | 410 | struct hisi_pmu *l3c_pmu = platform_get_drvdata(pdev); |
|---|
| 415 | 411 | |
|---|
| 416 | 412 | perf_pmu_unregister(&l3c_pmu->pmu); |
|---|
| 417 | | - cpuhp_state_remove_instance(CPUHP_AP_PERF_ARM_HISI_L3_ONLINE, |
|---|
| 418 | | - &l3c_pmu->node); |
|---|
| 413 | + cpuhp_state_remove_instance_nocalls(CPUHP_AP_PERF_ARM_HISI_L3_ONLINE, |
|---|
| 414 | + &l3c_pmu->node); |
|---|
| 415 | + irq_set_affinity_hint(l3c_pmu->irq, NULL); |
|---|
| 419 | 416 | |
|---|
| 420 | 417 | return 0; |
|---|
| 421 | 418 | } |
|---|
| .. | .. |
|---|
| 424 | 421 | .driver = { |
|---|
| 425 | 422 | .name = "hisi_l3c_pmu", |
|---|
| 426 | 423 | .acpi_match_table = ACPI_PTR(hisi_l3c_pmu_acpi_match), |
|---|
| 424 | + .suppress_bind_attrs = true, |
|---|
| 427 | 425 | }, |
|---|
| 428 | 426 | .probe = hisi_l3c_pmu_probe, |
|---|
| 429 | 427 | .remove = hisi_l3c_pmu_remove, |
|---|