svn commit: r230063 - head/sys/dev/hwpmc

George V. Neville-Neil gnn at FreeBSD.org
Fri Jan 13 17:13:47 UTC 2012


Author: gnn
Date: Fri Jan 13 17:13:46 2012
New Revision: 230063
URL: http://svn.freebsd.org/changeset/base/230063

Log:
  Clean up a switch statement for uncore events on Westmere processors.
  
  Submitted by:	Davide Italiano
  Reviewed by:	gnn
  MFC after:	1 week

Modified:
  head/sys/dev/hwpmc/hwpmc_uncore.c
  head/sys/dev/hwpmc/hwpmc_uncore.h

Modified: head/sys/dev/hwpmc/hwpmc_uncore.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_uncore.c	Fri Jan 13 16:01:34 2012	(r230062)
+++ head/sys/dev/hwpmc/hwpmc_uncore.c	Fri Jan 13 17:13:46 2012	(r230063)
@@ -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: head/sys/dev/hwpmc/hwpmc_uncore.h
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_uncore.h	Fri Jan 13 16:01:34 2012	(r230062)
+++ head/sys/dev/hwpmc/hwpmc_uncore.h	Fri Jan 13 17:13:46 2012	(r230063)
@@ -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)


More information about the svn-src-head mailing list