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

sb/intel/lynxpoint: drop IGD-related NVS variables 

NDID/DID entries are no longer used by the GMA SSDT generator, so
drop them. SSDT generation will be simplified in a subsequent commit.

Change-Id: Iec3a18871725fd5f5c4c568c2bd771bb56245bc7
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39951
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Matt DeVillier 2020-03-30 20:00:38 -05:00
parent 53e24468f0
commit 948a5d0310
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
View File

@ -88,13 +88,6 @@ Field (GNVS, ByteAcc, NoLock, Preserve)
TLST, 8, // 0x3d - Display Toggle List pointer TLST, 8, // 0x3d - Display Toggle List pointer
CADL, 8, // 0x3e - Currently Attached Devices List CADL, 8, // 0x3e - Currently Attached Devices List
PADL, 8, // 0x3f - Previously Attached Devices List PADL, 8, // 0x3f - Previously Attached Devices List
Offset (0x46),
NDID, 8, // 0x46 - Number of Device IDs
DID1, 32, // 0x47 - Device ID 1
DID2, 32, // 0x4b - Device ID 2
DID3, 32, // 0x4f - Device ID 3
DID4, 32, // 0x53 - Device ID 4
DID5, 32, // 0x57 - Device ID 5
/* TPM support */ /* TPM support */
Offset (0x5b), Offset (0x5b),

8
src/southbridge/intel/lynxpoint/lpc.c
View File

@ -31,7 +31,6 @@
#include "nvs.h" #include "nvs.h"
#include "pch.h" #include "pch.h"
#include <arch/acpigen.h> #include <arch/acpigen.h>
#include <drivers/intel/gma/i915.h>
#include <southbridge/intel/common/acpi_pirq_gen.h> #include <southbridge/intel/common/acpi_pirq_gen.h>
#include <southbridge/intel/common/rtc.h> #include <southbridge/intel/common/rtc.h>
#include <southbridge/intel/common/spi.h> #include <southbridge/intel/common/spi.h>
@ -724,8 +723,6 @@ static void southbridge_inject_dsdt(struct device *dev)
} }
if (gnvs) { if (gnvs) {
const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();
acpi_create_gnvs(gnvs); acpi_create_gnvs(gnvs);
gnvs->apic = 1; gnvs->apic = 1;
@ -739,11 +736,6 @@ static void southbridge_inject_dsdt(struct device *dev)
/* Update the mem console pointer. */ /* Update the mem console pointer. */
gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE); gnvs->cbmc = (u32)cbmem_find(CBMEM_ID_CONSOLE);
if (gfx) {
gnvs->ndid = gfx->ndid;
memcpy(gnvs->did, gfx->did, sizeof(gnvs->did));
}
/* And tell SMI about it */ /* And tell SMI about it */
smm_setup_structures(gnvs, NULL, NULL); smm_setup_structures(gnvs, NULL, NULL);

4
src/southbridge/intel/lynxpoint/nvs.h
View File

@ -75,9 +75,7 @@ typedef struct global_nvs_t {
u8 tlst; /* 0x3d - Display Toggle List Pointer */ u8 tlst; /* 0x3d - Display Toggle List Pointer */
u8 cadl; /* 0x3e - currently attached devices */ u8 cadl; /* 0x3e - currently attached devices */
u8 padl; /* 0x3f - previously attached devices */ u8 padl; /* 0x3f - previously attached devices */
u16 rsvd14[3]; u8 rsvd14[27];
u8 ndid; /* 0x46 - number of device ids */
u32 did[5]; /* 0x47 - 5b device id 1..5 */
/* TPM support */ /* TPM support */
u8 tpmp; /* 0x5b - TPM Present */ u8 tpmp; /* 0x5b - TPM Present */
u8 tpme; /* 0x5c - TPM Enable */ u8 tpme; /* 0x5c - TPM Enable */