Deleted Added
full compact
hwpmc_intel.c (240164) hwpmc_intel.c (241738)
1/*-
2 * Copyright (c) 2008 Joseph Koshy
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * SUCH DAMAGE.
25 */
26
27/*
28 * Common code for handling Intel CPUs.
29 */
30
31#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2008 Joseph Koshy
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * SUCH DAMAGE.
25 */
26
27/*
28 * Common code for handling Intel CPUs.
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/sys/dev/hwpmc/hwpmc_intel.c 240164 2012-09-06 13:54:01Z fabient $");
32__FBSDID("$FreeBSD: head/sys/dev/hwpmc/hwpmc_intel.c 241738 2012-10-19 17:01:27Z sbruno $");
33
34#include <sys/param.h>
35#include <sys/pmc.h>
36#include <sys/pmckern.h>
37#include <sys/systm.h>
38
39#include <machine/cpu.h>
40#include <machine/cputypes.h>

--- 100 unchanged lines hidden (view full) ---

141 case 0x2C: /* Per Intel document 253669-033US 12/2009. */
142 cputype = PMC_CPU_INTEL_WESTMERE;
143 nclasses = 5;
144 break;
145 case 0x2A: /* Per Intel document 253669-039US 05/2011. */
146 cputype = PMC_CPU_INTEL_SANDYBRIDGE;
147 nclasses = 5;
148 break;
33
34#include <sys/param.h>
35#include <sys/pmc.h>
36#include <sys/pmckern.h>
37#include <sys/systm.h>
38
39#include <machine/cpu.h>
40#include <machine/cputypes.h>

--- 100 unchanged lines hidden (view full) ---

141 case 0x2C: /* Per Intel document 253669-033US 12/2009. */
142 cputype = PMC_CPU_INTEL_WESTMERE;
143 nclasses = 5;
144 break;
145 case 0x2A: /* Per Intel document 253669-039US 05/2011. */
146 cputype = PMC_CPU_INTEL_SANDYBRIDGE;
147 nclasses = 5;
148 break;
149 case 0x2D: /* Per Intel document 253669-044US 08/2012. */
150 cputype = PMC_CPU_INTEL_SANDYBRIDGE_XEON;
151 nclasses = 3;
152 break;
149 case 0x3A: /* Per Intel document 253669-043US 05/2012. */
150 cputype = PMC_CPU_INTEL_IVYBRIDGE;
151 nclasses = 3;
152 break;
153 }
154 break;
155#if defined(__i386__) || defined(__amd64__)
156 case 0xF00: /* P4 */

--- 29 unchanged lines hidden (view full) ---

186 case PMC_CPU_INTEL_ATOM:
187 case PMC_CPU_INTEL_CORE:
188 case PMC_CPU_INTEL_CORE2:
189 case PMC_CPU_INTEL_CORE2EXTREME:
190 case PMC_CPU_INTEL_COREI7:
191 case PMC_CPU_INTEL_IVYBRIDGE:
192 case PMC_CPU_INTEL_SANDYBRIDGE:
193 case PMC_CPU_INTEL_WESTMERE:
153 case 0x3A: /* Per Intel document 253669-043US 05/2012. */
154 cputype = PMC_CPU_INTEL_IVYBRIDGE;
155 nclasses = 3;
156 break;
157 }
158 break;
159#if defined(__i386__) || defined(__amd64__)
160 case 0xF00: /* P4 */

--- 29 unchanged lines hidden (view full) ---

190 case PMC_CPU_INTEL_ATOM:
191 case PMC_CPU_INTEL_CORE:
192 case PMC_CPU_INTEL_CORE2:
193 case PMC_CPU_INTEL_CORE2EXTREME:
194 case PMC_CPU_INTEL_COREI7:
195 case PMC_CPU_INTEL_IVYBRIDGE:
196 case PMC_CPU_INTEL_SANDYBRIDGE:
197 case PMC_CPU_INTEL_WESTMERE:
198 case PMC_CPU_INTEL_SANDYBRIDGE_XEON:
194 error = pmc_core_initialize(pmc_mdep, ncpus);
195 break;
196
197 /*
198 * Intel Pentium 4 Processors, and P4/EMT64 processors.
199 */
200
201 case PMC_CPU_INTEL_PIV:

--- 67 unchanged lines hidden (view full) ---

269 case PMC_CPU_INTEL_ATOM:
270 case PMC_CPU_INTEL_CORE:
271 case PMC_CPU_INTEL_CORE2:
272 case PMC_CPU_INTEL_CORE2EXTREME:
273 case PMC_CPU_INTEL_COREI7:
274 case PMC_CPU_INTEL_IVYBRIDGE:
275 case PMC_CPU_INTEL_SANDYBRIDGE:
276 case PMC_CPU_INTEL_WESTMERE:
199 error = pmc_core_initialize(pmc_mdep, ncpus);
200 break;
201
202 /*
203 * Intel Pentium 4 Processors, and P4/EMT64 processors.
204 */
205
206 case PMC_CPU_INTEL_PIV:

--- 67 unchanged lines hidden (view full) ---

274 case PMC_CPU_INTEL_ATOM:
275 case PMC_CPU_INTEL_CORE:
276 case PMC_CPU_INTEL_CORE2:
277 case PMC_CPU_INTEL_CORE2EXTREME:
278 case PMC_CPU_INTEL_COREI7:
279 case PMC_CPU_INTEL_IVYBRIDGE:
280 case PMC_CPU_INTEL_SANDYBRIDGE:
281 case PMC_CPU_INTEL_WESTMERE:
282 case PMC_CPU_INTEL_SANDYBRIDGE_XEON:
277 pmc_core_finalize(md);
278 break;
279
280 case PMC_CPU_INTEL_PIV:
281 pmc_p4_finalize(md);
282 break;
283#endif
284#if defined(__i386__)

--- 30 unchanged lines hidden ---
283 pmc_core_finalize(md);
284 break;
285
286 case PMC_CPU_INTEL_PIV:
287 pmc_p4_finalize(md);
288 break;
289#endif
290#if defined(__i386__)

--- 30 unchanged lines hidden ---