[coreboot-gerrit] Change in coreboot[master]: [WIP] soc/intel/braswell: Use acpigen for wifi_regulatory_domain()

[Kyösti Mälkki (Code Review)]

Attention is currently required from: Patrick Rudolph.
Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50298 )

Change subject: [WIP] soc/intel/braswell: Use acpigen for wifi_regulatory_domain()
......................................................................

[WIP] soc/intel/braswell: Use acpigen for wifi_regulatory_domain()

Change-Id: I012dc849b69c6c504f005a71c885ab230f3b795a
Signed-off-by: Kyösti Mälkki 
---
M src/mainboard/google/cyan/dsdt.asl
M src/mainboard/intel/strago/dsdt.asl
M src/soc/intel/braswell/acpi.c
M src/soc/intel/braswell/acpi/globalnvs.asl
D src/soc/intel/common/acpi/wifi.asl
5 files changed, 1 insertion(+), 45 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/50298/1

diff --git a/src/mainboard/google/cyan/dsdt.asl b/src/mainboard/google/cyan/dsdt.asl
index 8c363ad..ddf0fbb 100644
--- a/src/mainboard/google/cyan/dsdt.asl
+++ b/src/mainboard/google/cyan/dsdt.asl
@@ -40,9 +40,6 @@
    	{
    		Name (_ADR, 0x001C0002)  // _ADR: Address
    		OperationRegion(RPXX, PCI_Config, 0x00, 0x10)
-
-			/* Wifi Device */
-			#include <soc/intel/common/acpi/wifi.asl>
    	}
    }
    #include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/mainboard/intel/strago/dsdt.asl b/src/mainboard/intel/strago/dsdt.asl
index dfe9809..003cc1b 100644
--- a/src/mainboard/intel/strago/dsdt.asl
+++ b/src/mainboard/intel/strago/dsdt.asl
@@ -35,9 +35,6 @@
    	{
    		Name (_ADR, 0x001C0002)  // _ADR: Address
    		OperationRegion(RPXX, PCI_Config, 0x00, 0x10)
-
-			/* Wifi Device */
-			#include <soc/intel/common/acpi/wifi.asl>
    	}
    }
    #include <southbridge/intel/common/acpi/sleepstates.asl>
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index 2c3118e..aa524d3 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

#include <acpi/acpi.h>
-#include <acpi/acpi_gnvs.h>
 #include <acpi/acpigen.h>
 #include <device/mmio.h>
 #include <arch/smp/mpspec.h>
@@ -16,13 +15,11 @@
 #include <soc/iomap.h>
 #include <soc/irq.h>
 #include <soc/msr.h>
-#include <soc/nvs.h>
 #include <soc/pattrs.h>
 #include <soc/pci_devs.h>
 #include <soc/pm.h>
 #include <string.h>
 #include <types.h>
-#include <wrdd.h>

#define MWAIT_RES(state, sub_state)                         \
    {                                                   \
@@ -59,15 +56,6 @@
    }
 };

-void soc_fill_gnvs(struct global_nvs *gnvs)
-{
-	/* Fill in the Wi-Fi Region ID */
-	if (CONFIG(HAVE_REGULATORY_DOMAIN))
-		gnvs->cid1 = wifi_regulatory_domain();
-	else
-		gnvs->cid1 = WRDD_DEFAULT_REGULATORY_DOMAIN;
-}
-
 int acpi_sci_irq(void)
 {
    u32 *actl = (u32 *)(ILB_BASE_ADDRESS + ACTL);
diff --git a/src/soc/intel/braswell/acpi/globalnvs.asl b/src/soc/intel/braswell/acpi/globalnvs.asl
index 9a43671..4650882 100644
--- a/src/soc/intel/braswell/acpi/globalnvs.asl
+++ b/src/soc/intel/braswell/acpi/globalnvs.asl
@@ -27,7 +27,7 @@
    PM1I,	 32,	/* 0x15 - System Wake Source - PM1 Index */
    GPEI,	 32,	/* 0x19 - GPE Wake Source */
    BDID,	 8,	/* 0x1d - Board ID */
-	CID1,	 16,	/* 0x1e - Wifi Domain Type */
+	,	 16,	/* 0x1e - Wifi Domain Type */

/* Device Config */
    S5U0,	 8,	/* 0x20 - Enable USB0 in S5 */
diff --git a/src/soc/intel/common/acpi/wifi.asl b/src/soc/intel/common/acpi/wifi.asl
deleted file mode 100644
index 23923a5..0000000
--- a/src/soc/intel/common/acpi/wifi.asl
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-Device (WIFI)
-{
-	Name (_ADR, Zero)
-	OperationRegion(WIXX, PCI_Config, 0x00, 0x10)
-	Name (WRDX, Package()
-	{
-		// Revision
-		0,
-		Package()
-		{
-			// DomainType, 0x7:WiFi
-			0x00000007,
-			// Default Regulatory Domain Country identifier
-			0x4150,
-		}
-	})
-	Method(WRDD,0,Serialized)
-	{
-		DeRefOf (WRDX[1])[1] = \CID1 // Country identifier
-
-		Return(WRDX)
-	}
-
-}