diff options
Diffstat (limited to 'sys/dev/hwpmc/hwpmc_mips.c')
| -rw-r--r-- | sys/dev/hwpmc/hwpmc_mips.c | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/sys/dev/hwpmc/hwpmc_mips.c b/sys/dev/hwpmc/hwpmc_mips.c index 1ed3fdea8915..cf9550b4cbc9 100644 --- a/sys/dev/hwpmc/hwpmc_mips.c +++ b/sys/dev/hwpmc/hwpmc_mips.c @@ -113,9 +113,8 @@ mips_allocate_pmc(int cpu, int ri, struct pmc *pm, static int -mips_read_pmc(int cpu, int ri, pmc_value_t *v) +mips_read_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t *v) { - struct pmc *pm; pmc_value_t tmp; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), @@ -123,7 +122,6 @@ mips_read_pmc(int cpu, int ri, pmc_value_t *v) KASSERT(ri >= 0 && ri < mips_npmcs, ("[mips,%d] illegal row index %d", __LINE__, ri)); - pm = mips_pcpu[cpu]->pc_mipspmcs[ri].phw_pmc; tmp = mips_pmcn_read(ri); PMCDBG2(MDP,REA,2,"mips-read id=%d -> %jd", ri, tmp); @@ -136,17 +134,14 @@ mips_read_pmc(int cpu, int ri, pmc_value_t *v) } static int -mips_write_pmc(int cpu, int ri, pmc_value_t v) +mips_write_pmc(int cpu, int ri, struct pmc *pm, pmc_value_t v) { - struct pmc *pm; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[mips,%d] illegal CPU value %d", __LINE__, cpu)); KASSERT(ri >= 0 && ri < mips_npmcs, ("[mips,%d] illegal row-index %d", __LINE__, ri)); - pm = mips_pcpu[cpu]->pc_mipspmcs[ri].phw_pmc; - if (PMC_IS_SAMPLING_MODE(PMC_TO_MODE(pm))) v = (1UL << (mips_pmc_spec.ps_counter_width - 1)) - v; @@ -181,14 +176,10 @@ mips_config_pmc(int cpu, int ri, struct pmc *pm) } static int -mips_start_pmc(int cpu, int ri) +mips_start_pmc(int cpu, int ri, struct pmc *pm) { uint32_t config; - struct pmc *pm; - struct pmc_hw *phw; - phw = &mips_pcpu[cpu]->pc_mipspmcs[ri]; - pm = phw->phw_pmc; config = pm->pm_md.pm_mips_evsel; /* Enable the PMC. */ @@ -207,13 +198,8 @@ mips_start_pmc(int cpu, int ri) } static int -mips_stop_pmc(int cpu, int ri) +mips_stop_pmc(int cpu, int ri, struct pmc *pm __unused) { - struct pmc *pm; - struct pmc_hw *phw; - - phw = &mips_pcpu[cpu]->pc_mipspmcs[ri]; - pm = phw->phw_pmc; /* * Disable the PMCs. @@ -297,11 +283,11 @@ mips_pmc_intr(struct trapframe *tf) r0 = 0; else if (ri == 1) r2 = 0; - mips_stop_pmc(cpu, ri); + mips_stop_pmc(cpu, ri, pm); } /* Reload sampling count */ - mips_write_pmc(cpu, ri, pm->pm_sc.pm_reloadcount); + mips_write_pmc(cpu, ri, pm, pm->pm_sc.pm_reloadcount); } /* |