From 0057c52a8e50c8d1bddac675e0baa6b3a54ee19c Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Tue, 21 Jan 2025 15:11:08 -0600 Subject: [PATCH] soc/intel/cmn/cnvi: Fix scope of CFLR ACPI method MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the CFLR method was added, it was inadvertently put outside of the scope of the CNVW device. Move CFLR under CNVW, and adjust the method/ variable references as needed. TEST=boot linux, dump ACPI, verify no unknown methods or objects related to the CNVW device. Change-Id: I7065e24626b2f763868909b8f85a8f18b4cc229b Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/86092 Reviewed-by: Sean Rhodes Reviewed-by: Jérémy Compostella Tested-by: build bot (Jenkins) Reviewed-by: Cliff Huang --- src/soc/intel/common/block/cnvi/cnvi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/soc/intel/common/block/cnvi/cnvi.c b/src/soc/intel/common/block/cnvi/cnvi.c index 301fb3a4ee..964aa17ff1 100644 --- a/src/soc/intel/common/block/cnvi/cnvi.c +++ b/src/soc/intel/common/block/cnvi/cnvi.c @@ -189,7 +189,7 @@ static void cnvw_fill_ssdt(const struct device *dev) acpigen_write_if_lequal_op_int(LOCAL0_OP, 0); { - acpigen_emit_namestring("^CFLR"); + acpigen_emit_namestring("CFLR"); acpigen_write_store_int_to_namestr(1, "PRRS"); @@ -338,26 +338,26 @@ static void cnvw_fill_ssdt(const struct device *dev) acpigen_write_method("_DSW", 3); acpigen_pop_len(); - acpigen_write_scope_end(); - /* * Method (CFLR, 0, NotSerialized) * { - * If (^CNVW.WFLR == One) + * If (WFLR == One) * { - * ^CNVW.WIFR = One + * WIFR = One * } * } */ acpigen_write_method("CFLR", 0); { - acpigen_write_if_lequal_namestr_int("^CNVW.WFLR", 1); + acpigen_write_if_lequal_namestr_int("WFLR", 1); { - acpigen_write_store_int_to_namestr(1, "^CNVW.WIFR"); + acpigen_write_store_int_to_namestr(1, "WIFR"); } acpigen_pop_len(); } acpigen_pop_len(); + + acpigen_write_scope_end(); } static struct device_operations cnvi_wifi_ops = {