github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 01:55:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'for-next/perf' into for-next/core

Browse Source 
* for-next/perf:
  perf/arm-cmn: Fix DVM node events
  perf: qcom: Unify user-visible "Qualcomm" name
  MAINTAINERS: Update HiSilicon PMU driver maintainer to Yushan Wang
This commit is contained in:
Will Deacon 2026-06-14 12:18:12 +01:00
commit 79809fca34
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -11625,7 +11625,7 @@ F: Documentation/devicetree/bindings/net/hisilicon*.txt
F: drivers/net/ethernet/hisilicon/
HISILICON PMU DRIVER
M: Jonathan Cameron <jonathan.cameron@huawei.com>
M: Yushan Wang <wangyushan12@huawei.com>
S: Supported
W: http://www.hisilicon.com
F: Documentation/admin-guide/perf/hisi-pcie-pmu.rst

4
drivers/perf/Kconfig
View File

@ -188,7 +188,7 @@ config FUJITSU_UNCORE_PMU
monitoring Uncore events.
config QCOM_L2_PMU
bool "Qualcomm Technologies L2-cache PMU"
bool "Qualcomm L2-cache PMU"
depends on ARCH_QCOM && ARM64 && ACPI
select QCOM_KRYO_L2_ACCESSORS
help
@ -198,7 +198,7 @@ config QCOM_L2_PMU
monitoring L2 cache events.
config QCOM_L3_PMU
bool "Qualcomm Technologies L3-cache PMU"
bool "Qualcomm L3-cache PMU"
depends on ARCH_QCOM && ARM64 && ACPI
select QCOM_IRQ_COMBINER
help

23
drivers/perf/arm-cmn.c
View File

@ -197,13 +197,14 @@
enum cmn_model {
CMN600 = 1,
CMN650 = 2,
CMN700 = 4,
CI700 = 8,
CI700 = 4,
CMN700 = 8,
CMNS3 = 16,
/* ...and then we can use bitmap tricks for commonality */
CMN_ANY = -1,
NOT_CMN600 = -2,
CMN_650ON = CMN650 | CMN700 | CMNS3,
CMN_700ON = ~(CMN700 - 1),
CMN_650ON = CMN_700ON | CMN650,
};
/* Actual part numbers and revision IDs defined by the hardware */
@ -919,14 +920,14 @@ static struct attribute *arm_cmn_event_attrs[] = {
CMN_EVENT_DVM(NOT_CMN600, txsnp_stall, 0x0a),
CMN_EVENT_DVM(NOT_CMN600, trkfull, 0x0b),
CMN_EVENT_DVM_OCC(NOT_CMN600, trk_occupancy, 0x0c),
CMN_EVENT_DVM_OCC(CMN700, trk_occupancy_cxha, 0x0d),
CMN_EVENT_DVM_OCC(CMN700, trk_occupancy_pdn, 0x0e),
CMN_EVENT_DVM(CMN700, trk_alloc, 0x0f),
CMN_EVENT_DVM(CMN700, trk_cxha_alloc, 0x10),
CMN_EVENT_DVM(CMN700, trk_pdn_alloc, 0x11),
CMN_EVENT_DVM(CMN700, txsnp_stall_limit, 0x12),
CMN_EVENT_DVM(CMN700, rxsnp_stall_starv, 0x13),
CMN_EVENT_DVM(CMN700, txsnp_sync_stall_op, 0x14),
CMN_EVENT_DVM_OCC(CMN_700ON, trk_occupancy_cxha, 0x0d),
CMN_EVENT_DVM_OCC(CMN_700ON, trk_occupancy_pdn, 0x0e),
CMN_EVENT_DVM(CMN_700ON, trk_alloc, 0x0f),
CMN_EVENT_DVM(CMN_700ON, trk_cxha_alloc, 0x10),
CMN_EVENT_DVM(CMN_700ON, trk_pdn_alloc, 0x11),
CMN_EVENT_DVM(CMN_700ON, txsnp_stall_limit, 0x12),
CMN_EVENT_DVM(CMN_700ON, rxsnp_stall_starv, 0x13),
CMN_EVENT_DVM(CMN_700ON, txsnp_sync_stall_op, 0x14),
CMN_EVENT_HNF(CMN_ANY, cache_miss, 0x01),
CMN_EVENT_HNF(CMN_ANY, slc_sf_cache_access, 0x02),