Deleted Added
full compact
hwpmc_piv.c (145774) hwpmc_piv.c (146799)
1/*-
2 * Copyright (c) 2003-2005 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

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2003-2005 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

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

20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 */
26
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/dev/hwpmc/hwpmc_piv.c 145774 2005-05-01 14:11:49Z jkoshy $");
28__FBSDID("$FreeBSD: head/sys/dev/hwpmc/hwpmc_piv.c 146799 2005-05-30 06:29:29Z jkoshy $");
29
30#include <sys/param.h>
31#include <sys/lock.h>
32#include <sys/mutex.h>
33#include <sys/pmc.h>
34#include <sys/pmckern.h>
35#include <sys/smp.h>
36#include <sys/systm.h>

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

1447
1448 value = lapic->lvt_pcint;
1449 value &= ~APIC_LVT_M;
1450 lapic->lvt_pcint = value;
1451}
1452
1453
1454static int
29
30#include <sys/param.h>
31#include <sys/lock.h>
32#include <sys/mutex.h>
33#include <sys/pmc.h>
34#include <sys/pmckern.h>
35#include <sys/smp.h>
36#include <sys/systm.h>

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

1447
1448 value = lapic->lvt_pcint;
1449 value &= ~APIC_LVT_M;
1450 lapic->lvt_pcint = value;
1451}
1452
1453
1454static int
1455p4_intr(int cpu, uintptr_t eip)
1455p4_intr(int cpu, uintptr_t eip, int usermode)
1456{
1457 int i, pmc_interrupted;
1458 uint32_t cccrval, pmi_ovf_mask;
1459 struct p4_cpu *pc;
1460 struct pmc_hw *phw;
1461 struct pmc *pm;
1462 pmc_value_t v;
1463
1464 (void) eip;
1456{
1457 int i, pmc_interrupted;
1458 uint32_t cccrval, pmi_ovf_mask;
1459 struct p4_cpu *pc;
1460 struct pmc_hw *phw;
1461 struct pmc *pm;
1462 pmc_value_t v;
1463
1464 (void) eip;
1465 (void) usermode;
1465 PMCDBG(MDP,INT, 1, "cpu=%d eip=%x pcint=0x%x", cpu, eip,
1466 lapic->lvt_pcint);
1467
1468 pmc_interrupted = 0;
1469 pc = (struct p4_cpu *) pmc_pcpu[cpu];
1470
1471 pmi_ovf_mask = pmc_cpu_is_logical(cpu) ?
1472 P4_CCCR_OVF_PMI_T1 : P4_CCCR_OVF_PMI_T0;

--- 193 unchanged lines hidden ---
1466 PMCDBG(MDP,INT, 1, "cpu=%d eip=%x pcint=0x%x", cpu, eip,
1467 lapic->lvt_pcint);
1468
1469 pmc_interrupted = 0;
1470 pc = (struct p4_cpu *) pmc_pcpu[cpu];
1471
1472 pmi_ovf_mask = pmc_cpu_is_logical(cpu) ?
1473 P4_CCCR_OVF_PMI_T1 : P4_CCCR_OVF_PMI_T0;

--- 193 unchanged lines hidden ---