From 99850600d06f837759d2404f03dc908969ed42c3 Mon Sep 17 00:00:00 2001 From: Elyes HAOUAS Date: Thu, 21 Feb 2019 16:38:43 +0100 Subject: sb/amd/hudson/acpi: Fix illegal object references MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue spotted using IASL 20190215 on mainboard GIZMOSPHERE_GIZMO2: "Object is created temporarily in another method and cannot be accessed" Change-Id: I1e4ca2c765083db3a27e415d3a69bef0912a606b Signed-off-by: Elyes HAOUAS Reviewed-on: https://review.coreboot.org/c/31554 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber Reviewed-by: Kyösti Mälkki --- src/southbridge/amd/agesa/hudson/acpi/fch.asl | 5 ++++- src/southbridge/amd/pi/hudson/acpi/fch.asl | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src/southbridge') diff --git a/src/southbridge/amd/agesa/hudson/acpi/fch.asl b/src/southbridge/amd/agesa/hudson/acpi/fch.asl index 4d53051ad2..83e3410ccb 100644 --- a/src/southbridge/amd/agesa/hudson/acpi/fch.asl +++ b/src/southbridge/amd/agesa/hudson/acpi/fch.asl @@ -146,6 +146,10 @@ Method(_CRS, 0) { Return(CRES) /* note to change the Name buffer */ } /* end of Method(_SB.PCI0._CRS) */ +#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) + #include "acpi/AmdImc.asl" /* Hudson IMC function */ +#endif + /* * * FIRST METHOD CALLED UPON BOOT @@ -172,7 +176,6 @@ Method(_INI, 0) { OSFL() #if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) - #include "acpi/AmdImc.asl" /* Hudson IMC function */ #if IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE) ITZE() /* enable IMC Fan Control*/ #endif diff --git a/src/southbridge/amd/pi/hudson/acpi/fch.asl b/src/southbridge/amd/pi/hudson/acpi/fch.asl index 0c6e76833e..17f5140a71 100644 --- a/src/southbridge/amd/pi/hudson/acpi/fch.asl +++ b/src/southbridge/amd/pi/hudson/acpi/fch.asl @@ -129,6 +129,13 @@ Method(_CRS, 0) { Return(CRES) /* note to change the Name buffer */ } /* end of Method(_SB.PCI0._CRS) */ +#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) + /* TODO: It is unstable. + * might be fixed by restructuring + */ + #include "acpi/AmdImc.asl" /* Hudson IMC function */ +#endif + /* * * FIRST METHOD CALLED UPON BOOT @@ -155,8 +162,6 @@ Method(_INI, 0) { OSFL() #if IS_ENABLED(CONFIG_HUDSON_IMC_FWM) - /* TODO: It is unstable. */ - #include "acpi/AmdImc.asl" /* Hudson IMC function */ #if IS_ENABLED(CONFIG_ACPI_ENABLE_THERMAL_ZONE) ITZE() /* enable IMC Fan Control*/ #endif -- cgit v1.2.3