Author: gnn
Date: Fri Jun 22 16:31:00 2012
New Revision: 237447
URL: http://svn.freebsd.org/changeset/base/237447
Log:
MFC 230063
Clean up a switch statement for uncore events on Westmere processors.
Submitted by: Davide Italiano
Reviewed by: gnn
Modified:
stable/8/sys/dev/hwpmc/hwpmc_uncore.c
stable/8/sys/dev/hwpmc/hwpmc_uncore.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/boot/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/e1000/ (props changed)
Modified: stable/8/sys/dev/hwpmc/hwpmc_uncore.c
==============================================================================
--- stable/8/sys/dev/hwpmc/hwpmc_uncore.c Fri Jun 22 16:20:13 2012
(r237446)
+++ stable/8/sys/dev/hwpmc/hwpmc_uncore.c Fri Jun 22 16:31:00 2012
(r237447)
@@ -974,26 +974,18 @@ ucp_start_pmc(int cpu, int ri)
/* 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:
- wrmsr(MSR_GQ_SNOOP_MESF,0x1);
- break;
- case PMC_EV_UCP_EVENT_0CH_04H_S:
- wrmsr(MSR_GQ_SNOOP_MESF,0x4);
- break;
- case PMC_EV_UCP_EVENT_0CH_08H_E:
- wrmsr(MSR_GQ_SNOOP_MESF,0x2);
- break;
- case PMC_EV_UCP_EVENT_0CH_08H_F:
- wrmsr(MSR_GQ_SNOOP_MESF,0x8);
- break;
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;
Modified: stable/8/sys/dev/hwpmc/hwpmc_uncore.h
==============================================================================
--- stable/8/sys/dev/hwpmc/hwpmc_uncore.h Fri Jun 22 16:20:13 2012
(r237446)
+++ stable/8/sys/dev/hwpmc/hwpmc_uncore.h Fri Jun 22 16:31:00 2012
(r237447)
@@ -87,7 +87,6 @@ struct pmc_md_ucp_op_pmcallocate {
#define UC_GLOBAL_CTRL 0x391
#define UC_GLOBAL_OVF_CTRL 0x393
-
#define UC_GLOBAL_STATUS_FLAG_CLRCHG (1ULL << 63)
#define UC_GLOBAL_STATUS_FLAG_OVFPMI (1ULL << 61)
#define UC_GLOBAL_CTRL_FLAG_FRZ (1ULL << 63)
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
