soc/intel/cmn/cnvi: Fix scope of CFLR ACPI method

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 <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86092
Reviewed-by: Sean Rhodes <sean@starlabs.systems>
Reviewed-by: Jérémy Compostella <jeremy.compostella@intel.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Cliff Huang <cliff.huang@intel.com>
This commit is contained in:
Matt DeVillier 2025-01-21 15:11:08 -06:00 committed by Sean Rhodes
commit 0057c52a8e

View file

@ -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 = {