From 5d935b3377ac54009e69e7aa91616ee2ded4c9b2 Mon Sep 17 00:00:00 2001 From: Felix Durairaj Date: Fri, 20 Nov 2015 16:18:42 -0800 Subject: [PATCH] Chromeos: Implement wifi_regulatory_domain using "regions" key in VPD Implement wifi_regulatory_domain function by getting country code from VPD Original-Reviewed-on: https://chromium-review.googlesource.com/314385 Original-Reviewed-by: Pratikkumar V Prajapati Original-Reviewed-by: Aaron Durbin Original-Tested-by: Hannah Williams Change-Id: Ia6a24df110a3860d404d345571007ae8965e9564 Signed-off-by: fdurairx Signed-off-by: Hannah Williams Reviewed-on: https://review.coreboot.org/12743 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth --- src/vendorcode/google/chromeos/Kconfig | 6 ++ src/vendorcode/google/chromeos/Makefile.inc | 1 + src/vendorcode/google/chromeos/cros_vpd.h | 2 + src/vendorcode/google/chromeos/wrdd.c | 76 +++++++++++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 src/vendorcode/google/chromeos/wrdd.c diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index 87fc024b61..d2a42a13d5 100644 --- a/src/vendorcode/google/chromeos/Kconfig +++ b/src/vendorcode/google/chromeos/Kconfig @@ -160,6 +160,12 @@ config WIPEOUT_SUPPORTED signal the application the need for factory reset (a.k.a. wipe out) of the device +config HAVE_REGULATORY_DOMAIN + bool "Add regulatory domain methods" + default n + help + This option is needed to add ACPI regulatory domain methods + source src/vendorcode/google/chromeos/vboot2/Kconfig endif # CHROMEOS diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc index 00fcd2fb2b..3f016a5a58 100644 --- a/src/vendorcode/google/chromeos/Makefile.inc +++ b/src/vendorcode/google/chromeos/Makefile.inc @@ -38,6 +38,7 @@ ramstage-$(CONFIG_HAVE_ACPI_TABLES) += gnvs.c ramstage-$(CONFIG_CHROMEOS_RAMOOPS) += ramoops.c romstage-y += vpd_decode.c ramstage-y += vpd_decode.c cros_vpd.c vpd_mac.c vpd_serialno.c vpd_calibration.c +ramstage-$(CONFIG_HAVE_REGULATORY_DOMAIN) += wrdd.c ifeq ($(CONFIG_ARCH_X86)$(CONFIG_ARCH_MIPS),) bootblock-y += watchdog.c ramstage-y += watchdog.c diff --git a/src/vendorcode/google/chromeos/cros_vpd.h b/src/vendorcode/google/chromeos/cros_vpd.h index 19658c2940..ca9c320d3f 100644 --- a/src/vendorcode/google/chromeos/cros_vpd.h +++ b/src/vendorcode/google/chromeos/cros_vpd.h @@ -7,6 +7,8 @@ #ifndef __CROS_VPD_H__ #define __CROS_VPD_H__ +#define CROS_VPD_WIFI_DOMAINKEY "regions" + /* * Reads VPD string value by key. * diff --git a/src/vendorcode/google/chromeos/wrdd.c b/src/vendorcode/google/chromeos/wrdd.c new file mode 100644 index 0000000000..ab27cc01b3 --- /dev/null +++ b/src/vendorcode/google/chromeos/wrdd.c @@ -0,0 +1,76 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2012 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. + */ +#include +#include +#include +#include +#include +#include "cros_vpd.h" + +/* + * wrdd_domain_value is ISO 3166-2 + * ISO 3166-2 code consists of two parts, separated by a hyphen + * The first part is the ISO 3166-1 alpha-2 code of the country; + * The second part is a string of up to three alphanumeric characters + */ +struct wrdd_code_value_pair { + const char *code; + u16 value; +}; + +/* Retrieve the regulatory domain information from VPD and + * return it as an uint16. + * WARNING: if domain information is not found in the VPD, + * this function will fall back to the default value + */ +uint16_t wifi_regulatory_domain(void) +{ + static struct wrdd_code_value_pair wrdd_table[] = { + { + /* Indonesia + * Alpha-2 code 'ID' + * Full name 'the Republic of Indonesia' + * Alpha-3 code 'IDN' + * Numeric code '360' + */ + .code = "id", + .value = WRDD_REGULATORY_DOMAIN_INDONESIA + } + }; + const char *wrdd_domain_key = CROS_VPD_WIFI_DOMAINKEY; + int i; + struct wrdd_code_value_pair *p; + /* wrdd_domain_value is ISO 3166-2 */ + char wrdd_domain_code[7]; + + /* If not found for any reason fall backto the default value */ + if (!cros_vpd_gets(wrdd_domain_key, wrdd_domain_code, + sizeof(wrdd_domain_code))) { + printk(BIOS_DEBUG, + "Error: Could not locate '%s' in VPD\n", wrdd_domain_key); + return WRDD_DEFAULT_REGULATORY_DOMAIN; + } + printk(BIOS_DEBUG, "Found '%s'='%s' in VPD\n", + wrdd_domain_key, wrdd_domain_code); + + for (i = 0; i < ARRAY_SIZE(wrdd_table); i++) { + p = &wrdd_table[i]; + if (strncmp(p->code, wrdd_domain_code, + ARRAY_SIZE(wrdd_domain_code)) == 0) + return p->value; + } + return WRDD_DEFAULT_REGULATORY_DOMAIN; +}