From owner-svn-src-head@FreeBSD.ORG  Tue Mar 10 01:23:41 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E6D0B7BF;
 Tue, 10 Mar 2015 01:23:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D201510C;
 Tue, 10 Mar 2015 01:23:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2A1NfX4076310;
 Tue, 10 Mar 2015 01:23:41 GMT (envelope-from rstone@FreeBSD.org)
Received: (from rstone@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2A1NfZc076309;
 Tue, 10 Mar 2015 01:23:41 GMT (envelope-from rstone@FreeBSD.org)
Message-Id: <201503100123.t2A1NfZc076309@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rstone set sender to
 rstone@FreeBSD.org using -f
From: Ryan Stone <rstone@FreeBSD.org>
Date: Tue, 10 Mar 2015 01:23:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279831 - head/sys/dev/hwpmc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Mar 2015 01:23:42 -0000

Author: rstone
Date: Tue Mar 10 01:23:40 2015
New Revision: 279831
URL: https://svnweb.freebsd.org/changeset/base/279831

Log:
  Fix pmc unit restrictions to match documentation
  
  A couple of pmc counters did not work because there were being
  restricted to the wrong PMC unit.  I've verified that these
  counters now work and match the documented restrictions.
  
  Differential Revision:	https://reviews.freebsd.org/D1586
  MFC after:	1 month
  Sponsored by:	Sandvine Inc

Modified:
  head/sys/dev/hwpmc/hwpmc_core.c

Modified: head/sys/dev/hwpmc/hwpmc_core.c
==============================================================================
--- head/sys/dev/hwpmc/hwpmc_core.c	Tue Mar 10 01:23:34 2015	(r279830)
+++ head/sys/dev/hwpmc/hwpmc_core.c	Tue Mar 10 01:23:40 2015	(r279831)
@@ -1965,15 +1965,15 @@ iap_event_sb_sbx_ib_ibx_ok_on_counter(en
 		break;
 		/* Events valid only on counter 1. */
 	case PMC_EV_IAP_EVENT_C0H_01H:
-		mask = 0x1;
+		mask = 0x2;
 		break;
 		/* Events valid only on counter 2. */
 	case PMC_EV_IAP_EVENT_48H_01H:
 	case PMC_EV_IAP_EVENT_A2H_02H:
+	case PMC_EV_IAP_EVENT_A3H_08H:
 		mask = 0x4;
 		break;
 		/* Events valid only on counter 3. */
-	case PMC_EV_IAP_EVENT_A3H_08H:
 	case PMC_EV_IAP_EVENT_BBH_01H:
 	case PMC_EV_IAP_EVENT_CDH_01H:
 	case PMC_EV_IAP_EVENT_CDH_02H: