Page MenuHomeFreeBSD
Files F157736563

D39901.id121611.diff
No OneTemporary
Actions

D39901.id121611.diff
View Options

diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c
--- a/sys/dev/hwpmc/hwpmc_uncore.c
+++ b/sys/dev/hwpmc/hwpmc_uncore.c
@@ -667,27 +667,6 @@
"ucp-start/2 cpu=%d ri=%d evselmsr=0x%x evsel=0x%x",
cpu, ri, SELECTSEL(uncore_cputype) + ri, evsel);
- /* Event specific configuration. */
- switch (pm->pm_event) {
- case PMC_EV_UCP_EVENT_0CH_04H_E:
- case PMC_EV_UCP_EVENT_0CH_08H_E:
- wrmsr(MSR_GQ_SNOOP_MESF,0x2);
- break;
- case PMC_EV_UCP_EVENT_0CH_04H_F:
- case PMC_EV_UCP_EVENT_0CH_08H_F:
- wrmsr(MSR_GQ_SNOOP_MESF,0x8);
- break;
- case PMC_EV_UCP_EVENT_0CH_04H_M:
- case PMC_EV_UCP_EVENT_0CH_08H_M:
- wrmsr(MSR_GQ_SNOOP_MESF,0x1);
- break;
- case PMC_EV_UCP_EVENT_0CH_04H_S:
- case PMC_EV_UCP_EVENT_0CH_08H_S:
- wrmsr(MSR_GQ_SNOOP_MESF,0x4);
- break;
- default:
- break;
- }
wrmsr(SELECTSEL(uncore_cputype) + ri, evsel);
cc->pc_globalctrl |= (1ULL << ri);
diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h
--- a/sys/dev/hwpmc/pmc_events.h
+++ b/sys/dev/hwpmc/pmc_events.h
@@ -204,16 +204,6 @@
__PMC_EV_ALIAS("unhalted-core-cycles", IAF_CPU_CLK_UNHALTED_CORE) \
__PMC_EV_ALIAS("unhalted-reference-cycles", IAF_CPU_CLK_UNHALTED_REF)
-#define __PMC_EV_UCP() \
- __PMC_EV(UCP, EVENT_0CH_04H_E) \
- __PMC_EV(UCP, EVENT_0CH_04H_F) \
- __PMC_EV(UCP, EVENT_0CH_04H_M) \
- __PMC_EV(UCP, EVENT_0CH_04H_S) \
- __PMC_EV(UCP, EVENT_0CH_08H_E) \
- __PMC_EV(UCP, EVENT_0CH_08H_F) \
- __PMC_EV(UCP, EVENT_0CH_08H_M) \
- __PMC_EV(UCP, EVENT_0CH_08H_S) \
-
/*
* ARMv7 Events
*/
@@ -2477,8 +2467,6 @@
__PMC_EV_K7() \
__PMC_EV_BLOCK(K8, 0x2080) \
__PMC_EV_K8() \
- __PMC_EV_BLOCK(UCP, 0x12080) \
- __PMC_EV_UCP() \
__PMC_EV_BLOCK(PPC7450, 0x13000) \
__PMC_EV_PPC7450() \
__PMC_EV_BLOCK(PPC970, 0x13100) \

File Metadata

Mime Type
text/plain
Expires
Mon, May 25, 4:19 PM (22 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33511729
Default Alt Text
D39901.id121611.diff (1 KB)

Event Timeline