turbostat.c (9392bd98bba760be96ee67f51cb040dcf7aa190e) turbostat.c (3316f99a9f1b68c578c57e76792bd19da1c7d423)
1/*
2 * turbostat -- show CPU frequency and C-state residency
3 * on modern Intel and AMD processors.
4 *
5 * Copyright (c) 2013 Intel Corporation.
6 * Len Brown <len.brown@intel.com>
7 *
8 * This program is free software; you can redistribute it and/or modify it

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

1980 return -16;
1981 p->rapl_pkg_perf_status = msr & 0xFFFFFFFF;
1982 }
1983 if (do_rapl & RAPL_DRAM_PERF_STATUS) {
1984 if (get_msr(cpu, MSR_DRAM_PERF_STATUS, &msr))
1985 return -16;
1986 p->rapl_dram_perf_status = msr & 0xFFFFFFFF;
1987 }
1/*
2 * turbostat -- show CPU frequency and C-state residency
3 * on modern Intel and AMD processors.
4 *
5 * Copyright (c) 2013 Intel Corporation.
6 * Len Brown <len.brown@intel.com>
7 *
8 * This program is free software; you can redistribute it and/or modify it

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

1980 return -16;
1981 p->rapl_pkg_perf_status = msr & 0xFFFFFFFF;
1982 }
1983 if (do_rapl & RAPL_DRAM_PERF_STATUS) {
1984 if (get_msr(cpu, MSR_DRAM_PERF_STATUS, &msr))
1985 return -16;
1986 p->rapl_dram_perf_status = msr & 0xFFFFFFFF;
1987 }
1988 if (do_rapl & RAPL_AMD_F17H) {
1989 if (get_msr(cpu, MSR_PKG_ENERGY_STAT, &msr))
1990 return -13;
1991 p->energy_pkg = msr & 0xFFFFFFFF;
1992 }
1988 if (DO_BIC(BIC_PkgTmp)) {
1989 if (get_msr(cpu, MSR_IA32_PACKAGE_THERM_STATUS, &msr))
1990 return -17;
1991 p->pkg_temp_c = tcc_activation_temp - ((msr >> 16) & 0x7F);
1992 }
1993
1994 if (DO_BIC(BIC_GFX_rc6))
1995 p->gfx_rc6_ms = gfx_cur_rc6_ms;

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

3974 }
3975
3976 if (!has_rapl)
3977 return;
3978
3979 switch (family) {
3980 case 0x17: /* Zen, Zen+ */
3981 do_rapl = RAPL_AMD_F17H | RAPL_PER_CORE_ENERGY;
1993 if (DO_BIC(BIC_PkgTmp)) {
1994 if (get_msr(cpu, MSR_IA32_PACKAGE_THERM_STATUS, &msr))
1995 return -17;
1996 p->pkg_temp_c = tcc_activation_temp - ((msr >> 16) & 0x7F);
1997 }
1998
1999 if (DO_BIC(BIC_GFX_rc6))
2000 p->gfx_rc6_ms = gfx_cur_rc6_ms;

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

3979 }
3980
3981 if (!has_rapl)
3982 return;
3983
3984 switch (family) {
3985 case 0x17: /* Zen, Zen+ */
3986 do_rapl = RAPL_AMD_F17H | RAPL_PER_CORE_ENERGY;
3982 if (rapl_joules)
3987 if (rapl_joules) {
3988 BIC_PRESENT(BIC_Pkg_J);
3983 BIC_PRESENT(BIC_Cor_J);
3989 BIC_PRESENT(BIC_Cor_J);
3984 else
3990 } else {
3991 BIC_PRESENT(BIC_PkgWatt);
3985 BIC_PRESENT(BIC_CorWatt);
3992 BIC_PRESENT(BIC_CorWatt);
3993 }
3986 break;
3987 default:
3988 return;
3989 }
3990
3991 if (get_msr(base_cpu, MSR_RAPL_PWR_UNIT, &msr))
3992 return;
3993

--- 1754 unchanged lines hidden --- 		3994 break;
3995 default:
3996 return;
3997 }
3998
3999 if (get_msr(base_cpu, MSR_RAPL_PWR_UNIT, &msr))
4000 return;
4001

--- 1754 unchanged lines hidden ---