Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50297 )
Change subject: soc/intel: Drop CID1 from GNVS ......................................................................
soc/intel: Drop CID1 from GNVS
The only reference to CID1 is in common/acpi/wifi.asl and only two braswell boards include it. Everywhere else the value in GNVS was unused.
Change-Id: I09ea756fb3743e33d1e221f0a0df3a6fdc3fc3ba Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/soc/intel/alderlake/acpi.c M src/soc/intel/cannonlake/acpi.c M src/soc/intel/common/block/acpi/acpi/globalnvs.asl M src/soc/intel/elkhartlake/acpi.c M src/soc/intel/icelake/acpi.c M src/soc/intel/jasperlake/acpi.c M src/soc/intel/skylake/acpi.c M src/soc/intel/skylake/acpi/globalnvs.asl M src/soc/intel/tigerlake/acpi.c 9 files changed, 2 insertions(+), 30 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/50297/1
diff --git a/src/soc/intel/alderlake/acpi.c b/src/soc/intel/alderlake/acpi.c index c1c53a6..2eb6101 100644 --- a/src/soc/intel/alderlake/acpi.c +++ b/src/soc/intel/alderlake/acpi.c @@ -20,7 +20,6 @@ #include <soc/systemagent.h> #include <string.h> #include <types.h> -#include <wrdd.h>
/* * List of supported C-states in this processor. @@ -275,9 +274,6 @@ /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable;
- /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; diff --git a/src/soc/intel/cannonlake/acpi.c b/src/soc/intel/cannonlake/acpi.c index bc00221..03bf3c8 100644 --- a/src/soc/intel/cannonlake/acpi.c +++ b/src/soc/intel/cannonlake/acpi.c @@ -18,7 +18,6 @@ #include <soc/pm.h> #include <soc/systemagent.h> #include <string.h> -#include <wrdd.h>
#include "chip.h"
@@ -179,9 +178,6 @@ /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable;
- /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; diff --git a/src/soc/intel/common/block/acpi/acpi/globalnvs.asl b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl index 18852d4..d9ecfb3 100644 --- a/src/soc/intel/common/block/acpi/acpi/globalnvs.asl +++ b/src/soc/intel/common/block/acpi/acpi/globalnvs.asl @@ -20,7 +20,7 @@ DPTE, 8, // 0x1c - Enable DPTF NHLA, 64, // 0x1d - 0x24 NHLT Address NHLL, 32, // 0x25 - 0x28 NHLT Length - CID1, 16, // 0x29 - 0x2a Wifi Country Identifier + , 16, // 0x29 - 0x2a Wifi Country Identifier U2WE, 16, // 0x2b - 0x2c USB2 Wake Enable Bitmap U3WE, 16, // 0x2d - 0x2e USB3 Wake Enable Bitmap UIOR, 8, // 0x2f - UART debug controller init on S3 resume diff --git a/src/soc/intel/elkhartlake/acpi.c b/src/soc/intel/elkhartlake/acpi.c index 102e7d9..12706c9 100644 --- a/src/soc/intel/elkhartlake/acpi.c +++ b/src/soc/intel/elkhartlake/acpi.c @@ -19,7 +19,6 @@ #include <soc/soc_chip.h> #include <soc/systemagent.h> #include <string.h> -#include <wrdd.h>
/* * List of supported C-states in this processor. @@ -243,9 +242,6 @@ /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable;
- /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; diff --git a/src/soc/intel/icelake/acpi.c b/src/soc/intel/icelake/acpi.c index 753ee87..67c43e2 100644 --- a/src/soc/intel/icelake/acpi.c +++ b/src/soc/intel/icelake/acpi.c @@ -16,7 +16,6 @@ #include <soc/soc_chip.h> #include <soc/systemagent.h> #include <string.h> -#include <wrdd.h>
/* * List of supported C-states in this processor. @@ -174,9 +173,6 @@ /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable;
- /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; diff --git a/src/soc/intel/jasperlake/acpi.c b/src/soc/intel/jasperlake/acpi.c index 596ef35..f33bebd 100644 --- a/src/soc/intel/jasperlake/acpi.c +++ b/src/soc/intel/jasperlake/acpi.c @@ -19,7 +19,6 @@ #include <soc/soc_chip.h> #include <soc/systemagent.h> #include <string.h> -#include <wrdd.h>
/* * List of supported C-states in this processor. @@ -270,9 +269,6 @@ /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable;
- /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c index 95cce82..100f16f 100644 --- a/src/soc/intel/skylake/acpi.c +++ b/src/soc/intel/skylake/acpi.c @@ -29,7 +29,6 @@ #include <soc/systemagent.h> #include <string.h> #include <types.h> -#include <wrdd.h> #include <device/pci_ops.h>
#include "chip.h" @@ -163,9 +162,6 @@ /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable;
- /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap; diff --git a/src/soc/intel/skylake/acpi/globalnvs.asl b/src/soc/intel/skylake/acpi/globalnvs.asl index d5b2c20..1ae61fd 100644 --- a/src/soc/intel/skylake/acpi/globalnvs.asl +++ b/src/soc/intel/skylake/acpi/globalnvs.asl @@ -37,7 +37,7 @@ DPTE, 8, // 0x30 - Enable DPTF NHLA, 64, // 0x31 - NHLT Address NHLL, 32, // 0x39 - NHLT Length - CID1, 16, // 0x3d - Wifi Country Identifier + , 16, // 0x3d - Wifi Country Identifier U2WE, 16, // 0x3f - USB2 Wake Enable Bitmap U3WE, 8, // 0x41 - USB3 Wake Enable Bitmap UIOR, 8, // 0x42 - UART debug controller init on S3 resume diff --git a/src/soc/intel/tigerlake/acpi.c b/src/soc/intel/tigerlake/acpi.c index ac21f13..17d8a34 100644 --- a/src/soc/intel/tigerlake/acpi.c +++ b/src/soc/intel/tigerlake/acpi.c @@ -19,7 +19,6 @@ #include <soc/soc_chip.h> #include <soc/systemagent.h> #include <string.h> -#include <wrdd.h>
/* * List of supported C-states in this processor. @@ -270,9 +269,6 @@ /* Enable DPTF based on mainboard configuration */ gnvs->dpte = config->dptf_enable;
- /* Fill in the Wifi Region id */ - gnvs->cid1 = wifi_regulatory_domain(); - /* Set USB2/USB3 wake enable bitmaps. */ gnvs->u2we = config->usb2_wake_enable_bitmap; gnvs->u3we = config->usb3_wake_enable_bitmap;
-
Kyösti Mälkki (Code Review)