From 948a5d0310f6a4f7b34cd416b81d0e56fd3ce3d4 Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Mon, 30 Mar 2020 20:00:38 -0500
Subject: 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>
---
 src/southbridge/intel/lynxpoint/acpi/globalnvs.asl | 7 -------
 src/southbridge/intel/lynxpoint/lpc.c              | 8 --------
 src/southbridge/intel/lynxpoint/nvs.h              | 4 +---
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
index 6dcec0dccc..a8de07ce7c 100644
--- a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
@@ -88,13 +88,6 @@ Field (GNVS, ByteAcc, NoLock, Preserve)
 	TLST,	 8,	// 0x3d - Display Toggle List pointer
 	CADL,	 8,	// 0x3e - Currently 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 */
 	Offset (0x5b),
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index f0b88b2f41..bb0d997ad6 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -31,7 +31,6 @@
 #include "nvs.h"
 #include "pch.h"
 #include <arch/acpigen.h>
-#include <drivers/intel/gma/i915.h>
 #include <southbridge/intel/common/acpi_pirq_gen.h>
 #include <southbridge/intel/common/rtc.h>
 #include <southbridge/intel/common/spi.h>
@@ -724,8 +723,6 @@ static void southbridge_inject_dsdt(struct device *dev)
 	}
 
 	if (gnvs) {
-		const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();
-
 		acpi_create_gnvs(gnvs);
 
 		gnvs->apic = 1;
@@ -739,11 +736,6 @@ static void southbridge_inject_dsdt(struct device *dev)
 		/* Update the mem console pointer. */
 		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 */
 		smm_setup_structures(gnvs, NULL, NULL);
 
diff --git a/src/southbridge/intel/lynxpoint/nvs.h b/src/southbridge/intel/lynxpoint/nvs.h
index 3f2ce55766..b170141204 100644
--- a/src/southbridge/intel/lynxpoint/nvs.h
+++ b/src/southbridge/intel/lynxpoint/nvs.h
@@ -75,9 +75,7 @@ typedef struct global_nvs_t {
 	u8	tlst; /* 0x3d - Display Toggle List Pointer */
 	u8	cadl; /* 0x3e - currently attached devices */
 	u8	padl; /* 0x3f - previously attached devices */
-	u16	rsvd14[3];
-	u8	ndid; /* 0x46 - number of device ids */
-	u32	did[5]; /* 0x47 - 5b device id 1..5 */
+	u8	rsvd14[27];
 	/* TPM support */
 	u8	tpmp; /* 0x5b - TPM Present */
 	u8	tpme; /* 0x5c - TPM Enable */
-- 
cgit v1.2.3