D34527.id103749.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D34527.id103749.diff
View Options

	Index: lib/libpmc/libpmc.c
	===================================================================
	--- lib/libpmc/libpmc.c
	+++ lib/libpmc/libpmc.c
	@@ -763,13 +763,20 @@
	static struct pmc_event_alias cortex_a76_aliases[] = {
	EV_ALIAS(NULL, NULL)
	};
	+
	static int
	-arm64_allocate_pmc(enum pmc_event pe, char *ctrspec __unused,
	- struct pmc_op_pmcallocate *pmc_config __unused)
	+arm64_allocate_pmc(enum pmc_event pe, char *ctrspec,
	+ struct pmc_op_pmcallocate *pmc_config)
	{
	- switch (pe) {
	- default:
	- break;
	+ char *p;
	+
	+ while ((p = strsep(&ctrspec, ",")) != NULL) {
	+ if (KWMATCH(p, "os"))
	+ pmc_config->pm_caps \|= PMC_CAP_SYSTEM;
	+ else if (KWMATCH(p, "usr"))
	+ pmc_config->pm_caps \|= PMC_CAP_USER;
	+ else
	+ return (-1);
	}

	return (0);
	Index: sys/dev/hwpmc/hwpmc_arm64.c
	===================================================================
	--- sys/dev/hwpmc/hwpmc_arm64.c
	+++ sys/dev/hwpmc/hwpmc_arm64.c
	@@ -187,6 +187,16 @@
	if (config > (PMC_EV_ARMV8_LAST - PMC_EV_ARMV8_FIRST))
	return (EINVAL);
	}
	+
	+ switch (a->pm_caps & (PMC_CAP_SYSTEM \| PMC_CAP_USER)) {
	+ case PMC_CAP_SYSTEM:
	+ config \|= PMEVTYPER_U;
	+ break;
	+ case PMC_CAP_USER:
	+ config \|= PMEVTYPER_P;
	+ break;
	+ }
	+
	pm->pm_md.pm_arm64.pm_arm64_evsel = config;
	PMCDBG2(MDP, ALL, 2, "arm64-allocate ri=%d -> config=0x%x", ri, config);