Enable and disable the PMC unit at load/unload time, respectively.

MFC after:	3 weeks
This commit is contained in:
Justin Hibbits 2014-04-18 06:39:00 +00:00
parent 79d6ca331e
commit 8a00edea58
2 changed files with 8 additions and 0 deletions

View File

@ -580,6 +580,7 @@ mpc7xxx_pcpu_init(struct pmc_mdep *md, int cpu)
/* Clear the MMCRs, and set FC, to disable all PMCs. */ /* 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_PMC1CE | SPR_MMCR0_PMCNCE);
mtspr(SPR_MMCR1, 0); mtspr(SPR_MMCR1, 0);
mtmsr(mfmsr() | PSL_PMM);
return 0; return 0;
} }
@ -589,10 +590,13 @@ mpc7xxx_pcpu_fini(struct pmc_mdep *md, int cpu)
{ {
uint32_t mmcr0 = mfspr(SPR_MMCR0); uint32_t mmcr0 = mfspr(SPR_MMCR0);
mtmsr(mfmsr() & ~PSL_PMM);
mmcr0 |= SPR_MMCR0_FC; mmcr0 |= SPR_MMCR0_FC;
mtspr(SPR_MMCR0, mmcr0); mtspr(SPR_MMCR0, mmcr0);
free(powerpc_pcpu[cpu]->pc_ppcpmcs, M_PMC); free(powerpc_pcpu[cpu]->pc_ppcpmcs, M_PMC);
free(powerpc_pcpu[cpu], M_PMC); free(powerpc_pcpu[cpu], M_PMC);
return 0; return 0;
} }

View File

@ -575,6 +575,7 @@ ppc970_pcpu_init(struct pmc_mdep *md, int cpu)
mtspr(SPR_970MMCR0, SPR_MMCR0_FC | SPR_MMCR0_PMXE | SPR_MMCR0_PMC1CE | mtspr(SPR_970MMCR0, SPR_MMCR0_FC | SPR_MMCR0_PMXE | SPR_MMCR0_PMC1CE |
SPR_MMCR0_PMCNCE | SPR_970MMCR0_PMC1SEL(0x8) | SPR_970MMCR0_PMC2SEL(0x8)); SPR_MMCR0_PMCNCE | SPR_970MMCR0_PMC1SEL(0x8) | SPR_970MMCR0_PMC2SEL(0x8));
mtspr(SPR_970MMCR1, 0x4218420); mtspr(SPR_970MMCR1, 0x4218420);
mtmsr(mfmsr() | PSL_PMM);
return 0; return 0;
} }
@ -584,11 +585,14 @@ ppc970_pcpu_fini(struct pmc_mdep *md, int cpu)
{ {
register_t mmcr0 = mfspr(SPR_MMCR0); register_t mmcr0 = mfspr(SPR_MMCR0);
mtmsr(mfmsr() & ~PSL_PMM);
mmcr0 |= SPR_MMCR0_FC; mmcr0 |= SPR_MMCR0_FC;
mmcr0 &= ~SPR_MMCR0_PMXE; mmcr0 &= ~SPR_MMCR0_PMXE;
mtspr(SPR_MMCR0, mmcr0); mtspr(SPR_MMCR0, mmcr0);
free(powerpc_pcpu[cpu]->pc_ppcpmcs, M_PMC); free(powerpc_pcpu[cpu]->pc_ppcpmcs, M_PMC);
free(powerpc_pcpu[cpu], M_PMC); free(powerpc_pcpu[cpu], M_PMC);
return 0; return 0;
} }