D30601.id90276.diff
No OneTemporary
Actions

Size

913 B

Referenced Files

None

Subscribers

None

D30601.id90276.diff
View Options

	Index: sys/dev/hwpmc/hwpmc_arm64.c
	===================================================================
	--- sys/dev/hwpmc/hwpmc_arm64.c
	+++ sys/dev/hwpmc/hwpmc_arm64.c
	@@ -505,6 +505,7 @@
	struct pmc_classdep *pcd;
	int idcode, impcode;
	int reg;
	+ uint64_t midr;

	reg = arm64_pmcr_read();
	arm64_npmcs = (reg & PMCR_N_MASK) >> PMCR_N_SHIFT;
	@@ -513,6 +514,18 @@

	PMCDBG1(MDP, INI, 1, "arm64-init npmcs=%d", arm64_npmcs);

	+ /*
	+ * Write the CPU model to kern.hwpmc.cpuid.
	+ *
	+ * We zero the variant and revision fields.
	+ *
	+ * TODO: how to handle differences between cores due to big.LITTLE?
	+ * For now, just use MIDR from CPU 0.
	+ */
	+ midr = (uint64_t)(pcpu_find(0)->pc_midr);
	+ midr &= ~(CPU_VAR_MASK \| CPU_REV_MASK);
	+ snprintf(pmc_cpuid, sizeof(pmc_cpuid), "0x%016lx", midr);
	+
	/*
	* Allocate space for pointers to PMC HW descriptors and for
	* the MDEP structure used by MI code.