From 5eb95ee391e338d836581c830242dc8d5e6567ac Mon Sep 17 00:00:00 2001 From: Riku Viitanen Date: Fri, 15 Dec 2023 22:46:20 +0200 Subject: [PATCH] sio/nuvoton/npcd378: Fix ACPI errors In commit 0a0945c6a211 (sio/nuvoton/npcd378: Use acpi_device_path_join), some oversights were made. Instances of "strconcat(scope, ..." should be replaced with "..._join(dev->bus->dev, ..." instead of "..._join(dev, ...". On HP 8200 USDT, this fixes ACPI error like this on resume from S3: ACPI BIOS Error (bug): Could not resolve symbol [\_SB.PCI0.LPCB.SIO0.L040.RMFG], AE_NOT_FOUND (20230628/psargs-330) ACPI Error: Aborting method \_GPE._L08 due to previous error (AE_NOT_FOUND) (20230628/psparse-529) ACPI Error: AE_NOT_FOUND, while evaluating GPE method [_L08] (20230628/evgpe-511) RMFG seems to be a typo of PMFG made in that same commit. Change-Id: Ifffa7ad72cfdb644c8b5147132a5fd56511ed33b Signed-off-by: Riku Viitanen Reviewed-on: https://review.coreboot.org/c/coreboot/+/79588 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held Reviewed-by: Nico Huber Reviewed-by: Paul Menzel Reviewed-by: Felix Singer --- src/superio/nuvoton/npcd378/superio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/superio/nuvoton/npcd378/superio.c b/src/superio/nuvoton/npcd378/superio.c index 73c814fd28..615bae5433 100644 --- a/src/superio/nuvoton/npcd378/superio.c +++ b/src/superio/nuvoton/npcd378/superio.c @@ -356,7 +356,7 @@ static void npcd378_ssdt_pwr(const struct device *dev) /* Method (SIOH, 0, NotSerialized) */ acpigen_write_method("_L08", 0); acpigen_emit_byte(AND_OP); - acpigen_emit_namestring(acpi_device_path_join(dev, "RMFG")); + acpigen_emit_namestring(acpi_device_path_join(dev->bus->dev, "PMFG")); acpigen_write_integer(0xE8); acpigen_emit_byte(LOCAL0_OP); @@ -366,13 +366,13 @@ static void npcd378_ssdt_pwr(const struct device *dev) acpigen_emit_byte(ZERO_OP); acpigen_emit_byte(NOTIFY_OP); - acpigen_emit_namestring(acpi_device_path_join(dev, "L060")); + acpigen_emit_namestring(acpi_device_path_join(dev->bus->dev, "L060")); acpigen_write_integer(2); acpigen_pop_len(); /* Pop If */ acpigen_emit_byte(AND_OP); - acpigen_emit_namestring(acpi_device_path_join(dev, "PMFG")); + acpigen_emit_namestring(acpi_device_path_join(dev->bus->dev, "PMFG")); acpigen_write_integer(0x10); acpigen_emit_byte(LOCAL0_OP); @@ -382,7 +382,7 @@ static void npcd378_ssdt_pwr(const struct device *dev) acpigen_emit_byte(ZERO_OP); acpigen_emit_byte(NOTIFY_OP); - acpigen_emit_namestring(acpi_device_path_join(dev, "L050")); + acpigen_emit_namestring(acpi_device_path_join(dev->bus->dev, "L050")); acpigen_write_integer(2); acpigen_pop_len(); /* Pop If */