[coreboot-gerrit] Change in ...coreboot[master]: sb/amd/hudson/acpi: Fix illegal object references

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31554 )

Change subject: sb/amd/hudson/acpi: Fix illegal object references
......................................................................

sb/amd/hudson/acpi: Fix illegal object references

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 
---
M src/southbridge/amd/agesa/hudson/acpi/fch.asl
M src/southbridge/amd/pi/hudson/acpi/fch.asl
2 files changed, 11 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Kyösti Mälkki: Looks good to me, approved
  Nico Huber: Looks good to me, approved

diff --git a/src/southbridge/amd/agesa/hudson/acpi/fch.asl b/src/southbridge/amd/agesa/hudson/acpi/fch.asl
index 4d53051..83e3410 100644
--- a/src/southbridge/amd/agesa/hudson/acpi/fch.asl
+++ b/src/southbridge/amd/agesa/hudson/acpi/fch.asl
@@ -146,6 +146,10 @@
    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 @@
    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 0c6e768..17f5140 100644
--- a/src/southbridge/amd/pi/hudson/acpi/fch.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/fch.asl
@@ -129,6 +129,13 @@
    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 @@
    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