History

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

* for-next/perf: (25 commits) perf/marvell: Fix !CONFIG_OF build for CN10K DDR PMU driver drivers/perf: Add Apple icestorm/firestorm CPU PMU driver drivers/perf: arm_pmu: Handle 47 bit counters arm64: perf: Consistently make all event numbers as 16-bits arm64: perf: Expose some Armv9 common events under sysfs perf/marvell: cn10k DDR perf event core ownership perf/marvell: cn10k DDR perfmon event overflow handling perf/marvell: CN10k DDR performance monitor support dt-bindings: perf: marvell: cn10k ddr performance monitor perf/arm-cmn: Update watchpoint format perf/arm-cmn: Hide XP PUB events for CMN-600 perf: replace bitmap_weight with bitmap_empty where appropriate perf: Replace acpi_bus_get_device() perf/marvell_cn10k: Fix unused variable warning when W=1 and CONFIG_OF=n perf/arm-cmn: Make arm_cmn_debugfs static perf: MARVELL_CN10K_TAD_PMU should depend on ARCH_THUNDER perf/arm-ccn: Use platform_get_irq() to get the interrupt irqchip/apple-aic: Move PMU-specific registers to their own include file arm64: dts: apple: Add t8303 PMU nodes arm64: dts: apple: Add t8103 PMU interrupt affinities ...

Will Deacon committed 4 years ago

Commit b5ef94f2 parents 292ca2d 6676a4223 files · +1800 −198Browse files

Showing the changes to include (3 of 23 files). Show all

Unified · Split

3 files
  1. include/dt-bindings/interrupt-controller/apple-aic.h +2 −0
  2. include/linux/cpuhotplug.h +1 −0
  3. include/linux/perf/arm_pmu.h +2 −0
include/dt-bindings/interrupt-controller/apple-aic.h+2−0
@@ -11,5 +11,7 @@ · 10 unmodified lines
1111 #define AIC_TMR_HV_VIRT 1
1212 #define AIC_TMR_GUEST_PHYS 2
1313 #define AIC_TMR_GUEST_VIRT 3
14+#define AIC_CPU_PMU_E 4
15+#define AIC_CPU_PMU_P 5
1416
1517 #endif
include/linux/cpuhotplug.h+1−0
@@ -231,6 +231,7 @@ enum cpuhp_state { · 230 unmodified lines
231231 CPUHP_AP_PERF_ARM_QCOM_L3_ONLINE,
232232 CPUHP_AP_PERF_ARM_APM_XGENE_ONLINE,
233233 CPUHP_AP_PERF_ARM_CAVIUM_TX2_UNCORE_ONLINE,
234+ CPUHP_AP_PERF_ARM_MARVELL_CN10K_DDR_ONLINE,
234235 CPUHP_AP_PERF_POWERPC_NEST_IMC_ONLINE,
235236 CPUHP_AP_PERF_POWERPC_CORE_IMC_ONLINE,
236237 CPUHP_AP_PERF_POWERPC_THREAD_IMC_ONLINE,
include/linux/perf/arm_pmu.h+2−0
@@ -26,6 +26,8 @@ · 25 unmodified lines
2626 */
2727 /* Event uses a 64bit counter */
2828 #define ARMPMU_EVT_64BIT 1
29+/* Event uses a 47bit counter */
30+#define ARMPMU_EVT_47BIT 2
2931
3032 #define HW_OP_UNSUPPORTED 0xFFFF
3133 #define C(_x) PERF_COUNT_HW_CACHE_##_x

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t