GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50297
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Kyösti Mälkki 2021-01-27 20:48:24 +02:00
parent 80a2e0d9b9
commit 62044c3e57
11 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/soc/intel/alderlake/acpi.c
View File

@ -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.
@ -278,9 +277,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs)
/* 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;

4
src/soc/intel/cannonlake/acpi.c
View File

@ -18,7 +18,6 @@
#include <soc/pm.h>
#include <soc/systemagent.h>
#include <string.h>
#include <wrdd.h>
#include "chip.h"
@ -182,9 +181,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs)
/* 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;

2
src/soc/intel/common/block/acpi/acpi/globalnvs.asl
View File

@ -20,7 +20,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve)
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

2
src/soc/intel/common/block/include/intelblocks/nvs.h
View File

@ -20,7 +20,7 @@ struct __packed global_nvs {
u8 dpte; /* 0x1c - Enable DPTF */
u64 nhla; /* 0x1d - 0x24 NHLT Address */
u32 nhll; /* 0x25 - 0x28 NHLT Length */
u16 cid1; /* 0x29 - 0x2a Wifi Country Identifier */
u16 unused_was_cid1; /* 0x29 - 0x2a Wifi Country Identifier */
u16 u2we; /* 0x2b - 0x2c USB2 Wake Enable Bitmap */
u16 u3we; /* 0x2d - 0x2e USB3 Wake Enable Bitmap */
u8 uior; /* 0x2f - UART debug controller init on S3 resume */

4
src/soc/intel/elkhartlake/acpi.c
View File

@ -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.
@ -246,9 +245,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs)
/* 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;

4
src/soc/intel/icelake/acpi.c
View File

@ -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.
@ -177,9 +176,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs)
/* 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;

4
src/soc/intel/jasperlake/acpi.c
View File

@ -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.
@ -273,9 +272,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs)
/* 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;

4
src/soc/intel/skylake/acpi.c
View File

@ -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"
@ -166,9 +165,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs)
/* 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;

2
src/soc/intel/skylake/acpi/globalnvs.asl
View File

@ -37,7 +37,7 @@ Field (GNVS, ByteAcc, NoLock, Preserve)
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

2
src/soc/intel/skylake/include/soc/nvs.h
View File

@ -37,7 +37,7 @@ struct __packed global_nvs {
u8 dpte; /* 0x30 - Enable DPTF */
u64 nhla; /* 0x31 - NHLT Address */
u32 nhll; /* 0x39 - NHLT Length */
u16 cid1; /* 0x3d - Wifi Country Identifier */
u16 unused_was_cid1; /* 0x3d - Wifi Country Identifier */
u16 u2we; /* 0x3f - USB2 Wake Enable Bitmap */
u8 u3we; /* 0x41 - USB3 Wake Enable Bitmap */
u8 uior; /* 0x42 - UART debug controller init on S3 resume */

4
src/soc/intel/tigerlake/acpi.c
View File

@ -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.
@ -273,9 +272,6 @@ void soc_fill_gnvs(struct global_nvs *gnvs)
/* 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;