[coreboot-gerrit] [S] Change in coreboot[main]: soc/intel/cmn/cnvi: Fix scope of CFLR ACPI method

[Sean Rhodes (Code Review)]

Sean Rhodes has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86092?usp=email )

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

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 
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 
---
M src/soc/intel/common/block/cnvi/cnvi.c
1 file changed, 7 insertions(+), 7 deletions(-)

Approvals:
  Cliff Huang: Looks good to me, approved
  build bot (Jenkins): Verified
  Sean Rhodes: Looks good to me, approved
  Jérémy Compostella: Looks good to me, but someone else must approve

diff --git a/src/soc/intel/common/block/cnvi/cnvi.c b/src/soc/intel/common/block/cnvi/cnvi.c
index 301fb3a..964aa17 100644
--- a/src/soc/intel/common/block/cnvi/cnvi.c
+++ b/src/soc/intel/common/block/cnvi/cnvi.c
@@ -189,7 +189,7 @@

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