svn commit: r237444 - stable/9/sys/dev/hwpmc

[George V. Neville-Neil]

Author: gnn
Date: Fri Jun 22 14:58:40 2012
New Revision: 237444
URL: http://svn.freebsd.org/changeset/base/237444

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

Modified:
  stable/9/sys/dev/hwpmc/hwpmc_uncore.c
  stable/9/sys/dev/hwpmc/hwpmc_uncore.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/dev/e1000/   (props changed)
  stable/9/sys/dev/isp/   (props changed)
  stable/9/sys/dev/ixgbe/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/sys/dev/hwpmc/hwpmc_uncore.c
==============================================================================
--- stable/9/sys/dev/hwpmc/hwpmc_uncore.c	Fri Jun 22 13:56:58 2012	(r237443)
+++ stable/9/sys/dev/hwpmc/hwpmc_uncore.c	Fri Jun 22 14:58:40 2012	(r237444)
@@ -1032,26 +1032,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/9/sys/dev/hwpmc/hwpmc_uncore.h
==============================================================================
--- stable/9/sys/dev/hwpmc/hwpmc_uncore.h	Fri Jun 22 13:56:58 2012	(r237443)
+++ stable/9/sys/dev/hwpmc/hwpmc_uncore.h	Fri Jun 22 14:58:40 2012	(r237444)
@@ -89,7 +89,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)