From owner-svn-src-all@FreeBSD.ORG Thu Nov 27 06:42:35 2014 Return-Path: Delivered-To: svn-src-all@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 F051A772; Thu, 27 Nov 2014 06:42:34 +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 C266322D; Thu, 27 Nov 2014 06:42:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAR6gYqp042084; Thu, 27 Nov 2014 06:42:34 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAR6gYcO042083; Thu, 27 Nov 2014 06:42:34 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201411270642.sAR6gYcO042083@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Thu, 27 Nov 2014 06:42:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r275171 - 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-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Nov 2014 06:42:35 -0000 Author: jhibbits Date: Thu Nov 27 06:42:34 2014 New Revision: 275171 URL: https://svnweb.freebsd.org/changeset/base/275171 Log: Fix hwpmc sampling for MPC74xxx (G4) processors. With this, hwpmc sampling now works correctly on these processors. MFC after: 3 weeks Relnotes: yes Modified: head/sys/dev/hwpmc/hwpmc_mpc7xxx.c Modified: head/sys/dev/hwpmc/hwpmc_mpc7xxx.c ============================================================================== --- head/sys/dev/hwpmc/hwpmc_mpc7xxx.c Thu Nov 27 06:04:00 2014 (r275170) +++ head/sys/dev/hwpmc/hwpmc_mpc7xxx.c Thu Nov 27 06:42:34 2014 (r275171) @@ -578,9 +578,9 @@ mpc7xxx_pcpu_init(struct pmc_mdep *md, i } /* Clear the MMCRs, and set FC, to disable all PMCs. */ - mtspr(SPR_MMCR0, SPR_MMCR0_FC | SPR_MMCR0_PMXE | SPR_MMCR0_PMC1CE | SPR_MMCR0_PMCNCE); + mtspr(SPR_MMCR0, SPR_MMCR0_FC | SPR_MMCR0_PMXE | + SPR_MMCR0_FCECE | SPR_MMCR0_PMC1CE | SPR_MMCR0_PMCNCE); mtspr(SPR_MMCR1, 0); - mtmsr(mfmsr() | PSL_PMM); return 0; } @@ -667,7 +667,6 @@ mpc7xxx_intr(int cpu, struct trapframe * uint32_t config; struct pmc *pm; struct powerpc_cpu *pac; - pmc_value_t v; KASSERT(cpu >= 0 && cpu < pmc_cpu_max(), ("[powerpc,%d] out of range CPU %d", __LINE__, cpu)); @@ -679,8 +678,7 @@ mpc7xxx_intr(int cpu, struct trapframe * pac = powerpc_pcpu[cpu]; - config = mfspr(SPR_MMCR0); - mtspr(SPR_MMCR0, config | SPR_MMCR0_FC); + config = mfspr(SPR_MMCR0) & ~SPR_MMCR0_FC; /* * look for all PMCs that have interrupted: @@ -704,22 +702,22 @@ mpc7xxx_intr(int cpu, struct trapframe * if (pm->pm_state != PMC_STATE_RUNNING) continue; - /* Stop the PMC, reload count. */ - v = pm->pm_sc.pm_reloadcount; - mpc7xxx_pmcn_write(i, v); - - /* Restart the counter if logging succeeded. */ + /* Stop the counter if logging fails. */ error = pmc_process_interrupt(cpu, PMC_HR, pm, tf, TRAPF_USERMODE(tf)); if (error != 0) mpc7xxx_stop_pmc(cpu, i); - atomic_add_int(retval ? &pmc_stats.pm_intr_processed : - &pmc_stats.pm_intr_ignored, 1); + /* reload count. */ + mpc7xxx_write_pmc(cpu, i, pm->pm_sc.pm_reloadcount); } + atomic_add_int(retval ? &pmc_stats.pm_intr_processed : + &pmc_stats.pm_intr_ignored, 1); + /* Re-enable PERF exceptions. */ - mtspr(SPR_MMCR0, config | SPR_MMCR0_PMXE); + if (retval) + mtspr(SPR_MMCR0, config | SPR_MMCR0_PMXE); return (retval); }