Patrick Georgi merged this change.

View Change

Approvals: build bot (Jenkins): Verified Marshall Dawson: Looks good to me, approved Angel Pons: Looks good to me, approved
cpu/amd/family_10h-family_15h: Remove variable set but not used

Change-Id: Ifc63ec5b588f8edcec5eda343ec9694332845045
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33006
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/cpu/amd/family_10h-family_15h/init_cpus.c
1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/cpu/amd/family_10h-family_15h/init_cpus.c b/src/cpu/amd/family_10h-family_15h/init_cpus.c
index 310706b..d6a4725 100644
--- a/src/cpu/amd/family_10h-family_15h/init_cpus.c
+++ b/src/cpu/amd/family_10h-family_15h/init_cpus.c
@@ -986,7 +986,6 @@
uint8_t nvram;
u32 platform;
uint64_t revision;
- uint8_t enable_c_states;
uint8_t enable_cpb;

printk(BIOS_DEBUG, "cpuSetAMDMSR ");
@@ -1062,21 +1061,16 @@
}

if (revision & (AMD_DR_Ex | AMD_FAM15_ALL)) {
- enable_c_states = 0;
if (CONFIG(HAVE_ACPI_TABLES))
- if (get_option(&nvram, "cpu_c_states") == CB_SUCCESS)
- enable_c_states = !!nvram;
-
- if (enable_c_states) {
- /* Set up the C-state base address */
- msr_t c_state_addr_msr;
- c_state_addr_msr = rdmsr(MSR_CSTATE_ADDRESS);
- c_state_addr_msr.lo = ACPI_CPU_P_LVL2; /* CstateAddr = ACPI_CPU_P_LVL2 */
- wrmsr(MSR_CSTATE_ADDRESS, c_state_addr_msr);
- }
+ if ((get_option(&nvram, "cpu_c_states") == CB_SUCCESS) &&
+ (nvram)) {
+ /* Set up the C-state base address */
+ msr_t c_state_addr_msr;
+ c_state_addr_msr = rdmsr(MSR_CSTATE_ADDRESS);
+ c_state_addr_msr.lo = ACPI_CPU_P_LVL2;
+ wrmsr(MSR_CSTATE_ADDRESS, c_state_addr_msr);
+ }
}
-#else
- enable_c_states = 0;
#endif

if (revision & AMD_FAM15_ALL) {

To view, visit change 33006. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ifc63ec5b588f8edcec5eda343ec9694332845045
Gerrit-Change-Number: 33006
Gerrit-PatchSet: 5
Gerrit-Owner: HAOUAS Elyes <ehaouas@noos.fr>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: HAOUAS Elyes <ehaouas@noos.fr>
Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki@gmail.com>
Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd@gmail.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged