From 5c14950ae310ca4d57fd6fd4aed6b37703f058cd Mon Sep 17 00:00:00 2001 From: gaspar-ilom Date: Thu, 6 Mar 2025 21:42:10 +0100 Subject: [PATCH 1/2] do not break building other thinkpads with the hacks for the t480/s made Mate Kukri still not fixing things properly but at least it should now be possible to build older thinkpads without regressions. prior, some code was just commented or unreachable. now we make this explicit with preprocessor directives. heads should build all boards on this coreboot version from the same coreboot tree. use CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON to decide what to compile this should work for T480, T480S and older thinkpads Signed-off-by: gaspar-ilom --- ...lding-other-thinkpads-with-the-hacks.patch | 157 ++++++++++++++++++ 1 file changed, 157 insertions(+) create mode 100644 patches/coreboot-24.12/0004-do-not-break-building-other-thinkpads-with-the-hacks.patch diff --git a/patches/coreboot-24.12/0004-do-not-break-building-other-thinkpads-with-the-hacks.patch b/patches/coreboot-24.12/0004-do-not-break-building-other-thinkpads-with-the-hacks.patch new file mode 100644 index 000000000..a1fa08e11 --- /dev/null +++ b/patches/coreboot-24.12/0004-do-not-break-building-other-thinkpads-with-the-hacks.patch @@ -0,0 +1,157 @@ +From efc90be24c861f5f83309006e7fdbf3e3504534f Mon Sep 17 00:00:00 2001 +From: gaspar-ilom +Date: Thu, 6 Mar 2025 23:00:00 +0000 +Subject: [PATCH] do not break building other thinkpads with the hacks for the + t480/s made Mate Kukri + +still not fixing things properly but at least it should now be possible to build older thinkpads without regressions. +prior, some code was just commented or unreachable. now we make this explicit with preprocessor directives. +heads should build all boards on this coreboot version from the same coreboot tree. + +Signed-off-by: gaspar-ilom +--- + src/device/pci_rom.c | 8 +++++--- + src/ec/lenovo/h8/acpi/ec.asl | 4 +++- + src/ec/lenovo/h8/bluetooth.c | 15 ++++++++++----- + src/ec/lenovo/h8/wwan.c | 14 ++++++++++---- + 4 files changed, 28 insertions(+), 13 deletions(-) + +diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c +index cc6b9b068a..f47300faaa 100644 +--- a/src/device/pci_rom.c ++++ b/src/device/pci_rom.c +@@ -304,13 +304,15 @@ void pci_rom_ssdt(const struct device *device) + return; + } + +-#if 0 ++ #ifdef CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON ++ const char *scope = "\\_SB.PCI0.RP01.PEGP"; ++ #else + const char *scope = acpi_device_path(device); ++ #endif + if (!scope) { + printk(BIOS_ERR, "%s: Missing ACPI scope\n", dev_path(device)); + return; + } +-#endif + + /* Supports up to four devices. */ + if ((CBMEM_ID_ROM0 + ngfx) > CBMEM_ID_ROM3) { +@@ -338,7 +340,7 @@ void pci_rom_ssdt(const struct device *device) + memcpy(cbrom, rom, cbrom_length); + + /* write _ROM method */ +- acpigen_write_scope("\\_SB.PCI0.RP01.PEGP"); ++ acpigen_write_scope(scope); + acpigen_write_rom(cbrom, cbrom_length); + acpigen_pop_len(); /* pop scope */ + } +diff --git a/src/ec/lenovo/h8/acpi/ec.asl b/src/ec/lenovo/h8/acpi/ec.asl +index 8f4a8e1986..0159753f86 100644 +--- a/src/ec/lenovo/h8/acpi/ec.asl ++++ b/src/ec/lenovo/h8/acpi/ec.asl +@@ -331,7 +331,9 @@ Device(EC) + #include "sleepbutton.asl" + #include "lid.asl" + #include "beep.asl" +-//#include "thermal.asl" ++#ifndef CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON ++#include "thermal.asl" ++#endif + #include "systemstatus.asl" + #include "thinkpad.asl" + } +diff --git a/src/ec/lenovo/h8/bluetooth.c b/src/ec/lenovo/h8/bluetooth.c +index be71a24ced..94dd52d87e 100644 +--- a/src/ec/lenovo/h8/bluetooth.c ++++ b/src/ec/lenovo/h8/bluetooth.c +@@ -1,6 +1,7 @@ + /* SPDX-License-Identifier: GPL-2.0-only */ +- +-// #include ++#ifndef CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON ++#include ++#endif + #include + #include + #include +@@ -26,23 +27,27 @@ void h8_bluetooth_enable(int on) + */ + bool h8_has_bdc(const struct device *dev) + { ++ #ifdef CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON ++ printk(BIOS_INFO, "H8: BDC detection not implemented. " ++ "Assuming BDC installed\n"); ++ return true; ++ #else + struct ec_lenovo_h8_config *conf = dev->chip_info; + +- if (1 || !conf->has_bdc_detection) { ++ if (!conf->has_bdc_detection) { + printk(BIOS_INFO, "H8: BDC detection not implemented. " + "Assuming BDC installed\n"); + return true; + } + +-#if 0 + if (get_gpio(conf->bdc_gpio_num) == conf->bdc_gpio_lvl) { + printk(BIOS_INFO, "H8: BDC installed\n"); + return true; + } +-#endif + + printk(BIOS_INFO, "H8: BDC not installed\n"); + return false; ++ #endif + } + + /* +diff --git a/src/ec/lenovo/h8/wwan.c b/src/ec/lenovo/h8/wwan.c +index 5cdcf77406..183e1a2cf9 100644 +--- a/src/ec/lenovo/h8/wwan.c ++++ b/src/ec/lenovo/h8/wwan.c +@@ -1,6 +1,8 @@ + /* SPDX-License-Identifier: GPL-2.0-only */ + +-// #include ++#ifndef CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON ++#include ++#endif + #include + #include + #include +@@ -24,23 +26,27 @@ void h8_wwan_enable(int on) + */ + bool h8_has_wwan(const struct device *dev) + { ++ #ifdef CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON ++ printk(BIOS_INFO, "H8: WWAN detection not implemented. " ++ "Assuming WWAN installed\n"); ++ return true; ++ #else + struct ec_lenovo_h8_config *conf = dev->chip_info; + +- if (1 || !conf->has_wwan_detection) { ++ if (!conf->has_wwan_detection) { + printk(BIOS_INFO, "H8: WWAN detection not implemented. " + "Assuming WWAN installed\n"); + return true; + } + +-#if 0 + if (get_gpio(conf->wwan_gpio_num) == conf->wwan_gpio_lvl) { + printk(BIOS_INFO, "H8: WWAN installed\n"); + return true; + } +-#endif + + printk(BIOS_INFO, "H8: WWAN not installed\n"); + return false; ++ #endif + } + + /* +-- +2.39.5 + From 010097225daa40fa474364696e97a7b8b2319d33 Mon Sep 17 00:00:00 2001 From: gaspar-ilom Date: Sat, 8 Mar 2025 00:59:00 +0100 Subject: [PATCH 2/2] fix preprocessor checks Signed-off-by: gaspar-ilom --- ...lding-other-thinkpads-with-the-hacks.patch | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/patches/coreboot-24.12/0004-do-not-break-building-other-thinkpads-with-the-hacks.patch b/patches/coreboot-24.12/0004-do-not-break-building-other-thinkpads-with-the-hacks.patch index a1fa08e11..81517093a 100644 --- a/patches/coreboot-24.12/0004-do-not-break-building-other-thinkpads-with-the-hacks.patch +++ b/patches/coreboot-24.12/0004-do-not-break-building-other-thinkpads-with-the-hacks.patch @@ -1,4 +1,4 @@ -From efc90be24c861f5f83309006e7fdbf3e3504534f Mon Sep 17 00:00:00 2001 +From d2188ab8134a6a9c67e64dda643b770221dba648 Mon Sep 17 00:00:00 2001 From: gaspar-ilom Date: Thu, 6 Mar 2025 23:00:00 +0000 Subject: [PATCH] do not break building other thinkpads with the hacks for the @@ -17,7 +17,7 @@ Signed-off-by: gaspar-ilom 4 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c -index cc6b9b068a..f47300faaa 100644 +index cc6b9b068a..7d4b52ba30 100644 --- a/src/device/pci_rom.c +++ b/src/device/pci_rom.c @@ -304,13 +304,15 @@ void pci_rom_ssdt(const struct device *device) @@ -25,7 +25,7 @@ index cc6b9b068a..f47300faaa 100644 } -#if 0 -+ #ifdef CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON ++ #if CONFIG(BOARD_LENOVO_SKLKBL_THINKPAD_COMMON) + const char *scope = "\\_SB.PCI0.RP01.PEGP"; + #else const char *scope = acpi_device_path(device); @@ -48,7 +48,7 @@ index cc6b9b068a..f47300faaa 100644 acpigen_pop_len(); /* pop scope */ } diff --git a/src/ec/lenovo/h8/acpi/ec.asl b/src/ec/lenovo/h8/acpi/ec.asl -index 8f4a8e1986..0159753f86 100644 +index 8f4a8e1986..f80c15106c 100644 --- a/src/ec/lenovo/h8/acpi/ec.asl +++ b/src/ec/lenovo/h8/acpi/ec.asl @@ -331,7 +331,9 @@ Device(EC) @@ -56,21 +56,21 @@ index 8f4a8e1986..0159753f86 100644 #include "lid.asl" #include "beep.asl" -//#include "thermal.asl" -+#ifndef CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON ++#if !CONFIG(BOARD_LENOVO_SKLKBL_THINKPAD_COMMON) +#include "thermal.asl" +#endif #include "systemstatus.asl" #include "thinkpad.asl" } diff --git a/src/ec/lenovo/h8/bluetooth.c b/src/ec/lenovo/h8/bluetooth.c -index be71a24ced..94dd52d87e 100644 +index be71a24ced..0b729bd819 100644 --- a/src/ec/lenovo/h8/bluetooth.c +++ b/src/ec/lenovo/h8/bluetooth.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ - -// #include -+#ifndef CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON ++#if !CONFIG(BOARD_LENOVO_SKLKBL_THINKPAD_COMMON) +#include +#endif #include @@ -80,7 +80,7 @@ index be71a24ced..94dd52d87e 100644 */ bool h8_has_bdc(const struct device *dev) { -+ #ifdef CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON ++ #if CONFIG(BOARD_LENOVO_SKLKBL_THINKPAD_COMMON) + printk(BIOS_INFO, "H8: BDC detection not implemented. " + "Assuming BDC installed\n"); + return true; @@ -108,14 +108,14 @@ index be71a24ced..94dd52d87e 100644 /* diff --git a/src/ec/lenovo/h8/wwan.c b/src/ec/lenovo/h8/wwan.c -index 5cdcf77406..183e1a2cf9 100644 +index 5cdcf77406..0a62583c56 100644 --- a/src/ec/lenovo/h8/wwan.c +++ b/src/ec/lenovo/h8/wwan.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -// #include -+#ifndef CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON ++#if !CONFIG(BOARD_LENOVO_SKLKBL_THINKPAD_COMMON) +#include +#endif #include @@ -125,7 +125,7 @@ index 5cdcf77406..183e1a2cf9 100644 */ bool h8_has_wwan(const struct device *dev) { -+ #ifdef CONFIG_BOARD_LENOVO_SKLKBL_THINKPAD_COMMON ++ #if CONFIG(BOARD_LENOVO_SKLKBL_THINKPAD_COMMON) + printk(BIOS_INFO, "H8: WWAN detection not implemented. " + "Assuming WWAN installed\n"); + return true;