[coreboot-gerrit] Patch set updated for coreboot: soc/braswell: Add method for Wifi regulatory domain

[Hannah Williams (hannah.williams@intel.com)]

Hannah Williams (hannah.williams at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12745

-gerrit

commit bebe8902ebbb46ba0a9822f15313e2036f87f51c
Author: Felix Durairaj <felixx.durairaj at intel.com>
Date:   Mon Nov 23 14:07:40 2015 -0800

    soc/braswell: Add method for Wifi regulatory domain
    
    Get the WRDD domain code from VPD and put it in global nvs.
    WRDD method in wifi.asl returns this value from global nvs.
    This wifi.asl should be included in dsdt.asl under the root port where wifi
    module resides.
    
    Original-Reviewed-on: https://chromium-review.googlesource.com/314373
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Original-Reviewed-by: Pratikkumar V Prajapati <pratikkumar.v.prajapati at intel.com>
    Original-Commit-Queue: Hannah Williams <hannah.williams at intel.com>
    
    Change-Id: I809d28f10e80681471a785e604df102fb943a983
    Signed-off-by: fdurairx <felixx.durairaj at intel.com>
    Signed-off-by: Hannah Williams <hannah.williams at intel.com>
---
 src/soc/intel/braswell/acpi.c             |  7 +++++
 src/soc/intel/braswell/acpi/globalnvs.asl |  1 +
 src/soc/intel/braswell/include/soc/nvs.h  |  2 +-
 src/soc/intel/common/acpi/wifi.asl        | 46 +++++++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index f7c3748..f6f996d 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -44,6 +44,9 @@
 #include <string.h>
 #include <types.h>
 #include <vendorcode/google/chromeos/gnvs.h>
+#if IS_ENABLED(CONFIG_HAVE_REGULATORY_DOMAIN)
+#include <wrdd.h>
+#endif
 
 #define MWAIT_RES(state, sub_state)                         \
 	{                                                   \
@@ -523,6 +526,10 @@ void southcluster_inject_dsdt(device_t device)
 
 	if (gnvs) {
 		acpi_create_gnvs(gnvs);
+#if IS_ENABLED(CONFIG_HAVE_REGULATORY_DOMAIN)
+		/* Fill in the Wifi Region id */
+		gnvs->cid1 = wifi_regulatory_domain();
+#endif
 		acpi_save_gnvs((unsigned long)gnvs);
 		/* And tell SMI about it */
 		smm_setup_structures(gnvs, NULL, NULL);
diff --git a/src/soc/intel/braswell/acpi/globalnvs.asl b/src/soc/intel/braswell/acpi/globalnvs.asl
index 54ebb2c..e7fb2ce 100644
--- a/src/soc/intel/braswell/acpi/globalnvs.asl
+++ b/src/soc/intel/braswell/acpi/globalnvs.asl
@@ -51,6 +51,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve)
 	PM1I,	 32,	/* 0x15 - System Wake Source - PM1 Index */
 	GPEI,	 32,	/* 0x19 - GPE Wake Source */
 	BDID,	 8,	/* 0x1d - Board ID */
+	CID1,	 16,	/* 0x1A - Wifi Domain Type */
 
 	/* Device Config */
 	Offset (0x20),
diff --git a/src/soc/intel/braswell/include/soc/nvs.h b/src/soc/intel/braswell/include/soc/nvs.h
index aafaef5..d3dfd28 100644
--- a/src/soc/intel/braswell/include/soc/nvs.h
+++ b/src/soc/intel/braswell/include/soc/nvs.h
@@ -44,7 +44,7 @@ typedef struct {
 	u32	pm1i; /* 0x15 - System Wake Source - PM1 Index */
 	u32	gpei; /* 0x19 - GPE Wake Source */
 	u8	bdid; /* 0x1d - Board ID */
-	u8	rsvd1[2];
+	u16     cid1; /* 0x1a - Wifi Country Identifier */
 
 	/* Device Config */
 	u8	s5u0; /* 0x20 - Enable USB0 in S5 */
diff --git a/src/soc/intel/common/acpi/wifi.asl b/src/soc/intel/common/acpi/wifi.asl
new file mode 100644
index 0000000..a97ff16
--- /dev/null
+++ b/src/soc/intel/common/acpi/wifi.asl
@@ -0,0 +1,46 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2007-2009 coresystems GmbH
+ * Copyright (C) 2011 Google Inc.
+ * Copyright (C) 2015 Intel Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.
+ */
+
+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)
+	{
+		Store(\CID1,Index (DeRefOf (Index (WRDX, 1)), 1)) // Country identifier
+
+		Return(WRDX)
+	}
+
+}
+