summaryrefslogtreecommitdiff
path: root/src/soc/amd/picasso
diff options
context:
space:
mode:
authorFelix Held <felix-coreboot@felixheld.de>2023-03-23 23:57:44 +0100
committerFelix Held <felix-coreboot@felixheld.de>2023-03-27 12:02:45 +0000
commit2c9de49a971497fadaf5272fd1bacee7a316dbfc (patch)
tree6efb7a4bb018c758d4e1e630b131343cd4d67ab8 /src/soc/amd/picasso
parent23a398e001b55950f7759aa7ffa2ec966e2ea917 (diff)
soc/amd: introduce and use get_pstate_core_uvolts for SVI2 and SVI3
Since SVI3 has the CPU voltage ID split into two parts, a serial voltage ID version specific function is needed to get the raw core VID value. This will allow making get_pstate_core_power common for all AMD CPUs in a follow-up patch. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: I71ca88c38b307558905a26cce8be1e8ffc5fbed4 Reviewed-on: https://review.coreboot.org/c/coreboot/+/73996 Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com> Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com> Reviewed-by: Matt DeVillier <matt.devillier@amd.corp-partner.google.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/amd/picasso')
-rw-r--r--src/soc/amd/picasso/acpi.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c
index d1232e3525..a32c073b25 100644
--- a/src/soc/amd/picasso/acpi.c
+++ b/src/soc/amd/picasso/acpi.c
@@ -138,10 +138,10 @@ uint32_t get_pstate_core_freq(union pstate_msr pstate_reg)
uint32_t get_pstate_core_power(union pstate_msr pstate_reg)
{
- uint32_t voltage_in_uvolts, core_vid, current_value_amps, current_divisor, power_in_mw;
+ uint32_t voltage_in_uvolts, current_value_amps, current_divisor, power_in_mw;
- /* Core voltage ID */
- core_vid = pstate_reg.cpu_vid_0_7;
+ /* Get Voltage from core voltage ID */
+ voltage_in_uvolts = get_pstate_core_uvolts(pstate_reg);
/* Current value in amps */
current_value_amps = pstate_reg.idd_value;
@@ -149,9 +149,6 @@ uint32_t get_pstate_core_power(union pstate_msr pstate_reg)
/* Current divisor */
current_divisor = pstate_reg.idd_div;
- /* Voltage */
- voltage_in_uvolts = get_uvolts_from_vid(core_vid);
-
/* Power in mW */
power_in_mw = (voltage_in_uvolts) / 10 * current_value_amps;