diff options
| -rw-r--r-- | src/soc/amd/stoneyridge/cpu.c | 6 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/tsc_freq.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/soc/amd/stoneyridge/cpu.c b/src/soc/amd/stoneyridge/cpu.c index 39db1f4466..2f4c0d09cb 100644 --- a/src/soc/amd/stoneyridge/cpu.c +++ b/src/soc/amd/stoneyridge/cpu.c @@ -15,6 +15,7 @@ #include <soc/cpu.h> #include <soc/iomap.h> #include <console/console.h> +#include <types.h> /* * MP and SMM loading initialization. @@ -69,3 +70,8 @@ static const struct cpu_driver model_15 __cpu_driver = { .ops = &cpu_dev_ops, .id_table = cpu_table, }; + +uint32_t get_pstate_0_reg(void) +{ + return (pci_read_config32(SOC_PM_DEV, CORE_PERF_BOOST_CTRL) >> 2) & 0x7; +} diff --git a/src/soc/amd/stoneyridge/tsc_freq.c b/src/soc/amd/stoneyridge/tsc_freq.c index e676fb1ec4..d40996981e 100644 --- a/src/soc/amd/stoneyridge/tsc_freq.c +++ b/src/soc/amd/stoneyridge/tsc_freq.c @@ -12,7 +12,6 @@ unsigned long tsc_freq_mhz(void) { union pstate_msr pstate_reg; - uint8_t boost_states; /* * See the Family 15h Models 70h-7Fh BKDG (PID 55072) definition for @@ -20,10 +19,7 @@ unsigned long tsc_freq_mhz(void) * to the "Software P-state Numbering" section, P0 is the highest * non-boosted state. freq = 100MHz * (CpuFid + 10h) / (2^(CpuDid)). */ - boost_states = (pci_read_config32(SOC_PM_DEV, CORE_PERF_BOOST_CTRL) - >> 2) & 0x7; - - pstate_reg.raw = rdmsr(PSTATE_MSR(boost_states)).raw; + pstate_reg.raw = rdmsr(PSTATE_MSR(get_pstate_0_reg())).raw; if (!pstate_reg.pstate_en) die("Unknown error: cannot determine P-state 0\n"); |