From 03a48edc3dfacf1106936fb052923e3fda40ed99 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Fri, 17 Jun 2016 07:10:03 -0400 Subject: x60,t60: delete manually added c4 state The ich7 datasheet "Intel® I/O Controller Hub 7 (ICH7) Family" has a reg called GEN_PMCON_1 in which c3 can automatically be upgraded to c4. This is already set in coreboot. --- diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0001-t60-enable-c4-and-new-style-to-_CST-table.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0001-t60-enable-c4-and-new-style-to-_CST-table.patch deleted file mode 100644 index f0bb468..0000000 --- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/t60/0001-t60-enable-c4-and-new-style-to-_CST-table.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a6a582cfbcca2814deac138693ad1fb9c5165eb6 Mon Sep 17 00:00:00 2001 -From: Arthur Heymans -Date: Sat, 14 May 2016 04:17:14 +0200 -Subject: [PATCH] t60: enable c4 and new style to _CST table - -this change is identical to the x60 change in -mainboard.c - -TEST= Build and boot platform. See if there is a state4 -in /sys/devices/system/cpu/cpu0/cpuidle/ - -Signed-off-by: Arthur Heymans ---- - src/mainboard/lenovo/t60/mainboard.c | 39 +++++++++++++++++++++++++++++++++--- - 1 file changed, 36 insertions(+), 3 deletions(-) - -diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c -index 44fa402..4a444ed 100644 ---- a/src/mainboard/lenovo/t60/mainboard.c -+++ b/src/mainboard/lenovo/t60/mainboard.c -@@ -34,10 +34,43 @@ - #include - #define PANEL INT15_5F35_CL_DISPLAY_DEFAULT - -+#define MWAIT_RES(state, sub_state) \ -+ { \ -+ .space_id = ACPI_ADDRESS_SPACE_FIXED, \ -+ .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, \ -+ .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, \ -+ { \ -+ .resv = 0, \ -+ }, \ -+ .addrl = (((state) << 4) | (sub_state)), \ -+ .addrh = 0, \ -+ } -+ - static acpi_cstate_t cst_entries[] = { -- { 1, 1, 1000, { 0x7f, 1, 2, { 0 }, 1, 0 } }, -- { 2, 1, 500, { 0x01, 8, 0, { 0 }, DEFAULT_PMBASE + LV2, 0 } }, -- { 2, 17, 250, { 0x01, 8, 0, { 0 }, DEFAULT_PMBASE + LV3, 0 } }, -+ { -+ .ctype = 1, -+ .latency = 1, -+ .power = 1000, -+ .resource = MWAIT_RES(0, 0), -+ }, -+ { -+ .ctype = 2, -+ .latency = 1, -+ .power = 500, -+ .resource = MWAIT_RES(1, 0), -+ }, -+ { -+ .ctype = 3, -+ .latency = 17, -+ .power = 250, -+ .resource = MWAIT_RES(2, 0), -+ }, -+ { -+ .ctype = 3, -+ .latency = 34, -+ .power = 200, -+ .resource = MWAIT_RES(3, 0), -+ }, - }; - - int get_cst_entries(acpi_cstate_t **entries) --- -2.8.2 - diff --git a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0003-c4.patch b/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0003-c4.patch deleted file mode 100644 index f0777e3..0000000 --- a/resources/libreboot/patch/coreboot/2a3434757ef425dbdfedf1fc69e1a033a6e7310d/grub/x60/0003-c4.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 498e5a8ae9c5384ca6648ace0180fe896976d28b Mon Sep 17 00:00:00 2001 -From: Arthur Heymans -Date: Fri, 13 May 2016 00:07:36 +0200 -Subject: [PATCH] x60: restyle _CST table, add C4 state - -First of all requesting low power acpi c-states -has two software interfaces: -Using P_LVLx I/O reads or using equivalent MWAIT requersts. -Since newer intel boards in coreboot use MWAIT, I tried to -make the x60 c-states consistent with that. - -The C4 state is a lower power state that is only entered -when both cores request it, else the core remains in C3. -The power and latency are arbitrary but according to -documentation the OS is supposed to handle this fine. - -In practice the x60 seems not to use noticable less power -with c4 enabled. - -TEST= Build and boot platform. See if there is a state4 -in /sys/devices/system/cpu/cpu0/cpuidle/ - -Change-Id: I9eeb5b008e2ddc2193725667f2c13582a4877e3c -Signed-off-by: Arthur Heymans ---- - -diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c -index 5ea4221..1db44f5 100644 ---- a/src/mainboard/lenovo/x60/mainboard.c -+++ b/src/mainboard/lenovo/x60/mainboard.c -@@ -38,10 +38,43 @@ - - #define PANEL INT15_5F35_CL_DISPLAY_DEFAULT - -+#define MWAIT_RES(state, sub_state) \ -+ { \ -+ .space_id = ACPI_ADDRESS_SPACE_FIXED, \ -+ .bit_width = ACPI_FFIXEDHW_VENDOR_INTEL, \ -+ .bit_offset = ACPI_FFIXEDHW_CLASS_MWAIT, \ -+ { \ -+ .resv = 0, \ -+ }, \ -+ .addrl = (((state) << 4) | (sub_state)), \ -+ .addrh = 0, \ -+ } -+ - static acpi_cstate_t cst_entries[] = { -- { 1, 1, 1000, { 0x7f, 1, 2, { 0 }, 1, 0 } }, -- { 2, 1, 500, { 0x01, 8, 0, { 0 }, DEFAULT_PMBASE + LV2, 0 } }, -- { 2, 17, 250, { 0x01, 8, 0, { 0 }, DEFAULT_PMBASE + LV3, 0 } }, -+ { -+ .ctype = 1, -+ .latency = 1, -+ .power = 1000, -+ .resource = MWAIT_RES(0, 0), -+ }, -+ { -+ .ctype = 2, -+ .latency = 1, -+ .power = 500, -+ .resource = MWAIT_RES(1, 0), -+ }, -+ { -+ .ctype = 3, -+ .latency = 17, -+ .power = 250, -+ .resource = MWAIT_RES(2, 0), -+ }, -+ { -+ .ctype = 3, -+ .latency = 34, -+ .power = 200, -+ .resource = MWAIT_RES(3, 0), -+ }, - }; - - int get_cst_entries(acpi_cstate_t **entries) -- cgit v0.9.1