From 21dbc2fc3c2febe0e6ac3760f4c8a63c2aeedd06 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Mon, 23 Nov 2015 12:23:19 -0700 Subject: [PATCH] ec/lenovo/h8: Fix IASL warnings If any path in a method returns a value, IASL expects that all paths within that method will return a value. Presumably the MKHP method wouldn't get called unless there were a pending event, but if no event is found, return a zero. Fixes IASL warning: dsdt.aml 1785: Method (MHKP, 0, NotSerialized) Warning 3115 - ^ Not all control paths return a value (MHKP) This was the only IASL warning in most lenovo mainboards. Change-Id: Id93dcc4a74bd4c18b78f1dde821e7ba0f3444da3 Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/12517 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/ec/lenovo/h8/acpi/ec.asl | 1 + src/mainboard/lenovo/r400/Kconfig | 4 ---- src/mainboard/lenovo/t420s/Kconfig | 4 ---- src/mainboard/lenovo/t430s/Kconfig | 4 ---- src/mainboard/lenovo/t520/Kconfig | 4 ---- src/mainboard/lenovo/t530/Kconfig | 4 ---- src/mainboard/lenovo/t60/Kconfig | 4 ---- src/mainboard/lenovo/x200/Kconfig | 4 ---- src/mainboard/lenovo/x201/Kconfig | 4 ---- src/mainboard/lenovo/x220/Kconfig | 4 ---- src/mainboard/lenovo/x230/Kconfig | 4 ---- src/mainboard/lenovo/x60/Kconfig | 4 ---- 12 files changed, 1 insertion(+), 44 deletions(-) diff --git a/src/ec/lenovo/h8/acpi/ec.asl b/src/ec/lenovo/h8/acpi/ec.asl index d1789e6e39..085492d539 100644 --- a/src/ec/lenovo/h8/acpi/ec.asl +++ b/src/ec/lenovo/h8/acpi/ec.asl @@ -300,6 +300,7 @@ Device(EC) Add (Local0, 0x5000, Local0) Return (Local0) } + Return (Zero) } /* Report event */ Method (RHK, 1, NotSerialized) { diff --git a/src/mainboard/lenovo/r400/Kconfig b/src/mainboard/lenovo/r400/Kconfig index 3664eb0fe8..0966bf129e 100644 --- a/src/mainboard/lenovo/r400/Kconfig +++ b/src/mainboard/lenovo/r400/Kconfig @@ -4,8 +4,4 @@ config MAINBOARD_PART_NUMBER string default "ThinkPad R400" -# TODO: Remove this when platform ASL is fixed -config IASL_WARNINGS_ARE_ERRORS - def_bool n - endif diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig index 0250bc0588..65d37a75b1 100644 --- a/src/mainboard/lenovo/t420s/Kconfig +++ b/src/mainboard/lenovo/t420s/Kconfig @@ -73,8 +73,4 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x21d2 -# TODO: Remove this when platform ASL is fixed -config IASL_WARNINGS_ARE_ERRORS - def_bool n - endif # BOARD_LENOVO_T420S diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig index 2518330582..6e257ddbb1 100644 --- a/src/mainboard/lenovo/t430s/Kconfig +++ b/src/mainboard/lenovo/t430s/Kconfig @@ -70,8 +70,4 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x21fb -# TODO: Remove this when platform ASL is fixed -config IASL_WARNINGS_ARE_ERRORS - def_bool n - endif # BOARD_LENOVO_T430S diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig index ce33f04a58..df7c2db602 100644 --- a/src/mainboard/lenovo/t520/Kconfig +++ b/src/mainboard/lenovo/t520/Kconfig @@ -73,8 +73,4 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x21cf -# TODO: Remove this when platform ASL is fixed -config IASL_WARNINGS_ARE_ERRORS - def_bool n - endif # BOARD_LENOVO_T520 diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig index c87521ac15..7b4ca7a6e6 100644 --- a/src/mainboard/lenovo/t530/Kconfig +++ b/src/mainboard/lenovo/t530/Kconfig @@ -71,8 +71,4 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x21fa -# TODO: Remove this when platform ASL is fixed -config IASL_WARNINGS_ARE_ERRORS - def_bool n - endif # BOARD_LENOVO_T530 diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index 02a5adae20..52eeda3d38 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -54,8 +54,4 @@ config SEABIOS_PS2_TIMEOUT int default 3000 -# TODO: Remove this when platform ASL is fixed -config IASL_WARNINGS_ARE_ERRORS - def_bool n - endif diff --git a/src/mainboard/lenovo/x200/Kconfig b/src/mainboard/lenovo/x200/Kconfig index 9b61f7588d..7bae12d56e 100644 --- a/src/mainboard/lenovo/x200/Kconfig +++ b/src/mainboard/lenovo/x200/Kconfig @@ -48,8 +48,4 @@ config CBFS_SIZE hex default 0x200000 -# TODO: Remove this when platform ASL is fixed -config IASL_WARNINGS_ARE_ERRORS - def_bool n - endif # BOARD_LENOVO_X200 diff --git a/src/mainboard/lenovo/x201/Kconfig b/src/mainboard/lenovo/x201/Kconfig index 39389ee511..7f96cbe820 100644 --- a/src/mainboard/lenovo/x201/Kconfig +++ b/src/mainboard/lenovo/x201/Kconfig @@ -49,8 +49,4 @@ config CPU_ADDR_BITS int default 36 -# TODO: Remove this when platform ASL is fixed -config IASL_WARNINGS_ARE_ERRORS - def_bool n - endif diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig index 5fbda79e80..c13b644ba3 100644 --- a/src/mainboard/lenovo/x220/Kconfig +++ b/src/mainboard/lenovo/x220/Kconfig @@ -74,8 +74,4 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x21db -# TODO: Remove this when platform ASL is fixed -config IASL_WARNINGS_ARE_ERRORS - def_bool n - endif # BOARD_LENOVO_X220 diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig index 370eb778b0..1d336ebf88 100644 --- a/src/mainboard/lenovo/x230/Kconfig +++ b/src/mainboard/lenovo/x230/Kconfig @@ -74,8 +74,4 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x21fa -# TODO: Remove this when platform ASL is fixed -config IASL_WARNINGS_ARE_ERRORS - def_bool n - endif # BOARD_LENOVO_X230 diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig index 1461c6b196..ab4b58eaf3 100644 --- a/src/mainboard/lenovo/x60/Kconfig +++ b/src/mainboard/lenovo/x60/Kconfig @@ -61,8 +61,4 @@ config SEABIOS_PS2_TIMEOUT int default 3000 -# TODO: Remove this when platform ASL is fixed -config IASL_WARNINGS_ARE_ERRORS - def_bool n - endif