GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpu/intel/model_206ax: Use haswell cstate_map 

Make the code look like on newer platforms. This doesn't change
functionality.

Test: Lenovo X220 still boots and advertises all C-states as
      before.

Change-Id: Ie7076d11720d55a4ac11318cbbdab9f75d08e15e
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78193
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
This commit is contained in:
Patrick Rudolph 2023-09-30 10:45:33 +02:00 committed by Felix Held
parent 130643277c
commit 588c6f006e
2 changed files with 37 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/cpu/intel/model_206ax/acpi.c
View File

@ -13,79 +13,52 @@
#include "model_206ax.h" #include "model_206ax.h"
#include "chip.h" #include "chip.h"
#define MWAIT_RES(state, sub_state) \
{ \
.addrl = (((state) << 4) | (sub_state)), \
.space_id = ACPI_ADDRESS_SPACE_FIXED, \
.bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, \
.bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, \
.access_size = ACPI_FFIXEDHW_FLAG_HW_COORD, \
}
/* /*
* List of supported C-states in this processor * List of supported C-states in this processor
* *
* Latencies are typical worst-case package exit time in uS * Latencies are typical worst-case package exit time in uS
* taken from the SandyBridge BIOS specification. * taken from the SandyBridge BIOS specification.
*/ */
static const acpi_cstate_t cstate_map[] = { static acpi_cstate_t cstate_map[NUM_C_STATES] = {
{ /* 0: C0 */ [C_STATE_C0] = { },
}, { /* 1: C1 */ [C_STATE_C1] = {
.latency = 1, .latency = 1,
.power = 1000, .power = 1000,
.resource = { .resource = MWAIT_RES(0, 0),
.addrl = 0x00, /* MWAIT State 0 */
.space_id = ACPI_ADDRESS_SPACE_FIXED,
.bit_width = ACPI_FFIXEDHW_VENDOR_INTEL,
.bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT,
.access_size = ACPI_FFIXEDHW_FLAG_HW_COORD,
}
}, },
{ /* 2: C1E */ [C_STATE_C1E] = {
.latency = 1, .latency = 1,
.power = 1000, .power = 1000,
.resource = { .resource = MWAIT_RES(0, 1),
.addrl = 0x01, /* MWAIT State 0 Sub-state 1 */
.space_id = ACPI_ADDRESS_SPACE_FIXED,
.bit_width = ACPI_FFIXEDHW_VENDOR_INTEL,
.bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT,
.access_size = ACPI_FFIXEDHW_FLAG_HW_COORD,
}
}, },
{ /* 3: C3 */ [C_STATE_C3] = {
.latency = 63, .latency = 63,
.power = 500, .power = 500,
.resource = { .resource = MWAIT_RES(1, 0),
.addrl = 0x10, /* MWAIT State 1 */
.space_id = ACPI_ADDRESS_SPACE_FIXED,
.bit_width = ACPI_FFIXEDHW_VENDOR_INTEL,
.bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT,
.access_size = ACPI_FFIXEDHW_FLAG_HW_COORD,
}
}, },
{ /* 4: C6 */ [C_STATE_C6] = {
.latency = 87, .latency = 87,
.power = 350, .power = 350,
.resource = { .resource = MWAIT_RES(2, 0),
.addrl = 0x20, /* MWAIT State 2 */
.space_id = ACPI_ADDRESS_SPACE_FIXED,
.bit_width = ACPI_FFIXEDHW_VENDOR_INTEL,
.bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT,
.access_size = ACPI_FFIXEDHW_FLAG_HW_COORD,
}
}, },
{ /* 5: C7 */ [C_STATE_C7] = {
.latency = 90, .latency = 90,
.power = 200, .power = 200,
.resource = { .resource = MWAIT_RES(3, 0),
.addrl = 0x30, /* MWAIT State 3 */
.space_id = ACPI_ADDRESS_SPACE_FIXED,
.bit_width = ACPI_FFIXEDHW_VENDOR_INTEL,
.bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT,
.access_size = ACPI_FFIXEDHW_FLAG_HW_COORD,
}
}, },
{ /* 6: C7S */ [C_STATE_C7S] = {
.latency = 90, .latency = 90,
.power = 200, .power = 200,
.resource = { .resource = MWAIT_RES(3, 1),
.addrl = 0x31, /* MWAIT State 3 Sub-state 1 */
.space_id = ACPI_ADDRESS_SPACE_FIXED,
.bit_width = ACPI_FFIXEDHW_VENDOR_INTEL,
.bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT,
.access_size = ACPI_FFIXEDHW_FLAG_HW_COORD,
}
}, },
}; };

14
src/cpu/intel/model_206ax/model_206ax.h
View File

@ -109,6 +109,20 @@
# error "CONFIG_IED_REGION_SIZE is not a power of 2" # error "CONFIG_IED_REGION_SIZE is not a power of 2"
#endif #endif
/*
* List of supported C-states for Sandy Bridge/Ivy Bridge.
*/
enum {
C_STATE_C0 = 0,
C_STATE_C1 = 1,
C_STATE_C1E = 2,
C_STATE_C3 = 3,
C_STATE_C6 = 4,
C_STATE_C7 = 5,
C_STATE_C7S = 6,
NUM_C_STATES,
};
/* Lock MSRs */ /* Lock MSRs */
void intel_model_206ax_finalize_smm(void); void intel_model_206ax_finalize_smm(void);